Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: kompare

kompare (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 16 Mar 2018 13:29:28 +0000 kompare (4:17.12.2-0ubuntu1) bionic; urgency=medium * Update install files - komparepartui.rc moved to subfolder * New upstream release (17.11.80) * New upstream release (17.11.90) * New upstream release (17.12.0) * New upstream release (17.12.2) -- Rik Mills <rikmills@kubuntu.org> Thu, 22 Feb 2018 16:59:38 +0000 kompare (4:17.08.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.08.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 01 Dec 2017 15:08:21 +0000 kompare (4:17.04.3-0ubuntu1) artful; urgency=low * New upstream release (17.04.1) * Install translations and add Breaks/Replaces against kde-l10n * New upstream release (17.04.2) * New upstream release (17.04.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 18 Aug 2017 08:36:17 +0100 kompare (4:16.12.3-0ubuntu1) zesty; urgency=low [ Darin Miller ] * New upstream release (16.12.2) [ José Manuel Santamaría Lema ] * New upstream release (16.12.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 10 Mar 2017 21:31:35 +0000 kompare (4:16.12.1-0ubuntu1) zesty; urgency=medium [ José Manuel Santamaría Lema ] * Update Vcs-Git fields to use https:// instead of git:// [ Rik Mills ] * Install new appdata * New upstream release (16.12.0) * Update build deps to use new KF5 style names * New upstream release (16.12.1) -- Rik Mills <rikmills@kubuntu.org> Thu, 19 Jan 2017 16:20:38 +0000 kompare (4:16.04.3-0ubuntu1) yakkety; urgency=medium [ Scarlett Clark ] * New upstream release [ Philip Muškovac ] * Update the Vcs URLs now that the repositories are hosted on Launchpad [ Scarlett Clark ] * New upstream bugfix release [ Clive Johnston ] * New upstream release (16.04.2) * New upstream release (16.04.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 30 Sep 2016 06:36:15 +0200 kompare (4:15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release * New upstream bugfix release -- Scarlett Clark <sgclark@kubuntu.org> Thu, 14 Apr 2016 15:39:15 -0700 kompare (4:15.12.1-0ubuntu1) xenial; urgency=medium [ Clive Johnston ] * New upstream release * Merged with Debian [ Scarlett Clark ] * Remove merge conflict tag from changelog. -- Clive Johnston <clivejo@aol.com> Wed, 09 Mar 2016 10:57:10 +0100

Modifications :
  1. Download patch po/gl/kompare.po
  2. Download patch org.kde.kompare.appdata.xml

    --- 4:17.08.3-1/org.kde.kompare.appdata.xml 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/org.kde.kompare.appdata.xml 2017-12-31 04:27:43.000000000 +0000 @@ -18,6 +18,8 @@ <name xml:lang="nl">Kompare</name> <name xml:lang="pl">Kompare</name> <name xml:lang="pt">Kompare</name> + <name xml:lang="pt-BR">Kompare</name> + <name xml:lang="ru">Kompare</name> <name xml:lang="sk">Kompare</name> <name xml:lang="sl">Kompare</name> <name xml:lang="sr">К‑поређење</name> @@ -43,6 +45,8 @@ <summary xml:lang="nl">Diff/Patch-hulpprogramma</summary> <summary xml:lang="pl">Interfejs dla diff i patch</summary> <summary xml:lang="pt">Interface para o Diff/Patch</summary> + <summary xml:lang="pt-BR">Interface para o diff/patch</summary> + <summary xml:lang="ru">Утилита сравнения файлов</summary> <summary xml:lang="sk">Rozhranie Diff/Patch</summary> <summary xml:lang="sl">Začelje za diff/patch</summary> <summary xml:lang="sr">Прочеље за diff и patch</summary> @@ -58,8 +62,8 @@ <p> 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="ca">El Kompare és un programa de frontal per l'IGU que cerca les diferències entre fitxers de codi font per a que es puguin veure o fusionar. Es pot emprar per comparar diferències entre fitxers o en el contingut de carpetes. També admet diversos formats de «diff» i proporciona moltes opcions per personalitzar el nivell d'informació mostrada.</p> - <p xml:lang="ca-valencia">El Kompare és un programa de frontal per l'IGU que busca les diferències entre fitxers de codi font per a que es puguen veure o fusionar. Es pot emprar per comparar diferències entre fitxers o en el contingut de carpetes. També admet diversos formats de «diff» i proporciona moltes opcions per personalitzar el nivell d'informació mostrada.</p> + <p xml:lang="ca">El Kompare és un programa de frontal per l'IGU que cerca les diferències entre fitxers de codi font perquè es puguin veure o fusionar. Es pot emprar per comparar diferències entre fitxers o en el contingut de carpetes. També admet diversos formats de «diff» i proporciona moltes opcions per personalitzar el nivell d'informació mostrada.</p> + <p xml:lang="ca-valencia">El Kompare és un programa de frontal per l'IGU que busca les diferències entre fitxers de codi font perquè es puguen veure o fusionar. Es pot emprar per comparar diferències entre fitxers o en el contingut de carpetes. També admet diversos formats de «diff» i proporciona moltes opcions per personalitzar el nivell d'informació mostrada.</p> <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> @@ -94,6 +98,8 @@ <p xml:lang="nl">Mogelijkheden:</p> <p xml:lang="pl">Możliwości:</p> <p xml:lang="pt">Funcionalidades:</p> + <p xml:lang="pt-BR">Recursos:</p> + <p xml:lang="ru">Возможности:</p> <p xml:lang="sk">Funkcie:</p> <p xml:lang="sl">Zmožnosti:</p> <p xml:lang="sr">Могућности:</p> @@ -136,7 +142,7 @@ <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="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">Compatibilidade con varios formatos de diferenzas e moitas opcións para personalizar o nivel de información que se mostra.</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="it">Supporta vari formati di differenze, e fornisce anche molte opzioni per personalizzare il livello di informazioni visualizzato.</li> <li xml:lang="ko">여러 Diff 형식을 지원하고 표시하는 정보를 사용자 정의할 수 있습니다.</li> <li xml:lang="nl">Ondersteunt een variëteit van diff-formaten en beidt verschillende mogelijkheden voor het aanpassen van de hoeveelheid getoonde informatie.</li>
  3. Download patch po/km/kompare.po
  4. Download patch libdialogpages/diffpage.h

    --- 4:17.08.3-1/libdialogpages/diffpage.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/diffpage.h 2017-12-31 04:27:43.000000000 +0000 @@ -40,65 +40,65 @@ class DiffSettings; class DIALOGPAGES_EXPORT DiffPage : public QFrame { -Q_OBJECT + Q_OBJECT public: - DiffPage(); - ~DiffPage(); + DiffPage(); + ~DiffPage() override; public: - void setSettings( DiffSettings* ); - DiffSettings* settings( void ); + void setSettings(DiffSettings*); + DiffSettings* settings(); public: - virtual void restore(); - virtual void apply(); - virtual void setDefaults(); - -protected slots: - void slotShowRegExpEditor(); - void slotExcludeFilePatternToggled( bool ); - void slotExcludeFileToggled( bool ); + virtual void restore(); + virtual void apply(); + virtual void setDefaults(); + +protected Q_SLOTS: + void slotShowRegExpEditor(); + void slotExcludeFilePatternToggled(bool); + void slotExcludeFileToggled(bool); private: - void addDiffTab(); - void addFormatTab(); - void addOptionsTab(); - void addExcludeTab(); + void addDiffTab(); + void addFormatTab(); + void addOptionsTab(); + void addExcludeTab(); public: - DiffSettings* m_settings; + DiffSettings* m_settings; - KUrlRequester* m_diffURLRequester; + KUrlRequester* m_diffURLRequester; - QCheckBox* m_newFilesCheckBox; - QCheckBox* m_smallerCheckBox; - QCheckBox* m_largerCheckBox; - QCheckBox* m_tabsCheckBox; - QCheckBox* m_caseCheckBox; - QCheckBox* m_linesCheckBox; - QCheckBox* m_whitespaceCheckBox; - QCheckBox* m_allWhitespaceCheckBox; - QCheckBox* m_ignoreTabExpansionCheckBox; - - QCheckBox* m_ignoreRegExpCheckBox; - KLineEdit* m_ignoreRegExpEdit; - QStringList* m_ignoreRegExpEditHistory; - QDialog* m_ignoreRegExpDialog; - - QGroupBox* m_excludeFilePatternGroupBox; - KEditListWidget* m_excludeFilePatternEditListBox; - - QGroupBox* m_excludeFileNameGroupBox; - KUrlComboBox* m_excludeFileURLComboBox; - KUrlRequester* m_excludeFileURLRequester; + QCheckBox* m_newFilesCheckBox; + QCheckBox* m_smallerCheckBox; + QCheckBox* m_largerCheckBox; + QCheckBox* m_tabsCheckBox; + QCheckBox* m_caseCheckBox; + QCheckBox* m_linesCheckBox; + QCheckBox* m_whitespaceCheckBox; + QCheckBox* m_allWhitespaceCheckBox; + QCheckBox* m_ignoreTabExpansionCheckBox; + + QCheckBox* m_ignoreRegExpCheckBox; + KLineEdit* m_ignoreRegExpEdit; + QStringList* m_ignoreRegExpEditHistory; + QDialog* m_ignoreRegExpDialog; + + QGroupBox* m_excludeFilePatternGroupBox; + KEditListWidget* m_excludeFilePatternEditListBox; + + QGroupBox* m_excludeFileNameGroupBox; + KUrlComboBox* m_excludeFileURLComboBox; + KUrlRequester* m_excludeFileURLRequester; - // loc == lines of context - QSpinBox* m_locSpinBox; + // loc == lines of context + QSpinBox* m_locSpinBox; - QButtonGroup* m_modeButtonGroup; - QGroupBox* m_diffProgramGroup; + QButtonGroup* m_modeButtonGroup; + QGroupBox* m_diffProgramGroup; - QTabWidget* m_tabWidget; + QTabWidget* m_tabWidget; }; #endif
  5. Download patch komparepart/kompareconnectwidget.h

    --- 4:17.08.3-1/komparepart/kompareconnectwidget.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompareconnectwidget.h 2017-12-31 04:27:43.000000000 +0000 @@ -37,57 +37,57 @@ class KompareSplitter; class KompareConnectWidget : public QWidget { - Q_OBJECT + Q_OBJECT public: - KompareConnectWidget( ViewSettings* settings, QWidget* parent, const char* name = 0 ); - ~KompareConnectWidget(); + KompareConnectWidget(ViewSettings* settings, QWidget* parent, const char* name = nullptr); + ~KompareConnectWidget() override; -public slots: - void slotSetSelection( const Diff2::DiffModel* model, const Diff2::Difference* diff ); - void slotSetSelection( const Diff2::Difference* diff ); +public Q_SLOTS: + void slotSetSelection(const Diff2::DiffModel* model, const Diff2::Difference* diff); + void slotSetSelection(const Diff2::Difference* diff); - void slotDelayedRepaint(); + void slotDelayedRepaint(); -signals: - void selectionChanged(const Diff2::Difference* diff); +Q_SIGNALS: + void selectionChanged(const Diff2::Difference* diff); protected: - void paintEvent( QPaintEvent* e ); - QPainterPath makeBezier( int l, int r ) const; + void paintEvent(QPaintEvent* e) override; + QPainterPath makeBezier(int l, int r) const; private: - ViewSettings* m_settings; + ViewSettings* m_settings; - const Diff2::DiffModel* m_selectedModel; - const Diff2::Difference* m_selectedDifference; + const Diff2::DiffModel* m_selectedModel; + const Diff2::Difference* m_selectedDifference; }; class KompareConnectWidgetFrame : public QSplitterHandle { - Q_OBJECT + Q_OBJECT public: - KompareConnectWidgetFrame( ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); - ~KompareConnectWidgetFrame(); + KompareConnectWidgetFrame(ViewSettings* settings, KompareSplitter* parent, const char* name = nullptr); + ~KompareConnectWidgetFrame() override; - QSize sizeHint() const; + QSize sizeHint() const override; - KompareConnectWidget* wid() { return &m_wid; } + KompareConnectWidget* wid() { return &m_wid; } protected: - // stop the parent QSplitterHandle painting - void paintEvent( QPaintEvent* /* e */ ) { } + // stop the parent QSplitterHandle painting + void paintEvent(QPaintEvent* /* e */) override { } #if 0 - void mouseMoveEvent( QMouseEvent * ); - void mousePressEvent( QMouseEvent * ); - void mouseReleaseEvent( QMouseEvent * ); + void mouseMoveEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*); + void mouseReleaseEvent(QMouseEvent*); #endif private: - KompareConnectWidget m_wid; - QLabel m_label; - QVBoxLayout m_layout; + KompareConnectWidget m_wid; + QLabel m_label; + QVBoxLayout m_layout; }; #endif
  6. Download patch pics/CMakeLists.txt

    --- 4:17.08.3-1/pics/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/pics/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,11 +1,12 @@ -ecm_install_icons(ICONS - 16-apps-kompare.png - 22-apps-kompare.png - 32-apps-kompare.png - 48-apps-kompare.png - 128-apps-kompare.png - sc-apps-kompare.svgz - DESTINATION ${ICON_INSTALL_DIR} +ecm_install_icons( + ICONS + 16-apps-kompare.png + 22-apps-kompare.png + 32-apps-kompare.png + 48-apps-kompare.png + 128-apps-kompare.png + sc-apps-kompare.svgz + DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor )
  7. Download patch komparepart/komparesaveoptionswidget.h

    --- 4:17.08.3-1/komparepart/komparesaveoptionswidget.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/komparesaveoptionswidget.h 2017-12-31 04:27:43.000000000 +0000 @@ -27,24 +27,25 @@ class QButtonGroup; class KompareSaveOptionsWidget : public KompareSaveOptionsBase { -Q_OBJECT + Q_OBJECT public: - KompareSaveOptionsWidget( QString source, QString destination, DiffSettings* settings, QWidget* parent ); - ~KompareSaveOptionsWidget(); + KompareSaveOptionsWidget(const QString& source, const QString& destination, + DiffSettings* settings, QWidget* parent); + ~KompareSaveOptionsWidget() override; - void saveOptions(); - QString directory() const; + void saveOptions(); + QString directory() const; -protected slots: - void updateCommandLine(); +protected Q_SLOTS: + void updateCommandLine(); private: - void loadOptions(); + void loadOptions(); - DiffSettings* m_settings; - QString m_source; - QString m_destination; - QButtonGroup* m_FormatBG; + DiffSettings* m_settings; + QString m_source; + QString m_destination; + QButtonGroup* m_FormatBG; }; #endif
  8. Download patch libdialogpages/viewpage.cpp
  9. Download patch kompareui.rc

    --- 4:17.08.3-1/kompareui.rc 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/kompareui.rc 2017-12-31 04:27:43.000000000 +0000 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kompare_shell" version="9"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="kompare_shell" version="9"> <MenuBar> <Menu noMerge="1" name="file"><text>&amp;File</text> <Action name="file_open"/> @@ -30,4 +30,4 @@ <Merge/> <Action name="help"/> </ToolBar> -</kpartgui> +</gui>
  10. Download patch komparepart/kompare_partfactory.h

    --- 4:17.08.3-1/komparepart/kompare_partfactory.h 1970-01-01 00:00:00.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompare_partfactory.h 2017-12-31 04:27:43.000000000 +0000 @@ -0,0 +1,42 @@ +/*************************************************************************** + kompare_partfactory.h + -------------- + begin : Wed Oct 11 2017 + Copyright 2017 Friedrich W. H. Kossebau <kossebau@kde.org> +****************************************************************************/ + +/*************************************************************************** +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +***************************************************************************/ + +#ifndef KOMPAREPARTFACTORY_H +#define KOMPAREPARTFACTORY_H + +#include <KPluginFactory> +#include <KAboutData> + + +class KomparePartFactory : public KPluginFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_INTERFACES(KPluginFactory) + +public: + KomparePartFactory(); + ~KomparePartFactory() override; + + QObject* create(const char* iface, + QWidget* parentWidget, QObject* parent, + const QVariantList& args, const QString& keyword) override; + +private: + KAboutData m_aboutData; +}; + +#endif
  11. Download patch komparenavtreepart/komparenavtreepart.cpp
  12. Download patch debian/upstream/metadata

    --- 4:17.08.3-1/debian/upstream/metadata 2017-11-04 11:16:32.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Name: kompare -Changelog: https://cgit.kde.org/kompare.git/log -Contact: kde-devel@kde.org -Donation: https://www.kde.org/community/donations/index.php -Repository: https://anongit.kde.org/kompare.git -Repository-Browse: https://cgit.kde.org/kompare.git -Security-Contact: security@kde.org
  13. Download patch po/fa/kompare.po
  14. Download patch po/et/kompare.po
  15. Download patch debian/rules

    --- 4:17.08.3-1/debian/rules 2017-12-09 08:36:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/rules 2018-03-16 13:29:28.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -l10npkgs_firstversion_ok := 4:16.04.3-7~ +l10npkgs_firstversion_ok := 4:17.03.90-0~ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
  16. Download patch kompareurldialog.cpp
  17. Download patch po/nds/kompare.po
  18. Download patch po/is/kompare.po
  19. Download patch po/pt/kompare.po
  20. Download patch komparepart/komparesaveoptionswidget.cpp
  21. Download patch komparepart/kompareconnectwidget.cpp
  22. Download patch debian/upstream/signing-key.asc

    --- 4:17.08.3-1/debian/upstream/signing-key.asc 2017-11-04 11:16:32.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -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 -RJWljvaVa8fj2U2D659nVsq8og== -=5Ltf ------END PGP PUBLIC KEY BLOCK-----
  23. Download patch debian/control

    --- 4:17.08.3-1/debian/control 2017-12-09 08:36:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/control 2018-03-16 13:29:28.000000000 +0000 @@ -3,35 +3,36 @@ Section: kde Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Uploaders: Sune Vuorela <sune@debian.org>, + Fathi Boudra <fabo@debian.org>, Modestas Vainius <modax@debian.org>, George Kiagiadakis <kiagiadakis.george@gmail.com>, - Maximiliano Curia <maxy@debian.org>, + Maximiliano Curia <maxy@debian.org> Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 0.0.9~), - libkf5codecs-dev, - libkf5config-dev, - libkf5coreaddons-dev, - libkf5doctools-dev, - libkf5iconthemes-dev, - libkf5jobwidgets-dev, - libkf5parts-dev, - libkf5texteditor-dev, - libkf5widgetsaddons-dev, - libkomparediff2-dev (>= 4:17.08~), + extra-cmake-modules (>= 5.31.0~), + libkf5codecs-dev (>= 5.31.0~), + libkf5config-dev (>= 5.31.0~), + libkf5coreaddons-dev (>= 5.31.0~), + libkf5doctools-dev (>= 5.31.0~), + libkf5iconthemes-dev (>= 5.31.0~), + libkf5jobwidgets-dev (>= 5.31.0~), + libkf5parts-dev (>= 5.31.0~), + libkf5texteditor-dev (>= 5.31.0~), + libkf5widgetsaddons-dev (>= 5.31.0~), + libkomparediff2-dev (>= 4:17.12.3~), pkg-kde-tools (>= 0.12), - qtbase5-dev, -Standards-Version: 4.1.2 + qtbase5-dev (>= 5.6.1~) +Standards-Version: 3.9.6 Homepage: http://www.kde.org/ -Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kompare.git/ -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kompare.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kompare +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kompare Package: kompare Architecture: any Section: devel Depends: kpart5-kompare (= ${binary:Version}), ${misc:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} Suggests: khelpcenter Breaks: ${kde-l10n:all} Replaces: ${kde-l10n:all} @@ -60,6 +61,7 @@ Architecture: any Section: libdevel Depends: libkompareinterface5 (= ${binary:Version}), ${misc:Depends}, + ${shlibs:Depends} Breaks: kompare (<< 4:14.12.3+git20150408) Replaces: kompare (<< 4:14.12.3+git20150408) Description: file difference viewer - kpart interface library development files
  24. Download patch po/mr/kompare.po
  25. Download patch po/pt_BR/kompare.po
  26. Download patch po/nb/kompare.po
  27. Download patch po/en_GB/kompare.po
  28. Download patch po/da/kompare.po
  29. Download patch komparepart/kompareprefdlg.h

    --- 4:17.08.3-1/komparepart/kompareprefdlg.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompareprefdlg.h 2017-12-31 04:27:43.000000000 +0000 @@ -19,7 +19,7 @@ #ifndef KOMPAREPREFDLG_H #define KOMPAREPREFDLG_H -#include <kpagedialog.h> +#include <KPageDialog> class DiffPage; class DiffSettings; @@ -28,29 +28,29 @@ class ViewSettings; class KomparePrefDlg : public KPageDialog { -Q_OBJECT + Q_OBJECT public: - KomparePrefDlg( ViewSettings*, DiffSettings* ); - ~KomparePrefDlg(); + KomparePrefDlg(ViewSettings*, DiffSettings*); + ~KomparePrefDlg() override; -protected slots: - /** No descriptions */ - virtual void slotOk(); - /** No descriptions */ - virtual void slotApply(); - /** No descriptions */ - virtual void slotHelp(); - /** No descriptions */ - virtual void slotDefault(); - /** No descriptions */ - virtual void slotCancel(); +protected Q_SLOTS: + /** No descriptions */ + virtual void slotOk(); + /** No descriptions */ + virtual void slotApply(); + /** No descriptions */ + virtual void slotHelp(); + /** No descriptions */ + virtual void slotDefault(); + /** No descriptions */ + virtual void slotCancel(); -signals: - void configChanged(); +Q_SIGNALS: + void configChanged(); private: - ViewPage* m_viewPage; - DiffPage* m_diffPage; + ViewPage* m_viewPage; + DiffPage* m_diffPage; }; #endif
  30. Download patch komparenavtreepart/CMakeLists.txt

    --- 4:17.08.3-1/komparenavtreepart/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparenavtreepart/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,17 +1,15 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../komparepart) - - -########### next target ############### - set(komparenavtreepart_PART_SRCS komparenavtreepart.cpp ) +ecm_qt_declare_logging_category(komparenavtreepart_PART_SRCS + HEADER komparenavviewdebug.h + IDENTIFIER KOMPARENAVVIEW + CATEGORY_NAME "komparenavview" +) add_library(komparenavtreepart MODULE ${komparenavtreepart_PART_SRCS}) - - target_link_libraries(komparenavtreepart Qt5::Widgets KF5::Parts @@ -19,10 +17,6 @@ target_link_libraries(komparenavtreepart KompareDiff2 ) -install(TARGETS komparenavtreepart DESTINATION ${PLUGIN_INSTALL_DIR} ) - - -########### install files ############### - -install( FILES komparenavtreepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install(TARGETS komparenavtreepart DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(FILES komparenavtreepart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
  31. Download patch komparepart/kompareprefdlg.cpp
  32. Download patch po/nn/kompare.po
  33. Download patch po/kk/kompare.po
  34. Download patch po/ast/kompare.po
  35. Download patch komparepart/komparelistview.h
  36. Download patch komparepart/komparelistview.cpp
  37. Download patch CMakeLists.txt

    --- 4:17.08.3-1/CMakeLists.txt 2017-11-07 01:22:32.000000000 +0000 +++ 4:17.12.3-0ubuntu1/CMakeLists.txt 2018-03-06 00:23:54.000000000 +0000 @@ -1,21 +1,29 @@ cmake_minimum_required(VERSION 2.8.12) -project(kompare) -# search packages used by KDE -include(FeatureSummary) -find_package(Qt5 REQUIRED COMPONENTS Core PrintSupport Widgets) +project(kompare) -find_package(ECM 0.0.9 NO_MODULE REQUIRED) +set(ECM_MIN_VERSION "5.35.0") +find_package(ECM ${ECM_MIN_VERSION} NO_MODULE REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) +include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(GenerateExportHeader) include(ECMAddAppIcon) +include(ECMQtDeclareLoggingCategory) -find_package(KF5 REQUIRED COMPONENTS +set(QT_MIN_VERSION "5.5.0") +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS + Core + PrintSupport + Widgets +) + +set(KF5_MIN_VERSION "5.28.0") +find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Codecs DocTools @@ -27,12 +35,27 @@ find_package(KF5 REQUIRED COMPONENTS WidgetsAddons ) -find_package(LibKompareDiff2 5.1 REQUIRED) -include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) +find_package(LibKompareDiff2 5.2 CONFIG) +set_package_properties(LibKompareDiff2 PROPERTIES + TYPE REQUIRED +) + set(KOMPARE_LIB_VERSION 5) set(KOMPARE_LIB_SOVERSION 5) +add_definitions( + -DQT_DEPRECATED_WARNINGS + -DQT_DISABLE_DEPRECATED_BEFORE=0x050500 + -DQT_NO_SIGNALS_SLOTS_KEYWORDS + -DQT_STRICT_ITERATORS + -DQT_USE_QSTRINGBUILDER + -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_CAST_FROM_BYTEARRAY +# -DQT_NO_URL_CAST_FROM_STRING +) + add_subdirectory( doc ) add_subdirectory( interfaces ) add_subdirectory( libdialogpages ) @@ -40,23 +63,24 @@ add_subdirectory( komparenavtreepart ) add_subdirectory( komparepart ) add_subdirectory( pics ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/komparepart - ${CMAKE_CURRENT_SOURCE_DIR}/libdialogpages - ${CMAKE_CURRENT_SOURCE_DIR}/interfaces - ${CMAKE_CURRENT_SOURCE_DIR}/komparenavtreepart - ${CMAKE_CURRENT_SOURCE_DIR}/komparepart) - - -########### next target ############### - set(kompare_SRCS -main.cpp -kompare_shell.cpp -kompareurldialog.cpp + main.cpp + kompare_shell.cpp + kompareurldialog.cpp +) +ecm_qt_declare_logging_category(kompare_SRCS + HEADER kompareshelldebug.h + IDENTIFIER KOMPARESHELL + CATEGORY_NAME "kompareshell" ) -file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-kompare.png") -ecm_add_app_icon(kompare_SRCS ICONS ${ICONS_SRCS}) +ecm_add_app_icon(kompare_SRCS ICONS + pics/16-apps-kompare.png + pics/22-apps-kompare.png + pics/32-apps-kompare.png + pics/48-apps-kompare.png + pics/128-apps-kompare.png +) add_executable(kompare ${kompare_SRCS}) @@ -69,17 +93,14 @@ target_link_libraries(kompare Qt5::Widgets ) -install(TARGETS kompare ${INSTALL_TARGETS_DEFAULT_ARGS} ) +install(TARGETS kompare ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(PROGRAMS org.kde.kompare.desktop DESTINATION ${KDE_INSTALL_APPDIR}) +install(FILES org.kde.kompare.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) +install(FILES kompareui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kompare) +install(FILES komparenavigationpart.desktop kompareviewpart.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) -########### install files ############### - -install( PROGRAMS org.kde.kompare.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES kompareui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kompare ) -install( FILES komparenavigationpart.desktop kompareviewpart.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -install( FILES org.kde.kompare.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) - ki18n_install(po) if (KF5DocTools_FOUND) kdoctools_install(po)
  38. Download patch po/ro/kompare.po
  39. Download patch libdialogpages/filessettings.h

    --- 4:17.08.3-1/libdialogpages/filessettings.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/filessettings.h 2017-12-31 04:27:43.000000000 +0000 @@ -1,8 +1,8 @@ /*************************************************************************** - filessettings.h - --------------- - begin : Sun Apr 18 2004 - Copyright 2004 Otto Bruggeman <otto.bruggeman@home.nl> + filessettings.cpp + ----------------- + begin : Sun Apr 18 2004 + Copyright 2004 Otto Bruggeman <otto.bruggeman@home.nl> ****************************************************************************/ /*************************************************************************** @@ -17,8 +17,8 @@ #ifndef FILESSETTINGS_H #define FILESSETTINGS_H -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <QString> +#include <QStringList> #include <libkomparediff2/settingsbase.h> @@ -28,26 +28,26 @@ class KConfig; class DIALOGPAGES_EXPORT FilesSettings : public SettingsBase { -Q_OBJECT + Q_OBJECT public: - FilesSettings( QWidget* parent ); - virtual ~FilesSettings(); + explicit FilesSettings(QWidget* parent); + ~FilesSettings() override; public: - // some virtual functions that will be overloaded from the base class - virtual void loadSettings( KConfig* config ); - virtual void saveSettings( KConfig* config ); + // some virtual functions that will be overloaded from the base class + void loadSettings(KConfig* config) override; + void saveSettings(KConfig* config) override; - void setGroup( const QString& groupName ); + void setGroup(const QString& groupName); public: - QString m_configGroupName; + QString m_configGroupName; - QStringList m_recentSources; - QString m_lastChosenSourceURL; - QStringList m_recentDestinations; - QString m_lastChosenDestinationURL; - QString m_encoding; + QStringList m_recentSources; + QString m_lastChosenSourceURL; + QStringList m_recentDestinations; + QString m_lastChosenDestinationURL; + QString m_encoding; }; #endif // FILESSETTINGS_H
  40. Download patch interfaces/kompareinterface.cpp

    --- 4:17.08.3-1/interfaces/kompareinterface.cpp 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/interfaces/kompareinterface.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -6,7 +6,7 @@ published by the Free Software Foundation; either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved - by the membership of KDE e.V.), which shall act as a proxy + by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license. This program is distributed in the hope that it will be useful, @@ -22,13 +22,13 @@ class KompareInterfacePrivate { public: - KompareInterfacePrivate(); - ~KompareInterfacePrivate(); - KompareInterfacePrivate( const KompareInterfacePrivate& ); - KompareInterfacePrivate& operator=( const KompareInterfacePrivate& ); + KompareInterfacePrivate(); + ~KompareInterfacePrivate(); + KompareInterfacePrivate(const KompareInterfacePrivate&); + KompareInterfacePrivate& operator=(const KompareInterfacePrivate&); protected: - // Add all variables for the KompareInterface class here and access them through the kip pointer + // Add all variables for the KompareInterface class here and access them through the kip pointer }; KompareInterfacePrivate::KompareInterfacePrivate() @@ -39,38 +39,38 @@ KompareInterfacePrivate::~KompareInterfa { } -KompareInterfacePrivate::KompareInterfacePrivate( const KompareInterfacePrivate& /*kip*/ ) +KompareInterfacePrivate::KompareInterfacePrivate(const KompareInterfacePrivate& /*kip*/) { } -KompareInterfacePrivate& KompareInterfacePrivate::operator=(const KompareInterfacePrivate& /*kip*/ ) +KompareInterfacePrivate& KompareInterfacePrivate::operator=(const KompareInterfacePrivate& /*kip*/) { - return *this; + return *this; } KompareInterface::KompareInterface() { - kip = new KompareInterfacePrivate(); + kip = new KompareInterfacePrivate(); } KompareInterface::~KompareInterface() { - delete kip; + delete kip; } -KompareInterface::KompareInterface( const KompareInterface& ki ) +KompareInterface::KompareInterface(const KompareInterface& ki) { - kip = new KompareInterfacePrivate( *(ki.kip) ); + kip = new KompareInterfacePrivate(*(ki.kip)); } -KompareInterface& KompareInterface::operator=( const KompareInterface& ki ) +KompareInterface& KompareInterface::operator=(const KompareInterface& ki) { - kip = ki.kip; - return *this; + kip = ki.kip; + return *this; } -void KompareInterface::setEncoding( const QString& encoding ) +void KompareInterface::setEncoding(const QString& encoding) { - m_encoding = encoding; + m_encoding = encoding; }
  41. Download patch po/ru/kompare.po
  42. Download patch po/hi/kompare.po
  43. Download patch libdialogpages/viewsettings.cpp

    --- 4:17.08.3-1/libdialogpages/viewsettings.cpp 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/viewsettings.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -21,8 +21,8 @@ #include <QFont> #include <QFontDatabase> -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> using namespace Diff2; @@ -31,14 +31,14 @@ const QColor ViewSettings::default_chang const QColor ViewSettings::default_addColor (190, 190, 237); const QColor ViewSettings::default_appliedColor(237, 237, 190); -ViewSettings::ViewSettings( QWidget* parent ) - : SettingsBase( parent ), - m_removeColor( 0, 0, 0 ), - m_changeColor( 0, 0, 0), - m_addColor( 0, 0, 0), - m_appliedColor( 0, 0, 0), - m_scrollNoOfLines( 0 ), - m_tabToNumberOfSpaces( 0 ) +ViewSettings::ViewSettings(QWidget* parent) + : SettingsBase(parent), + m_removeColor(0, 0, 0), + m_changeColor(0, 0, 0), + m_addColor(0, 0, 0), + m_appliedColor(0, 0, 0), + m_scrollNoOfLines(0), + m_tabToNumberOfSpaces(0) { } @@ -46,54 +46,54 @@ ViewSettings::~ViewSettings() { } -void ViewSettings::loadSettings( KConfig* config ) +void ViewSettings::loadSettings(KConfig* config) { - KConfigGroup cfg( config, "View Options" ); - m_removeColor = cfg.readEntry( "RemoveColor", default_removeColor ); - m_changeColor = cfg.readEntry( "ChangeColor", default_changeColor ); - m_addColor = cfg.readEntry( "AddColor", default_addColor ); - m_appliedColor = cfg.readEntry( "AppliedColor", default_appliedColor ); - m_scrollNoOfLines = cfg.readEntry ( "ScrollNoOfLines", 3 ); - m_tabToNumberOfSpaces = cfg.readEntry ( "TabToNumberOfSpaces", 4 ); - - QFont stdFixed = QFontDatabase::systemFont(QFontDatabase::FixedFont); - stdFixed.setPointSize( 10 ); - m_font = cfg.readEntry ( "TextFont", stdFixed ); + KConfigGroup cfg(config, "View Options"); + m_removeColor = cfg.readEntry("RemoveColor", default_removeColor); + m_changeColor = cfg.readEntry("ChangeColor", default_changeColor); + m_addColor = cfg.readEntry("AddColor", default_addColor); + m_appliedColor = cfg.readEntry("AppliedColor", default_appliedColor); + m_scrollNoOfLines = cfg.readEntry("ScrollNoOfLines", 3); + m_tabToNumberOfSpaces = cfg.readEntry("TabToNumberOfSpaces", 4); + + QFont stdFixed = QFontDatabase::systemFont(QFontDatabase::FixedFont); + stdFixed.setPointSize(10); + m_font = cfg.readEntry("TextFont", stdFixed); } -void ViewSettings::saveSettings( KConfig* config ) +void ViewSettings::saveSettings(KConfig* config) { - KConfigGroup cfg( config, "View Options" ); - cfg.writeEntry( "RemoveColor", m_removeColor ); - cfg.writeEntry( "ChangeColor", m_changeColor ); - cfg.writeEntry( "AddColor", m_addColor ); - cfg.writeEntry( "AppliedColor", m_appliedColor ); - cfg.writeEntry( "ScrollNoOfLines", m_scrollNoOfLines ); - cfg.writeEntry( "TabToNumberOfSpaces", m_tabToNumberOfSpaces ); + KConfigGroup cfg(config, "View Options"); + cfg.writeEntry("RemoveColor", m_removeColor); + cfg.writeEntry("ChangeColor", m_changeColor); + cfg.writeEntry("AddColor", m_addColor); + cfg.writeEntry("AppliedColor", m_appliedColor); + cfg.writeEntry("ScrollNoOfLines", m_scrollNoOfLines); + cfg.writeEntry("TabToNumberOfSpaces", m_tabToNumberOfSpaces); - cfg.writeEntry( "TextFont", m_font ); + cfg.writeEntry("TextFont", m_font); } -QColor ViewSettings::colorForDifferenceType( int type, bool selected, bool applied ) +QColor ViewSettings::colorForDifferenceType(int type, bool selected, bool applied) { - // FIXME: does not belong here - QColor color; - if( applied ) - color = m_appliedColor; - else - { - type = type & 0xFFFFFFEF; // remove the AppliedByBlend - switch( type ) { - case Difference::Unchanged: color = Qt::white; break; - case Difference::Change: color = m_changeColor; break; - case Difference::Insert: color = m_addColor; break; - case Difference::Delete: color = m_removeColor; break; - default: break; - } - } + // FIXME: does not belong here + QColor color; + if (applied) + color = m_appliedColor; + else + { + type = type & 0xFFFFFFEF; // remove the AppliedByBlend + switch (type) { + case Difference::Unchanged: color = Qt::white; break; + case Difference::Change: color = m_changeColor; break; + case Difference::Insert: color = m_addColor; break; + case Difference::Delete: color = m_removeColor; break; + default: break; + } + } - if( selected ) - color = color.light( 110 ); + if (selected) + color = color.light(110); - return color; + return color; }
  44. Download patch po/el/kompare.po
  45. Download patch libdialogpages/viewsettings.h

    --- 4:17.08.3-1/libdialogpages/viewsettings.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/viewsettings.h 2017-12-31 04:27:43.000000000 +0000 @@ -28,34 +28,34 @@ class DIALOGPAGES_EXPORT ViewSettings : public SettingsBase { -Q_OBJECT + Q_OBJECT public: - static const QColor default_removeColor; - static const QColor default_changeColor; - static const QColor default_addColor; - static const QColor default_appliedColor; + static const QColor default_removeColor; + static const QColor default_changeColor; + static const QColor default_addColor; + static const QColor default_appliedColor; - ViewSettings( QWidget* parent ); - ~ViewSettings(); + explicit ViewSettings(QWidget* parent); + ~ViewSettings() override; public: - // some virtual functions that will be overloaded from the base class - virtual void loadSettings( KConfig* config ); - virtual void saveSettings( KConfig* config ); - QColor colorForDifferenceType( int type, bool selected = false, bool applied = false ); + // some virtual functions that will be overloaded from the base class + void loadSettings(KConfig* config) override; + void saveSettings(KConfig* config) override; + QColor colorForDifferenceType(int type, bool selected = false, bool applied = false); public: - QColor m_removeColor; - QColor m_changeColor; - QColor m_addColor; - QColor m_appliedColor; - QColor m_selectedRemoveColor; - QColor m_selectedChangeColor; - QColor m_selectedAddColor; - QColor m_selectedAppliedColor; - int m_scrollNoOfLines; - int m_tabToNumberOfSpaces; + QColor m_removeColor; + QColor m_changeColor; + QColor m_addColor; + QColor m_appliedColor; + QColor m_selectedRemoveColor; + QColor m_selectedChangeColor; + QColor m_selectedAddColor; + QColor m_selectedAppliedColor; + int m_scrollNoOfLines; + int m_tabToNumberOfSpaces; - QFont m_font; + QFont m_font; }; #endif // VIEWSETTINGS_H
  46. Download patch po/sk/kompare.po
  47. Download patch po/hr/kompare.po
  48. Download patch po/eo/kompare.po
  49. Download patch komparepart/komparesaveoptionsbase.cpp

    --- 4:17.08.3-1/komparepart/komparesaveoptionsbase.cpp 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/komparesaveoptionsbase.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -17,13 +17,13 @@ #include "komparesaveoptionsbase.h" -#include <QtCore/QVariant> +#include <QVariant> /* * Constructs a KompareSaveOptionsBase as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KompareSaveOptionsBase::KompareSaveOptionsBase(QWidget* parent, Qt::WindowFlags fl) - : QWidget(parent, fl) +KompareSaveOptionsBase::KompareSaveOptionsBase(QWidget* parent) + : QWidget(parent) { setupUi(this);
  50. Download patch po/hu/kompare.po
  51. Download patch po/eu/kompare.po
  52. Download patch po/bg/kompare.po
  53. Download patch po/lv/kompare.po
  54. Download patch libdialogpages/filessettings.cpp

    --- 4:17.08.3-1/libdialogpages/filessettings.cpp 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/filessettings.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -17,11 +17,11 @@ #include "filessettings.h" -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> -FilesSettings::FilesSettings( QWidget* parent ) - : SettingsBase( parent ) +FilesSettings::FilesSettings(QWidget* parent) + : SettingsBase(parent) { } @@ -29,29 +29,29 @@ FilesSettings::~FilesSettings() { } -void FilesSettings::loadSettings( KConfig* config ) +void FilesSettings::loadSettings(KConfig* config) { - KConfigGroup group( config, m_configGroupName ); + KConfigGroup group(config, m_configGroupName); - m_recentSources = group.readEntry( "Recent Sources", QStringList() ); - m_lastChosenSourceURL = group.readEntry ( "LastChosenSourceListEntry", "" ); - m_recentDestinations = group.readEntry( "Recent Destinations", QStringList() ); - m_lastChosenDestinationURL = group.readEntry ( "LastChosenDestinationListEntry", "" ); - m_encoding = group.readEntry ( "Encoding", "default" ); + m_recentSources = group.readEntry("Recent Sources", QStringList()); + m_lastChosenSourceURL = group.readEntry("LastChosenSourceListEntry", QString()); + m_recentDestinations = group.readEntry("Recent Destinations", QStringList()); + m_lastChosenDestinationURL = group.readEntry("LastChosenDestinationListEntry", QString()); + m_encoding = group.readEntry("Encoding", "default"); } -void FilesSettings::saveSettings( KConfig* config ) +void FilesSettings::saveSettings(KConfig* config) { - KConfigGroup group( config, m_configGroupName ); - group.writeEntry( "Recent Sources", m_recentSources ); - group.writeEntry( "Recent Destinations", m_recentDestinations ); - group.writeEntry( "LastChosenSourceListEntry", m_lastChosenSourceURL ); - group.writeEntry( "LastChosenDestinationListEntry", m_lastChosenDestinationURL ); - group.writeEntry( "Encoding", m_encoding ); - config->sync(); + KConfigGroup group(config, m_configGroupName); + group.writeEntry("Recent Sources", m_recentSources); + group.writeEntry("Recent Destinations", m_recentDestinations); + group.writeEntry("LastChosenSourceListEntry", m_lastChosenSourceURL); + group.writeEntry("LastChosenDestinationListEntry", m_lastChosenDestinationURL); + group.writeEntry("Encoding", m_encoding); + config->sync(); } -void FilesSettings::setGroup( const QString& groupName ) +void FilesSettings::setGroup(const QString& groupName) { - m_configGroupName = groupName; + m_configGroupName = groupName; }
  55. Download patch libdialogpages/CMakeLists.txt

    --- 4:17.08.3-1/libdialogpages/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,7 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") -########### next target ############### - set(dialogpages_PART_SRCS filessettings.cpp viewsettings.cpp @@ -9,20 +7,20 @@ set(dialogpages_PART_SRCS filespage.cpp viewpage.cpp ) - add_library(komparedialogpages SHARED ${dialogpages_PART_SRCS}) generate_export_header(komparedialogpages BASE_NAME DIALOGPAGES) target_link_libraries(komparedialogpages - KompareDiff2 - KF5::Codecs - KF5::Parts - KF5::WidgetsAddons + PUBLIC + KompareDiff2 + KF5::Codecs + KF5::Parts + KF5::WidgetsAddons ) set_target_properties(komparedialogpages PROPERTIES VERSION ${KOMPARE_LIB_VERSION} SOVERSION ${KOMPARE_LIB_SOVERSION} ) -install(TARGETS komparedialogpages ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +install(TARGETS komparedialogpages ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
  56. Download patch interfaces/CMakeLists.txt

    --- 4:17.08.3-1/interfaces/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/interfaces/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,21 +1,18 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") - -########### next target ############### - set(kompareinterface_LIB_SRCS kompareinterface.cpp ) - add_library(kompareinterface SHARED ${kompareinterface_LIB_SRCS}) generate_export_header(kompareinterface BASE_NAME KOMPAREINTERFACE) target_link_libraries(kompareinterface - Qt5::Core + PUBLIC + Qt5::Core ) set_target_properties(kompareinterface PROPERTIES VERSION ${KOMPARE_LIB_VERSION} SOVERSION ${KOMPARE_LIB_SOVERSION} ) -install(TARGETS kompareinterface ${INSTALL_TARGETS_DEFAULT_ARGS} ) -install(FILES kompareinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kompare COMPONENT Devel ) +install(TARGETS kompareinterface ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install(FILES kompareinterface.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kompare COMPONENT Devel)
  57. Download patch po/pl/kompare.po
  58. Download patch po/bs/kompare.po
  59. Download patch kompareurldialog.h

    --- 4:17.08.3-1/kompareurldialog.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/kompareurldialog.h 2017-12-31 04:27:43.000000000 +0000 @@ -18,7 +18,7 @@ #ifndef KOMPAREURLDIALOG_H #define KOMPAREURLDIALOG_H -#include <kpagedialog.h> +#include <KPageDialog> class FilesPage; class FilesSettings; @@ -34,39 +34,39 @@ class ViewSettings; */ class KompareURLDialog : public KPageDialog { - Q_OBJECT + Q_OBJECT public: - explicit KompareURLDialog( QWidget *parent= 0, Qt::WindowFlags flags= 0 ); - ~KompareURLDialog(); + explicit KompareURLDialog(QWidget* parent = nullptr); + ~KompareURLDialog() override; - QUrl getFirstURL() const; - QUrl getSecondURL() const; - QString encoding() const; + QUrl getFirstURL() const; + QUrl getSecondURL() const; + QString encoding() const; - void setFirstGroupBoxTitle ( const QString& title ); - void setSecondGroupBoxTitle( const QString& title ); + void setFirstGroupBoxTitle(const QString& title); + void setSecondGroupBoxTitle(const QString& title); - void setGroup( const QString& groupName ); + void setGroup(const QString& groupName); - void setFirstURLRequesterMode ( unsigned int mode ); - void setSecondURLRequesterMode( unsigned int mode ); + void setFirstURLRequesterMode(unsigned int mode); + void setSecondURLRequesterMode(unsigned int mode); -public slots: - virtual void accept(); - virtual void reject(); +public Q_SLOTS: + void accept() override; + void reject() override; -private slots: - void slotEnableOk(); +private Q_SLOTS: + void slotEnableOk(); protected: - void showEvent ( QShowEvent * event ); + void showEvent(QShowEvent* event) override; private: - FilesPage* m_filesPage; - FilesSettings* m_filesSettings; - DiffPage* m_diffPage; - DiffSettings* m_diffSettings; - ViewPage* m_viewPage; - ViewSettings* m_viewSettings; + FilesPage* m_filesPage; + FilesSettings* m_filesSettings; + DiffPage* m_diffPage; + DiffSettings* m_diffSettings; + ViewPage* m_viewPage; + ViewSettings* m_viewSettings; }; #endif
  60. Download patch komparepart/kompareview.h

    --- 4:17.08.3-1/komparepart/kompareview.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompareview.h 2017-12-31 04:27:43.000000000 +0000 @@ -26,14 +26,14 @@ class KompareSplitter; class KompareView : public QFrame { - Q_OBJECT + Q_OBJECT public: - KompareView(ViewSettings *settings, QWidget *parent); - ~KompareView() {} - KompareSplitter *splitter() { return m_splitter; } + KompareView(ViewSettings* settings, QWidget* parent); + ~KompareView() override {} + KompareSplitter* splitter() { return m_splitter; } private: - KompareSplitter *m_splitter; + KompareSplitter* m_splitter; }; #endif //_KOMPARESPLITTER_H_
  61. Download patch po/ja/kompare.po
  62. Download patch po/it/kompare.po
  63. Download patch po/ga/kompare.po
  64. Download patch debian/watch

    --- 4:17.08.3-1/debian/watch 2017-12-04 21:15:09.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/watch 2018-03-16 13:29:28.000000000 +0000 @@ -1,2 +1,3 @@ -version=4 -opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE@-([\d.]+)\.tar\.xz +version=3 +http://download.kde.org/stable/applications/([\d.]+)/src/kompare-([\d.]+).tar.xz +http://download.kde.org/unstable/applications/([\d.]+)/src/kompare-([\d.]+).tar.xz
  65. Download patch komparepart/komparesaveoptionsbase.ui
  66. Download patch komparepart/kompare_partfactory.cpp

    --- 4:17.08.3-1/komparepart/kompare_partfactory.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompare_partfactory.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -0,0 +1,54 @@ +/*************************************************************************** + kompare_partfactory.h + -------------- + begin : Wed Oct 11 2017 + Copyright 2017 Friedrich W. H. Kossebau <kossebau@kde.org> +****************************************************************************/ + +/*************************************************************************** +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by +** the Free Software Foundation; either version 2 of the License, or +** (at your option) any later version. +** +***************************************************************************/ + +#include "kompare_partfactory.h" + +#include "kompare_part.h" + +// KF +#include <KLocalizedString> + +KomparePartFactory::KomparePartFactory() + : m_aboutData(QStringLiteral("komparepart"), + i18n("KomparePart"), + QStringLiteral("4.0"), + QString(), + KAboutLicense::GPL + ) +{ + m_aboutData.addAuthor(i18n("John Firebaugh"), i18n("Author"), QStringLiteral("jfirebaugh@kde.org")); + m_aboutData.addAuthor(i18n("Otto Bruggeman"), i18n("Author"), QStringLiteral("bruggie@gmail.com")); + m_aboutData.addAuthor(i18n("Kevin Kofler"), i18n("Author"), QStringLiteral("kevin.kofler@chello.at")); +} + +KomparePartFactory::~KomparePartFactory() = default; + +QObject* KomparePartFactory::create(const char* iface, + QWidget* parentWidget, QObject* parent, + const QVariantList& args, const QString& keyword) +{ + Q_UNUSED(args); + Q_UNUSED(keyword); + + const bool wantReadOnly = (strcmp(iface, "KParts::ReadOnlyPart") == 0); + const KomparePart::Modus modus = + wantReadOnly ? KomparePart::ReadOnlyModus : + /* else */ KomparePart::ReadWriteModus; + + KomparePart* part = new KomparePart(parentWidget, parent, m_aboutData, modus); + + return part; +}
  67. Download patch po/de/kompare.po
  68. Download patch po/nl/kompare.po
  69. Download patch komparepart/komparesplitter.h

    --- 4:17.08.3-1/komparepart/komparesplitter.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/komparesplitter.h 2017-12-31 04:27:43.000000000 +0000 @@ -39,83 +39,83 @@ class KompareConnectWidget; class KompareSplitter : public QSplitter { - Q_OBJECT + Q_OBJECT public: - KompareSplitter(ViewSettings *settings, QWidget *parent); - ~KompareSplitter(); + KompareSplitter(ViewSettings* settings, QWidget* parent); + ~KompareSplitter() override; -signals: - void configChanged(); +Q_SIGNALS: + void configChanged(); - void scrollViewsToId( int id ); - void setXOffset( int x ); + void scrollViewsToId(int id); + void setXOffset(int x); - void selectionChanged( const Diff2::Difference* diff ); + void selectionChanged(const Diff2::Difference* diff); -public slots: - void slotScrollToId( int id ); - void slotDelayedUpdateScrollBars(); - void slotUpdateScrollBars(); - void slotDelayedUpdateVScrollValue(); - void slotUpdateVScrollValue(); - void keyPressEvent( QKeyEvent* e ); +public Q_SLOTS: + void slotScrollToId(int id); + void slotDelayedUpdateScrollBars(); + void slotUpdateScrollBars(); + void slotDelayedUpdateVScrollValue(); + void slotUpdateVScrollValue(); + void keyPressEvent(QKeyEvent* e) override; - void slotApplyDifference( bool apply ); - void slotApplyAllDifferences( bool apply ); - void slotApplyDifference( const Diff2::Difference* diff, bool apply ); + void slotApplyDifference(bool apply); + void slotApplyAllDifferences(bool apply); + void slotApplyDifference(const Diff2::Difference* diff, bool apply); - void slotSetSelection( const Diff2::DiffModel* model, const Diff2::Difference* diff ); - void slotSetSelection( const Diff2::Difference* diff ); + void slotSetSelection(const Diff2::DiffModel* model, const Diff2::Difference* diff); + void slotSetSelection(const Diff2::Difference* diff); - void slotDifferenceClicked( const Diff2::Difference* diff ); + void slotDifferenceClicked(const Diff2::Difference* diff); - void slotConfigChanged(); + void slotConfigChanged(); protected: - void wheelEvent( QWheelEvent* e ); + void wheelEvent(QWheelEvent* e) override; - ViewSettings* settings() const { return m_settings; } + ViewSettings* settings() const { return m_settings; } -protected slots: - void slotDelayedRepaintHandles(); - void slotRepaintHandles(); - void timerTimeout(); +protected Q_SLOTS: + void slotDelayedRepaintHandles(); + void slotRepaintHandles(); + void timerTimeout(); private: - // override from QSplitter - QSplitterHandle* createHandle(); + // override from QSplitter + QSplitterHandle* createHandle() override; - void setCursor( int id, const QCursor& cursor ); - void unsetCursor( int id ); + void setCursor(int id, const QCursor& cursor); + void unsetCursor(int id); protected: - KompareListView* listView( int index ); - KompareConnectWidget* connectWidget( int index ); + KompareListView* listView(int index); + KompareConnectWidget* connectWidget(int index); private: - // Scrollbars. all this just for the goddamn scrollbars. i hate them. - int scrollId(); - int lineHeight(); - int pageSize(); - bool needVScrollBar(); - int minVScrollId(); - int maxVScrollId(); - bool needHScrollBar(); - int minHScrollId(); - int maxHScrollId(); - int maxContentsX(); - int minVisibleWidth(); - - QTimer* m_scrollTimer; - bool m_restartTimer; - int m_scrollTo; - - ViewSettings* m_settings; - QScrollBar* m_vScroll; - QScrollBar* m_hScroll; + // Scrollbars. all this just for the goddamn scrollbars. i hate them. + int scrollId(); + int lineHeight(); + int pageSize(); + bool needVScrollBar(); + int minVScrollId(); + int maxVScrollId(); + bool needHScrollBar(); + int minHScrollId(); + int maxHScrollId(); + int maxContentsX(); + int minVisibleWidth(); + + QTimer* m_scrollTimer; + bool m_restartTimer; + int m_scrollTo; + + ViewSettings* m_settings; + QScrollBar* m_vScroll; + QScrollBar* m_hScroll; - friend class KompareConnectWidgetFrame; + friend class KompareConnectWidgetFrame; }; #endif //_KOMPARESPLITTER_H_
  70. Download patch komparepart/kompare_part.h
  71. Download patch po/ko/kompare.po
  72. Download patch libdialogpages/viewpage.h

    --- 4:17.08.3-1/libdialogpages/viewpage.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/viewpage.h 2017-12-31 04:27:43.000000000 +0000 @@ -33,34 +33,34 @@ class ViewSettings; class DIALOGPAGES_EXPORT ViewPage : public QFrame { -Q_OBJECT + Q_OBJECT public: - ViewPage(); - ~ViewPage(); + ViewPage(); + ~ViewPage() override; public: - void setSettings( ViewSettings* ); - ViewSettings* settings( void ); + void setSettings(ViewSettings*); + ViewSettings* settings(); public: - ViewSettings* m_settings; + ViewSettings* m_settings; public: - virtual void restore(); - virtual void apply(); - virtual void setDefaults(); + virtual void restore(); + virtual void apply(); + virtual void setDefaults(); public: - KColorButton* m_removedColorButton; - KColorButton* m_changedColorButton; - KColorButton* m_addedColorButton; - KColorButton* m_appliedColorButton; - // snol == scroll number of lines - QSpinBox* m_snolSpinBox; - QSpinBox* m_tabSpinBox; - QFontComboBox* m_fontCombo; - QSpinBox* m_fontSizeSpinBox; - QTabWidget* m_tabWidget; + KColorButton* m_removedColorButton; + KColorButton* m_changedColorButton; + KColorButton* m_addedColorButton; + KColorButton* m_appliedColorButton; + // snol == scroll number of lines + QSpinBox* m_snolSpinBox; + QSpinBox* m_tabSpinBox; + QFontComboBox* m_fontCombo; + QSpinBox* m_fontSizeSpinBox; + QTabWidget* m_tabWidget; }; #endif
  73. Download patch komparepart/komparesaveoptionsbase.h

    --- 4:17.08.3-1/komparepart/komparesaveoptionsbase.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/komparesaveoptionsbase.h 2017-12-31 04:27:43.000000000 +0000 @@ -17,7 +17,7 @@ #ifndef KOMPARESAVEOPTIONSBASE_H #define KOMPARESAVEOPTIONSBASE_H -#include <QtCore/QVariant> +#include <QVariant> #include "ui_komparesaveoptionsbase.h" @@ -26,10 +26,10 @@ class KompareSaveOptionsBase : public QW Q_OBJECT public: - explicit KompareSaveOptionsBase(QWidget* parent = 0, Qt::WindowFlags fl = 0); - ~KompareSaveOptionsBase(); + explicit KompareSaveOptionsBase(QWidget* parent = nullptr); + ~KompareSaveOptionsBase() override; -protected slots: +protected Q_SLOTS: virtual void languageChange(); };
  74. Download patch komparepart/komparesplitter.cpp
  75. Download patch komparepart/CMakeLists.txt

    --- 4:17.08.3-1/komparepart/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,12 +1,8 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../libdialogpages ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces ) - - -########### next target ############### - set( komparepart_PART_SRCS kompare_part.cpp + kompare_partfactory.cpp kompareconnectwidget.cpp komparesplitter.cpp komparelistview.cpp @@ -15,13 +11,16 @@ set( komparepart_PART_SRCS komparesaveoptionswidget.cpp kompareview.cpp ) +ecm_qt_declare_logging_category(komparepart_PART_SRCS + HEADER komparepartdebug.h + IDENTIFIER KOMPAREPART + CATEGORY_NAME "komparepart" +) ki18n_wrap_ui(komparepart_PART_SRCS komparesaveoptionsbase.ui ) add_library(komparepart MODULE ${komparepart_PART_SRCS}) - - target_link_libraries(komparepart komparedialogpages kompareinterface @@ -32,63 +31,7 @@ target_link_libraries(komparepart Qt5::PrintSupport ) -install(TARGETS komparepart DESTINATION ${PLUGIN_INSTALL_DIR} ) - - -########### install files ############### - -install( FILES komparepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES komparepartui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kompare ) - - - +install(TARGETS komparepart DESTINATION ${KDE_INSTALL_PLUGINDIR}) -#original Makefile.am contents follow: - -########################################################################## -## KPART SECTION -########################################################################## -# -#INCLUDES = \ -# -I$(top_srcdir)/kompare/libdialogpages \ -# -I$(top_srcdir)/kompare/interfaces \ -# $(all_includes) -# -#noinst_HEADERS = \ -# kompare_part.h \ -# komparesplitter.h \ -# kompareprefdlg.h \ -# komparelistview.h \ -# kompareconnectwidget.h \ -# komparesaveoptionsbase.h \ -# komparesaveoptionswidget.h \ -# kompare_qsplitter.h -# -## let automoc handle all of the meta source files (moc) -#METASOURCES = AUTO -# -#kde_module_LTLIBRARIES = libkomparepart.la -# -## the Part's source, library search path, and link libraries -#libkomparepart_la_SOURCES = \ -# kompare_part.cpp \ -# kompareconnectwidget.cpp \ -# komparesplitter.cpp \ -# komparelistview.cpp \ -# kompareprefdlg.cpp \ -# komparesaveoptionsbase.ui \ -# komparesaveoptionswidget.cpp -# -#libkomparepart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -#libkomparepart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) \ -# ../libdialogpages/libdialogpages.la \ -# ../interfaces/libkompareinterface.la -# -## this is where the desktop file will go -#partdesktopdir = $(kde_servicesdir) -#partdesktop_DATA = komparepart.desktop -# -## this is where the part's XML-GUI resource file goes -#partrcdir = $(kde_datadir)/kompare -#partrc_DATA = komparepartui.rc -# +install(FILES komparepart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +install(FILES komparepartui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/komparepart)
  76. Download patch po/ar/kompare.po
  77. Download patch org.kde.kompare.desktop

    --- 4:17.08.3-1/org.kde.kompare.desktop 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/org.kde.kompare.desktop 2017-12-31 04:27:43.000000000 +0000 @@ -134,4 +134,3 @@ X-DocPath=kompare/index.html Terminal=false Categories=Qt;KDE;Development; InitialPreference=10 -X-DBUS-ServiceName=org.kde.kompare
  78. Download patch po/sl/kompare.po
  79. Download patch libdialogpages/diffpage.cpp
  80. Download patch po/pa/kompare.po
  81. Download patch po/es/kompare.po
  82. Download patch komparepart/kompareview.cpp

    --- 4:17.08.3-1/komparepart/kompareview.cpp 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/kompareview.cpp 2017-12-31 04:27:43.000000000 +0000 @@ -20,9 +20,9 @@ // kompare #include "komparesplitter.h" -KompareView::KompareView(ViewSettings *settings, QWidget *parent) : - QFrame( parent ) +KompareView::KompareView(ViewSettings* settings, QWidget* parent) : + QFrame(parent) { - setObjectName( "scrollFrame" ); - m_splitter = new KompareSplitter( settings, this ); + setObjectName(QStringLiteral("scrollFrame")); + m_splitter = new KompareSplitter(settings, this); }
  83. Download patch po/lt/kompare.po
  84. Download patch interfaces/kompareinterface.h

    --- 4:17.08.3-1/interfaces/kompareinterface.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/interfaces/kompareinterface.h 2017-12-31 04:27:43.000000000 +0000 @@ -34,100 +34,100 @@ class KompareInterfacePrivate; class KOMPAREINTERFACE_EXPORT KompareInterface { public: - KompareInterface(); - virtual ~KompareInterface(); + KompareInterface(); + virtual ~KompareInterface(); protected: - KompareInterface( const KompareInterface& ); - KompareInterface& operator=(const KompareInterface& ); + KompareInterface(const KompareInterface&); + KompareInterface& operator=(const KompareInterface&); public: - /** - * Open and parse the diff file at url. - */ - virtual bool openDiff( const QUrl& diffUrl ) = 0; - - /** - * Open and parse the supplied diff output - */ - virtual bool openDiff( const QString& diffOutput ) = 0; - - /** - * Open and parse the diff3 file at url. - */ - virtual bool openDiff3( const QUrl& diff3Url ) = 0; - - /** - * Open and parse the supplied diff3 output - */ - virtual bool openDiff3( const QString& diff3Output ) = 0; - - /** - * Compare, with diff, source with destination, can also be used if you do not - * know what source and destination are. The part will try to figure out what - * they are (directory, file, diff output file) and call the - * appropriate method(s) - */ - virtual void compare( const QUrl& sourceFile, const QUrl& destinationFile ) = 0; - - /** - * Compare a Source file to a custom Destination string - */ - virtual void compareFileString( const QUrl & sourceFile, const QString & destination) = 0; - - /** - * Compare a custom Source string to a Destination file - */ - virtual void compareStringFile( const QString & source, const QUrl & destinationFile) = 0; - - /** - * Compare, with diff, source with destination files - */ - virtual void compareFiles( const QUrl& sourceFile, const QUrl& destinationFile ) = 0; - - /** - * Compare, with diff, source with destination directories - */ - virtual void compareDirs ( const QUrl& sourceDir, const QUrl& destinationDir ) = 0; - - /** - * Compare, with diff3, originalFile with changedFile1 and changedFile2 - */ - virtual void compare3Files( const QUrl& originalFile, const QUrl& changedFile1, const QUrl& changedFile2 ) = 0; - - /** - * This will show the file and the file with the diff applied - */ - virtual void openFileAndDiff( const QUrl& file, const QUrl& diffFile ) = 0; - - /** - * This will show the directory and the directory with the diff applied - */ - virtual void openDirAndDiff ( const QUrl& dir, const QUrl& diffFile ) = 0; - - /** - * This will set the encoding to use for all files that are read or for the diffoutput - */ - virtual void setEncoding( const QString& encoding ); + /** + * Open and parse the diff file at url. + */ + virtual bool openDiff(const QUrl& diffUrl) = 0; + + /** + * Open and parse the supplied diff output + */ + virtual bool openDiff(const QString& diffOutput) = 0; + + /** + * Open and parse the diff3 file at url. + */ + virtual bool openDiff3(const QUrl& diff3Url) = 0; + + /** + * Open and parse the supplied diff3 output + */ + virtual bool openDiff3(const QString& diff3Output) = 0; + + /** + * Compare, with diff, source with destination, can also be used if you do not + * know what source and destination are. The part will try to figure out what + * they are (directory, file, diff output file) and call the + * appropriate method(s) + */ + virtual void compare(const QUrl& sourceFile, const QUrl& destinationFile) = 0; + + /** + * Compare a Source file to a custom Destination string + */ + virtual void compareFileString(const QUrl& sourceFile, const QString& destination) = 0; + + /** + * Compare a custom Source string to a Destination file + */ + virtual void compareStringFile(const QString& source, const QUrl& destinationFile) = 0; + + /** + * Compare, with diff, source with destination files + */ + virtual void compareFiles(const QUrl& sourceFile, const QUrl& destinationFile) = 0; + + /** + * Compare, with diff, source with destination directories + */ + virtual void compareDirs(const QUrl& sourceDir, const QUrl& destinationDir) = 0; + + /** + * Compare, with diff3, originalFile with changedFile1 and changedFile2 + */ + virtual void compare3Files(const QUrl& originalFile, const QUrl& changedFile1, const QUrl& changedFile2) = 0; + + /** + * This will show the file and the file with the diff applied + */ + virtual void openFileAndDiff(const QUrl& file, const QUrl& diffFile) = 0; + + /** + * This will show the directory and the directory with the diff applied + */ + virtual void openDirAndDiff(const QUrl& dir, const QUrl& diffFile) = 0; + + /** + * This will set the encoding to use for all files that are read or for the diffoutput + */ + virtual void setEncoding(const QString& encoding); public: - /** - * Warning this should be in class Part in KDE 4.0, not here ! - * Around that time the methods will disappear here - */ - virtual int readProperties( KConfig* config ) = 0; - virtual int saveProperties( KConfig* config ) = 0; - - /** - * Warning this should be in class ReadWritePart in KDE 4.0, not here ! - * Around that time the method will disappear here - */ - virtual bool queryClose() = 0; + /** + * Warning this should be in class Part in KDE 4.0, not here ! + * Around that time the methods will disappear here + */ + virtual int readProperties(KConfig* config) = 0; + virtual int saveProperties(KConfig* config) = 0; + + /** + * Warning this should be in class ReadWritePart in KDE 4.0, not here ! + * Around that time the method will disappear here + */ + virtual bool queryClose() = 0; protected: - // Add all variables to the KompareInterfacePrivate class and access them through the kip pointer - KompareInterfacePrivate* kip; - QString m_encoding; + // Add all variables to the KompareInterfacePrivate class and access them through the kip pointer + KompareInterfacePrivate* kip; + QString m_encoding; }; Q_DECLARE_INTERFACE(KompareInterface, "com.kde.Kompare.KompareInterface/4.0")
  85. Download patch po/fi/kompare.po
  86. Download patch po/ca/docs/kompare/index.docbook
  87. Download patch komparepart/komparepartui.rc

    --- 4:17.08.3-1/komparepart/komparepartui.rc 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/komparepart/komparepartui.rc 2017-12-31 04:27:43.000000000 +0000 @@ -1,5 +1,5 @@ -<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kompare_part" version="6" translationDomain="kompare"> +<!DOCTYPE gui SYSTEM "kpartgui.dtd"> +<gui name="kompare_part" version="7" translationDomain="kompare"> <MenuBar> <Menu name="file"><text>&amp;File</text> <Action name="file_save"/> @@ -45,4 +45,16 @@ <Action name="difference_apply"/> <Action name="difference_applyall"/> </ToolBar> -</kpartgui> +<Menu name="mainPopUp"> + <Action name="difference_unapplyall"/> + <Action name="difference_unapply"/> + <Action name="difference_apply"/> + <Action name="difference_applyall"/> + <Separator/> + <Action name="difference_previousfile"/> + <Action name="difference_nextfile"/> + <Separator/> + <Action name="difference_previous"/> + <Action name="difference_next"/> +</Menu> +</gui>
  88. Download patch po/ca/kompare.po
  89. Download patch libdialogpages/filespage.cpp
  90. Download patch po/fr/kompare.po
  91. Download patch po/ca@valencia/kompare.po
  92. Download patch komparepart/kompare_part.cpp
  93. Download patch libdialogpages/filespage.h

    --- 4:17.08.3-1/libdialogpages/filespage.h 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/libdialogpages/filespage.h 2017-12-31 04:27:43.000000000 +0000 @@ -33,51 +33,51 @@ class FilesSettings; class DIALOGPAGES_EXPORT FilesPage : public QFrame { -Q_OBJECT + Q_OBJECT public: - FilesPage(); - virtual ~FilesPage(); + FilesPage(); + ~FilesPage() override; public: - KUrlRequester* firstURLRequester() const; - KUrlRequester* secondURLRequester() const; + KUrlRequester* firstURLRequester() const; + KUrlRequester* secondURLRequester() const; - QString encoding() const; + QString encoding() const; - void setFirstGroupBoxTitle ( const QString& title ); - void setSecondGroupBoxTitle( const QString& title ); + void setFirstGroupBoxTitle(const QString& title); + void setSecondGroupBoxTitle(const QString& title); - void setURLsInComboBoxes(); + void setURLsInComboBoxes(); - void setFirstURLRequesterMode( unsigned int mode ); - void setSecondURLRequesterMode( unsigned int mode ); + void setFirstURLRequesterMode(unsigned int mode); + void setSecondURLRequesterMode(unsigned int mode); public: - virtual void setSettings( FilesSettings* settings ); - virtual void restore(); - virtual void apply(); - virtual void setDefaults(); + virtual void setSettings(FilesSettings* settings); + virtual void restore(); + virtual void apply(); + virtual void setDefaults(); -private slots: - void open(); +private Q_SLOTS: + void open(); private: - QGroupBox* m_firstGB; - QGroupBox* m_secondGB; - QGroupBox* m_thirdGB; - KUrlComboBox* m_firstURLComboBox; - KUrlComboBox* m_secondURLComboBox; - KUrlRequester* m_firstURLRequester; - KUrlRequester* m_secondURLRequester; - // Use this bool to lock the connection between both KUrlRequesters. - // This prevents annoying behaviour - bool m_URLChanged; - KComboBox* m_encodingComboBox; - - FilesSettings* m_settings; + void doOpen(KUrlComboBox* urlComboBox, bool selectFolders); private: - void open(KUrlComboBox* urlComboBox, bool selectFolders); + QGroupBox* m_firstGB; + QGroupBox* m_secondGB; + QGroupBox* m_thirdGB; + KUrlComboBox* m_firstURLComboBox; + KUrlComboBox* m_secondURLComboBox; + KUrlRequester* m_firstURLRequester; + KUrlRequester* m_secondURLRequester; + // Use this bool to lock the connection between both KUrlRequesters. + // This prevents annoying behaviour + bool m_URLChanged; + KComboBox* m_encodingComboBox; + + FilesSettings* m_settings; }; #endif
  94. Download patch doc/CMakeLists.txt

    --- 4:17.08.3-1/doc/CMakeLists.txt 2017-10-24 03:51:10.000000000 +0000 +++ 4:17.12.3-0ubuntu1/doc/CMakeLists.txt 2017-12-31 04:27:43.000000000 +0000 @@ -1,4 +1 @@ -########### install files ############### -# -# -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kompare) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kompare)
  95. Download patch debian/kpart5-kompare.install

    --- 4:17.08.3-1/debian/kpart5-kompare.install 2016-06-04 08:48:13.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/kpart5-kompare.install 2018-03-16 13:29:28.000000000 +0000 @@ -7,4 +7,4 @@ usr/share/kservices5/komparenavtreepart. usr/share/kservices5/komparepart.desktop usr/share/kservicetypes5/komparenavigationpart.desktop usr/share/kservicetypes5/kompareviewpart.desktop -usr/share/kxmlgui5/kompare/komparepartui.rc +usr/share/kxmlgui5/komparepart/komparepartui.rc
  96. Download patch main.cpp
  97. Download patch kompare_shell.cpp
  98. Download patch po/cs/kompare.po
  99. Download patch kompare_shell.h
  100. Download patch komparenavtreepart/komparenavtreepart.h
  101. ...

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libkomparediff2

libkomparediff2 (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 16 Mar 2018 13:33:05 +0000 libkomparediff2 (4:17.12.2-0ubuntu1) bionic; urgency=medium * Update symbols from build logs * New upstream release (17.11.80) * New upstream release (17.11.90) * New upstream release (17.12.0) * New upstream release (17.12.2) -- Rik Mills <rikmills@kubuntu.org> Thu, 22 Feb 2018 17:02:41 +0000 libkomparediff2 (4:17.08.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.08.3) -- Rik Mills <rikmills@kubuntu.org> Fri, 01 Dec 2017 15:12:37 +0000 libkomparediff2 (4:17.04.3-0ubuntu1) artful; urgency=low * New upstream release (17.04.1) * Install translations and add Breaks/Replaces against kde-l10n * New upstream release (17.04.2) * New upstream release (17.04.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 18 Aug 2017 08:30:06 +0100 libkomparediff2 (4:16.12.3-0ubuntu1) zesty; urgency=low [ Darin Miller ] * New upstream release (16.12.2) [ José Manuel Santamaría Lema ] * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to avoid possible spurious test failures. * New upstream release (16.12.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 10 Mar 2017 21:26:05 +0000 libkomparediff2 (4:16.12.1-0ubuntu1) zesty; urgency=medium [ José Manuel Santamaría Lema ] * Update Vcs-Git fields to use https:// instead of git:// [ Rik Mills ] * New upstream release (16.12.0) * Update build deps to use new KF5 style names * New upstream release (16.12.1) -- Rik Mills <rikmills@kubuntu.org> Thu, 19 Jan 2017 16:14:45 +0000 libkomparediff2 (4:16.04.3-0ubuntu1) yakkety; urgency=medium [ Scarlett Clark ] * New upstream release [ Philip Muškovac ] * Update the Vcs URLs now that the repositories are hosted on Launchpad [ Scarlett Clark ] * New upstream bugfix release [ Clive Johnston ] * New upstream release (16.04.2) * New upstream release (16.04.3) -- José Manuel Santamaría Lema <panfaust@gmail.com> Fri, 30 Sep 2016 06:38:30 +0200 libkomparediff2 (4:15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release * New upstream bugfix release -- Scarlett Clark <sgclark@kubuntu.org> Thu, 14 Apr 2016 16:22:33 -0700 libkomparediff2 (4:15.12.1-0ubuntu1) xenial; urgency=medium * New upstream release * Merged with Debian -- Clive Johnston <clivejo@aol.com> Wed, 09 Mar 2016 11:29:42 +0100

Modifications :
  1. Download patch po/lt/libkomparediff2.po

    --- 4:17.08.3-1/po/lt/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/lt/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-05-03 19:16+0300\n" "Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n" "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Prit&aikyti skirtumą" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Pa&naikinti skirtumo pritaikymą" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Pritaik&yti viską" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Panaikinti visko pritaikymą" @@ -60,45 +60,45 @@ msgstr "A&nkstesnis skirtumas" msgid "&Next Difference" msgstr "&Kitas skirtumas" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Negalima atidaryti laikino failo." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Negalima išnagrinėti diff išvesties." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Failai yra identiški." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Negalima įrašyti į laikiną failą." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  2. Download patch po/ja/libkomparediff2.po

    --- 4:17.08.3-1/po/ja/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ja/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-07-20 23:29+0900\n" "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n" "Language-Team: Japanese <kde-jp@kde.org>\n" @@ -21,22 +21,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "パッチを適用(&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "パッチを戻す(&A)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "すべてのパッチを適用(&L)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "すべてのパッチを戻す(&U)" @@ -61,7 +61,7 @@ msgstr "前の差異(&P)" msgid "&Next Difference" msgstr "次の差異(&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -70,14 +70,14 @@ msgstr "" "<qt>このファイルはモデルではないか、差分がありません。<b>%1</b> は有効な差分" "ファイルではありません。</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt>差分 <b>%1</b> をファイル ‘%2’ に適用中に問題が発生しました。</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -85,17 +85,17 @@ msgid "" msgstr "" "<qt>差分 <b>%1</b> をフォルダ <b>%2</b> に適用中に問題が発生しました。</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "一時ファイルを開けませんでした。" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>一時ファイル ‘%1’ へ書き込めませんでした。削除します。</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -104,7 +104,7 @@ msgstr "" "<qt>適用先ディレクトリ <b>%1</b> を作成できませんでした。\n" "ファイルは保存されていません。</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -115,22 +115,22 @@ msgstr "" "だ以下にあります:<b>%2</b> 手作業でそれを適切な場所にコピーすることができま" "す。</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "diff 出力を解析できません。" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "これらファイルは同じです。" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "一時ファイルに書き込めませんでした。" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  3. Download patch po/it/libkomparediff2.po

    --- 4:17.08.3-1/po/it/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/it/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-06-17 08:52+0200\n" "Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n" "Language-Team: Italian <kde-i18n-it@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Applica differenza" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Annulla differenza" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "App&lica tutto" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "A&nnulla tutto" @@ -58,7 +58,7 @@ msgstr "Differenza &precedente" msgid "&Next Difference" msgstr "Differenza succes&siva" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>Nessun modello o differenza, questo file: <b>%1</b>, non è un file di " "confronto valido.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -76,7 +76,7 @@ msgstr "" "<qt>Ci sono stati problemi nell'applicazione dei cambiamenti <b>%1</b> al " "file <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -85,18 +85,18 @@ msgstr "" "<qt>Ci sono stati problemi nell'applicazione dei cambiamenti <b>%1</b> alla " "cartella <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Impossibile aprire il file temporaneo." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Impossibile scrivere sul file temporaneo <b>%1</b>, sarà eliminato.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Impossibile creare la cartella di destinazione <b>%1</b>.\n" "Il file non è stato salvato.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "%1</b>. Il file temporaneo è ancora disponibile a: <b>%2</b>. Puoi copiarlo " "manualmente nel posto giusto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Impossibile analizzare l'output di confronto." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "I file sono identici." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Impossibile scrivere sul file temporaneo." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  4. Download patch diffmodellist.h

    --- 4:17.08.3-1/diffmodellist.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffmodellist.h 2017-10-15 18:34:06.000000000 +0000 @@ -32,17 +32,15 @@ typedef QList<DiffModel*>::ConstIterator class DIFF2_EXPORT DiffModelList : public QList<DiffModel*> { public: - DiffModelList() {} - DiffModelList( const DiffModelList &list ) : QList<DiffModel*>( list ) {} - virtual ~DiffModelList() - { - // Memleak as indicated by valgrind - while ( !isEmpty() ) - delete takeFirst(); - } + DiffModelList() {} + DiffModelList(const DiffModelList& list) : QList<DiffModel*>(list) {} + virtual ~DiffModelList() + { + qDeleteAll(begin(), end()); + } public: - virtual void sort(); + virtual void sort(); }; // End of class DiffModelList
  5. Download patch po/ko/libkomparediff2.po

    --- 4:17.08.3-1/po/ko/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ko/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2014-03-01 01:56+0900\n" "Last-Translator: Shinjo Park <kde@peremen.name>\n" "Language-Team: Korean <cho.sungjae@gmail.com>\n" @@ -16,22 +16,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "차이점 적용하기(&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "차이점 적용 취소하기(&A)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "모두 적용하기(&L)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "모두 적용 취소하기(&U)" @@ -56,7 +56,7 @@ msgstr "이전 차이점(&P)" msgid "&Next Difference" msgstr "다음 차이점(&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -65,7 +65,7 @@ msgstr "" "<qt>모델이나 차이점이 없습니다. 파일 <b>%1</b>이(가) 올바른 변경점 파일이 아" "닙니다.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -74,7 +74,7 @@ msgstr "" "<qt>파일 <b>%2</b>에 변경 사항 <b>%1</b>을(를) 적용하는 중 오류가 발생했습니" "다.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -83,17 +83,17 @@ msgstr "" "<qt>폴더 <b>%2</b>에 변경 사항 <b>%1</b>을(를) 적용하는 중 오류가 발생했습니" "다.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "임시 파일을 열 수 없습니다." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>임시 파일 <b>%1</b>에 쓸 수 없어서 삭제합니다.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -102,7 +102,7 @@ msgstr "" "<qt>대상 디렉터리 <b>%1</b>을(를) 만들 수 없습니다.\n" "파일이 저장되지 않았습니다.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -112,22 +112,22 @@ msgstr "" "<qt>임시 파일을 대상 위치 <b>%1</b>에 업로드할 수 없습니다. 임시 파일은 다음 " "위치에 저장되어 있습니다: <b>%2</b>. 직접 업로드할 수 있습니다.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "diff 출력을 처리할 수 없습니다." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "파일이 같습니다." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "임시 파일에 쓸 수 없습니다." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  6. Download patch parserbase.cpp
  7. Download patch debian/libkomparediff2-5.acc.in

    --- 4:17.08.3-1/debian/libkomparediff2-5.acc.in 2016-06-04 08:58:17.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/libkomparediff2-5.acc.in 2018-03-16 13:33:05.000000000 +0000 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <descriptor> <version> @@ -16,6 +16,7 @@ <gcc_options> -fPIC -std=c++11 + -fno-keep-inline-functions </gcc_options> -</descriptor> +</descriptor> \ No newline at end of file
  8. Download patch cvsdiffparser.h

    --- 4:17.08.3-1/cvsdiffparser.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/cvsdiffparser.h 2017-10-15 18:34:06.000000000 +0000 @@ -16,8 +16,6 @@ #ifndef CVSDIFF_PARSER_H #define CVSDIFF_PARSER_H -#include <QRegExp> - #include "parserbase.h" namespace Diff2 @@ -28,30 +26,30 @@ class KompareModelList; class CVSDiffParser : public ParserBase { public: - CVSDiffParser( const KompareModelList* list, const QStringList& diff ); - virtual ~CVSDiffParser(); + CVSDiffParser(const KompareModelList* list, const QStringList& diff); + ~CVSDiffParser() override; protected: - enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; + enum Kompare::Format determineFormat() override; protected: -// virtual bool parseContextDiffHeader(); - bool parseEdDiffHeader() Q_DECL_OVERRIDE; - bool parseNormalDiffHeader() Q_DECL_OVERRIDE; - bool parseRCSDiffHeader() Q_DECL_OVERRIDE; -// virtual bool parseUnifiedDiffHeader(); - -// virtual bool parseContextHunkHeader(); - bool parseEdHunkHeader() Q_DECL_OVERRIDE; -// virtual bool parseNormalHunkHeader(); - bool parseRCSHunkHeader() Q_DECL_OVERRIDE; -// virtual bool parseUnifiedHunkHeader(); - -// virtual bool parseContextHunkBody(); - bool parseEdHunkBody() Q_DECL_OVERRIDE; -// virtual bool parseNormalHunkBody(); - bool parseRCSHunkBody() Q_DECL_OVERRIDE; -// virtual bool parseUnifiedHunkBody(); +// virtual bool parseContextDiffHeader(); + bool parseEdDiffHeader() override; + bool parseNormalDiffHeader() override; + bool parseRCSDiffHeader() override; +// virtual bool parseUnifiedDiffHeader(); + +// virtual bool parseContextHunkHeader(); + bool parseEdHunkHeader() override; +// virtual bool parseNormalHunkHeader(); + bool parseRCSHunkHeader() override; +// virtual bool parseUnifiedHunkHeader(); + +// virtual bool parseContextHunkBody(); + bool parseEdHunkBody() override; +// virtual bool parseNormalHunkBody(); + bool parseRCSHunkBody() override; +// virtual bool parseUnifiedHunkBody(); }; } // End of namespace Diff2
  9. Download patch debian/tests/control

    --- 4:17.08.3-1/debian/tests/control 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/tests/control 2018-03-16 13:33:05.000000000 +0000 @@ -1,6 +1,6 @@ Tests: testsuite Depends: @, @builddeps@, build-essential, - xvfb, xauth, dbus + xvfb, xauth, dbus-x11 Restrictions: build-needed Tests: acc
  10. Download patch diffsettings.cpp

    --- 4:17.08.3-1/diffsettings.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffsettings.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -17,27 +17,29 @@ #include "diffsettings.h" -#include <kconfig.h> -#include <kconfiggroup.h> +#include <KConfig> +#include <KConfigGroup> -DiffSettings::DiffSettings( QWidget* parent ) - : SettingsBase( parent ), - m_linesOfContext( 0 ), - m_format( Kompare::Unified ), - m_largeFiles( false ), - m_ignoreWhiteSpace( false ), - m_ignoreAllWhiteSpace( false ), - m_ignoreEmptyLines( false ), - m_ignoreChangesDueToTabExpansion( false ), - m_createSmallerDiff( false ), - m_ignoreChangesInCase( false ), - m_showCFunctionChange( false ), - m_convertTabsToSpaces( false ), - m_ignoreRegExp( false ), - m_recursive( false ), - m_newFiles( false ), - m_excludeFilePattern( false ), - m_excludeFilesFile( false ) +#include <QWidget> + +DiffSettings::DiffSettings(QWidget* parent) + : SettingsBase(parent), + m_linesOfContext(0), + m_format(Kompare::Unified), + m_largeFiles(false), + m_ignoreWhiteSpace(false), + m_ignoreAllWhiteSpace(false), + m_ignoreEmptyLines(false), + m_ignoreChangesDueToTabExpansion(false), + m_createSmallerDiff(false), + m_ignoreChangesInCase(false), + m_showCFunctionChange(false), + m_convertTabsToSpaces(false), + m_ignoreRegExp(false), + m_recursive(false), + m_newFiles(false), + m_excludeFilePattern(false), + m_excludeFilesFile(false) { } @@ -45,64 +47,64 @@ DiffSettings::~DiffSettings() { } -void DiffSettings::loadSettings( KConfig* config ) +void DiffSettings::loadSettings(KConfig* config) { - KConfigGroup group( config, "Diff Options" ); - m_diffProgram = group.readEntry ( "DiffProgram", "" ); - m_linesOfContext = group.readEntry ( "LinesOfContext", 3 ); - m_largeFiles = group.readEntry( "LargeFiles", true ); - m_ignoreWhiteSpace = group.readEntry( "IgnoreWhiteSpace", false ); - m_ignoreAllWhiteSpace = group.readEntry( "IgnoreAllWhiteSpace", false ); - m_ignoreEmptyLines = group.readEntry( "IgnoreEmptyLines", false ); - m_ignoreChangesDueToTabExpansion = group.readEntry( "IgnoreChangesDueToTabExpansion", false ); - m_ignoreChangesInCase = group.readEntry( "IgnoreChangesInCase", false ); - m_ignoreRegExp = group.readEntry( "IgnoreRegExp", false ); - m_ignoreRegExpText = group.readEntry ( "IgnoreRegExpText", "" ); - m_ignoreRegExpTextHistory = group.readEntry( "IgnoreRegExpTextHistory", QStringList() ); - m_createSmallerDiff = group.readEntry( "CreateSmallerDiff", true ); - m_convertTabsToSpaces = group.readEntry( "ConvertTabsToSpaces", false ); - m_showCFunctionChange = group.readEntry( "ShowCFunctionChange", false ); - m_recursive = group.readEntry( "CompareRecursively", true ); - m_newFiles = group.readEntry( "NewFiles", true ); - - m_format = static_cast<Kompare::Format>( group.readEntry( "Format", (int) Kompare::Unified ) ); - - KConfigGroup group2 ( config, "Exclude File Options" ); - m_excludeFilePattern = group2.readEntry( "Pattern", false ); - m_excludeFilePatternList = group2.readEntry( "PatternList", QStringList() ); - m_excludeFilesFile = group2.readEntry( "File", false ); - m_excludeFilesFileURL = group2.readEntry ( "FileURL", "" ); - m_excludeFilesFileHistoryList = group2.readEntry( "FileHistoryList", QStringList() ); + KConfigGroup group(config, "Diff Options"); + m_diffProgram = group.readEntry("DiffProgram", QString()); + m_linesOfContext = group.readEntry("LinesOfContext", 3); + m_largeFiles = group.readEntry("LargeFiles", true); + m_ignoreWhiteSpace = group.readEntry("IgnoreWhiteSpace", false); + m_ignoreAllWhiteSpace = group.readEntry("IgnoreAllWhiteSpace", false); + m_ignoreEmptyLines = group.readEntry("IgnoreEmptyLines", false); + m_ignoreChangesDueToTabExpansion = group.readEntry("IgnoreChangesDueToTabExpansion", false); + m_ignoreChangesInCase = group.readEntry("IgnoreChangesInCase", false); + m_ignoreRegExp = group.readEntry("IgnoreRegExp", false); + m_ignoreRegExpText = group.readEntry("IgnoreRegExpText", QString()); + m_ignoreRegExpTextHistory = group.readEntry("IgnoreRegExpTextHistory", QStringList()); + m_createSmallerDiff = group.readEntry("CreateSmallerDiff", true); + m_convertTabsToSpaces = group.readEntry("ConvertTabsToSpaces", false); + m_showCFunctionChange = group.readEntry("ShowCFunctionChange", false); + m_recursive = group.readEntry("CompareRecursively", true); + m_newFiles = group.readEntry("NewFiles", true); + + m_format = static_cast<Kompare::Format>(group.readEntry("Format", (int) Kompare::Unified)); + + KConfigGroup group2(config, "Exclude File Options"); + m_excludeFilePattern = group2.readEntry("Pattern", false); + m_excludeFilePatternList = group2.readEntry("PatternList", QStringList()); + m_excludeFilesFile = group2.readEntry("File", false); + m_excludeFilesFileURL = group2.readEntry("FileURL", QString()); + m_excludeFilesFileHistoryList = group2.readEntry("FileHistoryList", QStringList()); } -void DiffSettings::saveSettings( KConfig* config ) +void DiffSettings::saveSettings(KConfig* config) { - KConfigGroup group( config, "Diff Options" ); - group.writeEntry( "DiffProgram", m_diffProgram ); - group.writeEntry( "LinesOfContext", m_linesOfContext ); - group.writeEntry( "Format", QString(m_format) ); - group.writeEntry( "LargeFiles", m_largeFiles ); - group.writeEntry( "IgnoreWhiteSpace", m_ignoreWhiteSpace ); - group.writeEntry( "IgnoreAllWhiteSpace", m_ignoreAllWhiteSpace ); - group.writeEntry( "IgnoreEmptyLines", m_ignoreEmptyLines ); - group.writeEntry( "IgnoreChangesInCase", m_ignoreChangesInCase ); - group.writeEntry( "IgnoreChangesDueToTabExpansion", m_ignoreChangesDueToTabExpansion ); - group.writeEntry( "IgnoreRegExp", m_ignoreRegExp ); - group.writeEntry( "IgnoreRegExpText", m_ignoreRegExpText ); - group.writeEntry( "IgnoreRegExpTextHistory", m_ignoreRegExpTextHistory ); - group.writeEntry( "CreateSmallerDiff", m_createSmallerDiff ); - group.writeEntry( "ConvertTabsToSpaces", m_convertTabsToSpaces ); - group.writeEntry( "ShowCFunctionChange", m_showCFunctionChange ); - group.writeEntry( "CompareRecursively", m_recursive ); - group.writeEntry( "NewFiles", m_newFiles ); - - KConfigGroup group2( config, "Exclude File Options" ); - group2.writeEntry( "Pattern", m_excludeFilePattern ); - group2.writeEntry( "PatternList", m_excludeFilePatternList ); - group2.writeEntry( "File", m_excludeFilesFile ); - group2.writeEntry( "FileURL", m_excludeFilesFileURL ); - group2.writeEntry( "FileHistoryList", m_excludeFilesFileHistoryList ); + KConfigGroup group(config, "Diff Options"); + group.writeEntry("DiffProgram", m_diffProgram); + group.writeEntry("LinesOfContext", m_linesOfContext); + group.writeEntry("Format", QString(m_format)); + group.writeEntry("LargeFiles", m_largeFiles); + group.writeEntry("IgnoreWhiteSpace", m_ignoreWhiteSpace); + group.writeEntry("IgnoreAllWhiteSpace", m_ignoreAllWhiteSpace); + group.writeEntry("IgnoreEmptyLines", m_ignoreEmptyLines); + group.writeEntry("IgnoreChangesInCase", m_ignoreChangesInCase); + group.writeEntry("IgnoreChangesDueToTabExpansion", m_ignoreChangesDueToTabExpansion); + group.writeEntry("IgnoreRegExp", m_ignoreRegExp); + group.writeEntry("IgnoreRegExpText", m_ignoreRegExpText); + group.writeEntry("IgnoreRegExpTextHistory", m_ignoreRegExpTextHistory); + group.writeEntry("CreateSmallerDiff", m_createSmallerDiff); + group.writeEntry("ConvertTabsToSpaces", m_convertTabsToSpaces); + group.writeEntry("ShowCFunctionChange", m_showCFunctionChange); + group.writeEntry("CompareRecursively", m_recursive); + group.writeEntry("NewFiles", m_newFiles); + + KConfigGroup group2(config, "Exclude File Options"); + group2.writeEntry("Pattern", m_excludeFilePattern); + group2.writeEntry("PatternList", m_excludeFilePatternList); + group2.writeEntry("File", m_excludeFilesFile); + group2.writeEntry("FileURL", m_excludeFilesFileURL); + group2.writeEntry("FileHistoryList", m_excludeFilesFileHistoryList); - config->sync(); + config->sync(); }
  11. Download patch po/kk/libkomparediff2.po

    --- 4:17.08.3-1/po/kk/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/kk/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-06-27 04:14+0600\n" "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n" "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.2\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Айырмашылығын толықтыру" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Айырмашылықты толықтырудан &айну" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Барлығын қос&у" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Бүкіл т&олықтырулардан айну" @@ -57,7 +57,7 @@ msgstr "А&лдыңғы айырмашы msgid "&Next Difference" msgstr "К&елесі айырмашылық" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgstr "" "<qt>Үлгісі не айырмашылығы жоқ. Бұл <b>%1</b> файлы жарамды diff файлы емес." "</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>diff <b>%1</b> айырмашылық файлымен <b>%2</b> деген файлды толықтырғанда " "мәселелер туды.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,17 +84,17 @@ msgstr "" "<qt>diff <b>%1</b> айырмашылық файлымен <b>%2</b> деген қапшықтағыны " "толықтырғанда мәселелер туды.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Уақытша файлы ашылмады." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt><b>%1</b> деген уақытша файлға жазу болмады, ол өшіріледі.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -103,7 +103,7 @@ msgstr "" "<qt><b>%1</b> деген мақсаттаған қапшық құрылмады.\n" "Файл сақталған жоқ.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -113,22 +113,22 @@ msgstr "" "<qt>Уақытша файл мақсатталған <b>%1</b> деген орынына жүктелмеді. <b>%2</b> " "деген уақытша файл әлі бар. Өзіңіз керек жерге көшіріп көріңіз.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "diff шығысы талдауға келмеді." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Файлдар бірдей." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Уақытша файл жазылмады." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  12. Download patch po/is/libkomparediff2.po

    --- 4:17.08.3-1/po/is/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/is/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-07-28 20:22+0000\n" "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n" "Language-Team: Icelandic <kde-isl@molar.is>\n" @@ -18,22 +18,22 @@ msgstr "" "\n" "\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Virkja mismun" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Afvirkja mismun" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Virkja a&llt" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "A&fvirkja allt" @@ -58,45 +58,45 @@ msgstr "Fyrra &mismunur" msgid "&Next Difference" msgstr "Næsti m&ismunur" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, fuzzy, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "Enginn mismunur, Þessi skrá: %1, er ekki gild diff skrá." -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, fuzzy, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "Það komu upp vandamál við að virkja diff (%1) í skrána (%2)." -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, fuzzy, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "Það komu upp vandamál við að virkja diff (%1) í möppuna (%2)." -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Gat ekki opnað vinnuskrá." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, fuzzy, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "Gat ekki skrifað í vinnuskrána." -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, fuzzy, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgstr "" "Gat ekki sent vinnuskrána á áfangastaðinn %2. Vinnuskráin er enn tiltæk í: " "%1. Þú getur afritað hana handvirkt á rétta staðinn." -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Gat ekki þáttað diff úttak." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Skrárnar eru eins." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Gat ekki skrifað í vinnuskrána." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  13. Download patch po/hr/libkomparediff2.po

    --- 4:17.08.3-1/po/hr/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/hr/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare 0\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2004-04-20 13:26+CEST\n" "Last-Translator: auto\n" "Language-Team: Croatian <kde-croatia-list@lists.sourceforge.net>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, fuzzy, kde-format msgid "&Apply Difference" msgstr "&Priizbornik razliku" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, fuzzy, kde-format msgid "Un&apply Difference" msgstr "&Poništi primenjenu razliku" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, fuzzy, kde-format msgid "App&ly All" msgstr "Prime&ni sve" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, fuzzy, kde-format msgid "&Unapply All" msgstr "&Poništi sve primenjeno" @@ -60,45 +60,45 @@ msgstr "&Prethodna razlika" msgid "&Next Difference" msgstr "&Sljedeća razlika" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, fuzzy, kde-format msgid "Could not open a temporary file." msgstr "Nisam mogao otvoriti privreizbornik datoteka." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, fuzzy, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, fuzzy, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, fuzzy, kde-format msgid "Could not parse diff output." msgstr "Nisam mogao da analiziram diff izlaz." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, fuzzy, kde-format msgid "The files are identical." msgstr "Datoteke su identični." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, fuzzy, kde-format msgid "Could not write to the temporary file." msgstr "Nisam mogao da pišem u privreizbornik datoteka." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  14. Download patch po/hu/libkomparediff2.po

    --- 4:17.08.3-1/po/hu/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/hu/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: KDE 4.2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-04-09 23:49+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Az eltérés al&kalmazása" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Eltérés alkalmazásának v&isszavonása" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Alkalma&zás (teljes)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Az alkalmazások &visszavonása" @@ -58,7 +58,7 @@ msgstr "Az e&lőző eltérés" msgid "&Next Difference" msgstr "A köve&tkező eltérés" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgid "" msgstr "" "<qt>Nincs modell vagy különbség, a(z) <b>%1</b> fájl nem diff-fájl.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>Nem sikerült alkalmazni a(z) <b>%1</b> diff-fájlt a(z) <b>%2</b> fájlra." "</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,19 +84,19 @@ msgstr "" "<qt>Nem sikerült alkalmazni a(z) <b>%1</b> diff-kimenetet a(z) <b>%2</b> " "mappára.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Az egyik ideiglenes fájlt nem sikerült megnyitni." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Nem sikerült írni a(z) <b>%1</b> ideiglenes fájlba, ezért le lesz " "törölve.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Nem sikerült létrehozni a célmappát: <b>%1</b>.\n" "A fájl nem lett elmentve.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "Az ideiglenes fájl még található itt: <b>%2</b>. Próbálja meg átmásolni a " "fájlt a megfelelő helyre.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "A diff kimenet feldolgozása nem sikerült." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "A fájlok teljesen egyformák." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Nem sikerült írni egy ideiglenes fájlba." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  15. Download patch debian/upstream/metadata

    --- 4:17.08.3-1/debian/upstream/metadata 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -Name: libkomparediff2 -Changelog: https://cgit.kde.org/libkomparediff2.git/log -Contact: kde-devel@kde.org -Donation: https://www.kde.org/community/donations/index.php -Repository: https://anongit.kde.org/libkomparediff2.git -Repository-Browse: https://cgit.kde.org/libkomparediff2.git -Security-Contact: security@kde.org
  16. Download patch po/zh_CN/libkomparediff2.po

    --- 4:17.08.3-1/po/zh_CN/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/zh_CN/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2017-10-19 10:55-0400\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" +"PO-Revision-Date: 2018-02-28 02:30-0500\n" "Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -26,22 +26,22 @@ msgstr "" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/kdesdk/libkomparediff2.pot\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "应用差异(&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "不应用差异(&A)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "全部应用(&L)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "全部不应用(&U)" @@ -66,7 +66,7 @@ msgstr "上一处差异(&P)" msgid "&Next Difference" msgstr "下一处差异(&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -74,31 +74,31 @@ msgid "" msgstr "" "<qt>没有模型(model)或比较结果,此文件:<b>%1</b>不是合法的 diff 文件。</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt>应用 diff 结果<b>%1</b>到文件<b>%2</b>时出现问题。</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt>应用 diff 结果<b>%1</b>到文件夹<b>%2</b>时出现问题。</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "无法打开临时文件。" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>无法写入临时文件<b>%1</b>,将删除该文件。</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -107,7 +107,7 @@ msgstr "" "<qt>无法创建目标目录 <b>%1</b>。\n" "文件未保存。</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -117,22 +117,22 @@ msgstr "" "<qt>无法上传临时文件到目标位置<b>%1</b>。在<b>%2</b>下的临时文件仍然可用,可" "以手工复制到正确的地方。</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "无法分析 diff 输出。" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "文件是相同的。" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "无法写入临时文件。" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  17. Download patch debian/rules

    --- 4:17.08.3-1/debian/rules 2017-12-09 08:33:50.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/rules 2018-03-16 13:33:05.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -l10npkgs_firstversion_ok := 4:16.04.3-7~ +l10npkgs_firstversion_ok := 4:17.03.90-0~ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
  18. Download patch debian/libkomparediff-data.install

    --- 4:17.08.3-1/debian/libkomparediff-data.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/libkomparediff-data.install 2018-03-16 13:33:05.000000000 +0000 @@ -0,0 +1 @@ +usr/share/locale/*/LC_MESSAGES/libkomparediff2.mo
  19. Download patch settingsbase.h

    --- 4:17.08.3-1/settingsbase.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/settingsbase.h 2017-10-15 18:34:06.000000000 +0000 @@ -5,7 +5,7 @@ Copyright 2001 Otto Bruggeman <otto.bruggeman@home.nl> Copyright 2001 John Firebaugh <jfirebaugh@kde.org> ****************************************************************************/ - + /*************************************************************************** ** ** This program is free software; you can redistribute it and/or modify @@ -20,7 +20,6 @@ #include <QObject> -#include "kompare.h" #include "diff2_export.h" class QWidget; @@ -28,14 +27,14 @@ class KConfig; class DIFF2_EXPORT SettingsBase : public QObject { -Q_OBJECT + Q_OBJECT public: - explicit SettingsBase(QWidget* parent); - ~SettingsBase(); + explicit SettingsBase(QWidget* parent); + ~SettingsBase() override; public: - virtual void loadSettings( KConfig* config ); - virtual void saveSettings( KConfig* config ); + virtual void loadSettings(KConfig* config); + virtual void saveSettings(KConfig* config); }; #endif
  20. Download patch po/nds/libkomparediff2.po

    --- 4:17.08.3-1/po/nds/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/nds/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2011-09-05 22:49+0200\n" "Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n" "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n" @@ -19,22 +19,22 @@ msgstr "" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Verscheel &anwennen" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Verscheel &torüchnehmen" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "All a&nwennen" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "All Ännern &torüchnehmen" @@ -59,7 +59,7 @@ msgstr "&Verleden Verscheel" msgid "&Next Difference" msgstr "&Nakamen Verscheel" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -68,7 +68,7 @@ msgstr "" "<qt>Keen Modellen oder keen Verschelen. De Datei <b>%1</b> is keen gellen " "Verscheeldatei.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -77,7 +77,7 @@ msgstr "" "<qt>Bi't Anwennen vun den Verscheel <b>%1</b> op de Datei <b>%2</b> hett dat " "Problemen geven.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -86,19 +86,19 @@ msgstr "" "<qt>Bi't Anwennen vun den Verscheel <b>%1</b> na den Orner <b>%2</b> hett " "dat Problemen geven.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Temporeerdatei lett sik nich opmaken." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Nich mööglich, na de Temporeerdatei <b>%1</b> to schrieven. Se warrt " "wegdaan.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -107,7 +107,7 @@ msgstr "" "<qt>De Teelorner <b>%1</b> lett sik nich opstellen.\n" "De Datei wöör nich sekert.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -118,22 +118,22 @@ msgstr "" "Dat gifft de Temporeerdatei noch ünner <b>%2</b>. Du kannst ehr vun Hand na " "de richtige Steed koperen.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Diff-Utgaav lett sik nich inlesen." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "De Dateien sünd liek." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Nich mööglich, na de Temporeerdatei to schrieven." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  21. Download patch tests/interactivedifftest.cpp
  22. Download patch po/gl/libkomparediff2.po

    --- 4:17.08.3-1/po/gl/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/gl/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -3,41 +3,40 @@ # mvillarino <mvillarino@users.sourceforge.net>, 2007, 2008, 2009. # Marce Villarino <mvillarino@kde-espana.es>, 2009, 2013. # Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2013. -# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2017-10-15 15:32+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" +"PO-Revision-Date: 2013-03-17 12:32+0100\n" +"Last-Translator: Marce Villarino <mvillarino@kde-espana.es>\n" "Language-Team: Galician <proxecto@trasno.net>\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Environment: kde,development\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplicar a diferenza" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Anular a aplicación da diferenza" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&licar todo" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Anular t&odas as aplicacións" @@ -62,16 +61,16 @@ msgstr "Diferenza &anterior" msgid "&Next Difference" msgstr "&Seguinte diferenza" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" "<qt>Non existen modelos nin diferenzas, este ficheiro: <b>%1</b>, non é un " -"ficheiro de «diff» válido.</qt>" +"ficheiro de «diff» correcto.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -80,7 +79,7 @@ msgstr "" "<qt>Aconteceron problemas ao aplicar as diferenzas <b>%1</b> ao ficheiro <b>" "%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -89,18 +88,18 @@ msgstr "" "<qt>Aconteceron problemas ao aplicar as diferenzas <b>%1</b> ao cartafol <b>" "%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Non foi posíbel acceder a un ficheiro temporal." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -"<qt>Non foi posíbel gardar no ficheiro temporal <b>%1</b>, a borralo.</qt>" +"<qt>Non foi posíbel gardar no ficheiro temporal <b>%1</b>, a eliminalo.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -109,7 +108,7 @@ msgstr "" "<qt>Non foi posíbel crear o directorio de destino <b>%1</b>.\n" "O ficheiro non se gardou.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -120,29 +119,29 @@ msgstr "" "destino <b>%1</b>. O ficheiro temporal aínda está dispoñíbel en: <b>%2</b>. " "Pode copialo manualmente para o lugar correcta.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Non foi posíbel procesar a saída de diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Os ficheiros son idénticos." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Non foi posíbel escribir no ficheiro temporal." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be " "displayed in the diff view." msgstr "" -"O formato do ficheiro de diferencia é incorrecto. Algunhas das liñas non " -"puideron analizarse, e non se mostrarán na vista das diferencias." +"O formato do ficheiro de diferenza é incorrecto. Algunhas das liñas non " +"puideron analizarse, e non se mostrarán na vista das diferenzas." #~ msgctxt "NAME OF TRANSLATORS" #~ msgid "Your names"
  23. Download patch po/uk/libkomparediff2.po

    --- 4:17.08.3-1/po/uk/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/uk/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libkomparediff2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-28 22:28+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Застосувати різницю" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Скасувати застосування різниці" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Застос&увати все" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Скасувати застосування всіх" @@ -60,7 +60,7 @@ msgstr "Поп&ередня різниц msgid "&Next Difference" msgstr "На&ступна різниця" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Немає моделей або відмінностей. Файл: <b>%1</b> не є чинним файлом " "формату diff.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,7 +78,7 @@ msgstr "" "<qt>Виникли проблеми під час застосування diff <b>%1</b> до файла <b>%2</b>." "</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,19 +87,19 @@ msgstr "" "<qt>Виникли проблеми під час застосування diff <b>%1</b> до теки<b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Не вдалося відкрити тимчасовий файл." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Не вдалося записати до тимчасового файла <b>%1</b>, його буде вилучено.</" "qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -108,7 +108,7 @@ msgstr "" "<qt>Не вдалося створити каталог призначення <b>%1</b>.\n" "Файл не було збережено.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -119,22 +119,22 @@ msgstr "" "Тимчасовий файл ще доступний під: <b>%2</b>. Можна його вручну скопіювати у " "потрібне місце.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Не вдалося проаналізувати вивід diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Ці файли однакові." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Помилка запису в тимчасовий файл." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  24. Download patch perforceparser.h

    --- 4:17.08.3-1/perforceparser.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/perforceparser.h 2017-10-15 18:34:06.000000000 +0000 @@ -24,17 +24,17 @@ namespace Diff2 class PerforceParser : public ParserBase { public: - PerforceParser( const KompareModelList* list, const QStringList& diff ); - virtual ~PerforceParser(); + PerforceParser(const KompareModelList* list, const QStringList& diff); + ~PerforceParser() override; protected: - bool parseContextDiffHeader() Q_DECL_OVERRIDE; - bool parseNormalDiffHeader() Q_DECL_OVERRIDE; - bool parseRCSDiffHeader() Q_DECL_OVERRIDE; - bool parseUnifiedDiffHeader() Q_DECL_OVERRIDE; + bool parseContextDiffHeader() override; + bool parseNormalDiffHeader() override; + bool parseRCSDiffHeader() override; + bool parseUnifiedDiffHeader() override; protected: - enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; + enum Kompare::Format determineFormat() override; }; } // End of namespace Diff2
  25. Download patch debian/upstream/signing-key.asc

    --- 4:17.08.3-1/debian/upstream/signing-key.asc 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFfNZD4BEACo0YKCUEhTY7v8VZVw3csAtnsRSFQ18G8xfYIt7mJEBrtfiGG4 -g28EjNeWQfN8wGIaAeRGl5nb7s9RRpxXStUu719jGX1Z9Sr8p/JOmBS5kdfAtYId -9Cl3VsGRvf4Smg1ClrEv6tQ97j+d1FY8QfgW/GS46YBOEeOFVQRtfi7Yv9lZkiBF -rzP0Nr7JV9u1GkBsFgNkVuYs/3RDYULItBwGFerduOyQCOt819QvHHSZkXqJWwNR -OA6lc8gW36lKbDHoZ1jSkDnDV0bW0cX1/6WJSzWYdcPiceA1vj/VDg0Kr23SVQ1P -yPvBirT7ToirQm6KrIiKHWLSg156ht8/K2C1Dgypf+YMseMbHQxVLrI2p4zpmxu3 -B2SrSj3ImM5FO0XGd1gxn/qywNVJDQBfcYnndksD2i/9/Es8I/F6OymBZl4HWBvx -7ixm2JPXkmwVPEC/lJn3eCBb1fAaJSlroHtaAEteCWuE5/Mg/uYEh1UeAstP47N3 -P0B3l1E4Ccw1ne2/O1BdsnXeUaI3YVYz9aZkVlL7ywda3h/goRKxc1b18bmgu/Ed -QmcTEMj29B3szMpetWNt1ZbaMJzfDw+z+SiQ3toOTUiqMuWq+l+JK0dVUzOvpGhG -VHv5m9CtJFP671ivEc4it0hJRH5kdW9aNbeG0g9TxHQqQMJIpeLvRq5WKwARAQAB -tCFBbGJlcnQgQXN0YWxzIENpZCA8YWFjaWRAa2RlLm9yZz6JAj0EEwEIACcFAlfN -ZD4CGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQOmpNuDnqptfE -2w/8CdIZ2FOY2UCcdtEzAQCRL125ffU1l5E9nl60vjx/0c/kkNtt77iVOl35waHQ -wYzzF90+PX9CDEODtfZowhEBIwQZxHfwmyp6dCqTDczyeL8QbUDNE+RAKSaBesiP -FLU+598QLwvTr0F7iePAAf4uLMN9u69NhJD+f1KystM9GiaB3T4xqzv2cQ8NIX1N -f68NOxbG5C2CtrUbx/Meb0eFBAHkwWtU/sLFcksi5AEI2Q0ZPTdjS3+rIUeSHKnk -/gtzgq/PS2wSxlwtztA/xnS2u+wvwnX3zuSObPiz3UMlKv9lH/f4MBjCAqZiv6Ci -JLwaHggG+Z7eonlqACKQkZFDRrfSyiQ6yeyYDJErVy+LMu4Ea5mo9tmo0cda/q9N -7Rj/fpyVQW0/Fc1r3pB17/v1u2oeVwwkHqBPQUe5c/HUtzICWa0Vf0lxnsarOLVM -nEemORRlOCgxcTDIiYqpUpfQ7iuQ6+Ydyid6JCaDn5ubOLvBjfc6MWylaNKkFZn7 -LgP2DSis8Ci3w+7OGtyDllJ9GvWdmhC6T4iWUds7vFudA4DKE0EiNFXjcdcMbXHN -GmbWm/EBdGKsWtgABXHJowMn7IBlyp2hBmtVEXr7+pBA/fg3m1UH2QqYQUyfGwIp -VRDt67xEMg+V55raPzhNqOmeLB+ViD5XRzD7PvmZKrcVXSW5Ag0EV81kPgEQAL17 -eQdH3CEDUgBg5ETli9+99/VP66bEPCKCzGD6f6/OUXbLVBXs03GzDJzBr6b8ysaW -MR7c0WXCKFf7U5+3QI4s9TBlcsnHxq59343nJh2WsE5cc75WHlfKwse77zT3tujd -s2MjSBj2324skw9RHSm4mkc7esbN8GCQRAM4gUjwEo76SXvVwuUKYaStNLW8DKLa -HBxNNclk3v/k7YVmVo07uf/u8vIGeUvql/l2XBlWWhxkgaG+UnRwNcpMh0iuVkrJ -Yn04FQtOV20EREVITG1tWHMQ4KznqdgdvbEWnFkkbHvj2c6rGylSJShQba9pE1LA -bNhF6hbEip2nq6uKsQT0Az2/ZWuP83GH4yDHbJCDoT8lf2xcawz+yfd2q9QF8QeI -ObLCNt09dJNceTbjU3h3BEAvD6gGdqzHDPPfmf0UVji1576PEmheMu25/zbh1mvq -nsV2YHZsGXVpbBB1PHzrKM1DH3PfqFTFQ5elrvkuxhgRrSKaiWBuaGD7DWMiEIV2 -QKmYutxYS0FJ57lFRaKo0AiVvtDLVh0edjkLvkgufxs6oAPnLt5kuo/na/tgWJjY -20Eu63dQtIbpPYPrALm2+OMK8eAn3tOg7HsUMXQS5hAqRvH/8aMVoW7qjMldgthk -5EXTplylkNCCPz9dTqT/g8RBmKxelnRfgj3Cxy4dABEBAAGJAiUEGAEIAA8FAlfN -ZD4CGwwFCQPCZwAACgkQOmpNuDnqpteDGw/+Pp0s5ItKy6eUpaLZgIjGEUOdvVsj -/2ui2VGl1BzZLe4ocwHaAouIhAsUmJ7ZciGSW1OSTGQ5Qw8jQ1EDCC2k4RZ2AfYJ -4S8R2og4jov9s08O6qnTKJfBYpa7fSr38b4o7eecu021orx0pKyiet3ZUs5Luw9U -3sN/PMelHAkjZMkR35DnL3Tl93ySM/YB9VR85bLBcF3Tf3XZYi8MXyD4B1FNf+BW -ARyxhQhs/S4Dw4cufC9DKjzyUXwPfLMENUtWcbuxae6kdfSV05EQcZSqmF+dAFMB -SkMz+3aXIH95d6/hrXhq/eYqWgEJrxZB55ycdUcfn23L7/r10gVMRq7ZkSExSgD5 -DJdeNvFrWOOJa2NDiZ/MCfCSoKG79O+0IQfMeuK1LPsj3AHGTGOWh6OgALKVfgOH -kwVh/CFP5+aLQTTUU7lSthPd/jwvqwXUFYFvAwdg8VjQSX0kT62ZI5UZrqejEJXD -puYyBQN5BZUgqwoy3oTy0Ktao3Td9SUDEpFaKbt1YWWmYHLrscVtI6yiKLMIusHU -XMa+dB7iKGK1BjU2Z2PE4Ow7DXqnaEJwSNElgkhftnT3lIq0qFTDSkeEvfZg3fMt -IpdIiYngrZo+vxq7NOYQ6RLHtDLXtgYECZrQX6Obl+3jfXFVb8Ethtl1mhpAAi+V -hC+sXh0NMOq4pxGJAhwEEAEIAAYFAlfNajkACgkQf+o9phacd9YOLQ/9F5fZAMay -91e7p80UE+6yxX12ImAfN9MqO8yJqB14x8v6lq/Spk04MqsDPwRg7jM6pjTCfnmJ -j7k2ZaobnKeF+jx6mdF0krpl/ZkR9XUAEOi0rHICFZ8frWyYXluMLq9cBW/d0cI/ -9Y0nBJh6bls7Xt7Si6h8aOnZMtWoWDKeF8Zgll3L1rLaz2oUvHSjVeQrfeGanpde -ZGe4ygzdW4ztFpJohEVIVV2DX5551uYXzCHGUTGIE0qKLWrjKIR1zN8t2tGUkeEL -yYWe/+Vng7EDQ4BkFFjQoxyov/X/qPd3e4Ul9Sg++2Oq43Ix5+FEsUeQ1AggPxGG -XDxB9BfMvDYfWPjSJTZFe5Xvm5kLxBDBS0Ad0Wp1O0ZcV6V5lGWfcE0gpwWlHiKP -ejqoh3kJb/4HBMPBGXADX5/Er40Rwgf4jLifY/zsKxwQlA+Y1fGJyo6GTuukz7lT -e1evhCC7ZHPZi5Maeho7HMjNDSNBAznh1k6RnPTl7TMGGM1YCA+tV1kipfLYtWFs -+8o987VjK4Yl/cD5ZsqdcjVN2o9Ju1hwFBCKxU3pFFxz1vHCw8eKiH1MLvCWWlfe -0HW/oMmbtQPiRwa5MSvOqYLJr5UGND3/69aI/fmLES9um2nwE73+oQvBD09ffM9I -+8Z8ql28HE+dRE7l+XtYG8PPGj9DHFxrn/KJAhwEEAEIAAYFAlfNcRgACgkQ/yVR -GW+4/YDcLRAAry7cjXR1C6sM2/MZT8nfIlblQCXNKRSab6FZGTzoDM87o9PPqD0i -f0BYFCEB+rrvtuosNtpUjvtWvnr5RfyIZTfEPTeaEHOUJAQVoCzGdwsaMXWz/2x3 -us7DbrxYjrdrnpiQc8IGg7GdXCcUDOvJr9RRDoWGqHhX6BrPZhAKBFlXnxKqLdjD -JbrXt41Jva7/PBB7cqRQH37J297RxA7myqlfUMtawZiprCbTeTMJaQBK5NoUwx2J -kBPKmbXgZljUQ9xNnqwjxl+NDUlCBY1I5kucZPyrlCH7cNe8leNVtpoQd35IAERl -meGCgxs9UMRfpaH3WlVZCgwdz7JmkM/b3rVVIx0cJrsMCU483tWnWrbl9NtAfMxH -5vX8HC6ismJ5qbE1I3P1vRfaYjTmw9H99eVRyj/iWMe41WCpcEPEIi0BRjBazUS/ -GnRZd9JhxnjSdkKR0tiVAeLlyI8XXBmT0MbHbupJWSf5tJqtKgbBN+e/OoTbZbnB -+U6kKZ/yhRdemQRNgoPc4Hi+kLZgUusv1CcjTL76ujrHeq+m+BmnijWaZHwhWVAN -dpm0K0oCiP/m8j6fkbxYS8IYff95SnIFxVIhRSAk442NCEdtwwM5iz+XRFq3sKkr -fkf+GeJvAoN/kqHuj8dbJBrTO7UT/5wgdEOHmq6nen0I1qgsHPn1LZCJAj0EEwEI -ACcFAlfNZD4CGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQOmpN -uDnqptfE2w/8CdIZ2FOY2UCcdtEzAQCRL125ffU1l5E9nl60vjx/0c/kkNtt77iV -Ol35waHQwYzzF90+PX9CDEODtfZowhEBIwQZxHfwmyp6dCqTDczyeL8QbUDNE+RA -KSaBesiPFLU+598QLwvTr0F7iePAAf4uLMN9u69NhJD+f1KystM9GiaB3T4xqzv2 -cQ8NIX1Nf68NOxbG5C2CtrUbx/Meb0eFBAHkwWtU/sLFcksi5AEI2Q0ZPTdjS3+r -IUeSHKnk/gtzgq/PS2wSxlwtztA/xnS2u+wvwnX3zuSObPiz3UMlKv9lH/f4MBjC -AqZiv6CiJLwaHggG+Z7eonlqACKQkZFDRrfSyiQ6yeyYDJErVy+LMu4Ea5mo9tmo -0cda/q9N7Rj/fpyVQW0/Fc1r3pB17/v1u2oeVwwkHqBPQUe5c/HUtzICWa0Vf0lx -nsarOLVMnEemORRlOCgxcTDIiYqpUpfQ7iuQ6+Ydyid6JCaDn5ubOLvBjfc6MWyl -aNKkFZn7LgP2DSis8Ci3w+7OGtyDllJ9GvWdmhC6T4iWUds7vFudA4DKE0EiNFXj -cdcMbXHNGmbWm/EBdGKsWtgABXHJowMn7IBlyp2hBmtVEXr7+pBA/fg3m1UH2QqY -QUyfGwIpVRDt67xEMg+V55raPzhNqOmeLB+ViD5XRzD7PvmZKrcVXSWZAQ0EWVGk -RgEIAJ5xfcXnHMXrDN5eK4EC4ervhtUc43sjz1T5E6WgRZhRgxE1PPaXUGQ0dZFN -Op+Y87suExjqDiA495BULCBMZWMjxufqwl3dIV16JG+9oUGmaftKMF2zWuQookiN -4xSXXDx0WeZ/bZXQ+eFJJ6mY3CZ3xFCeXW6YJNKKEMnJ0bGLHDpk2Gvi3Nuf5F9p -3JuWLrUfaFzr8kkd73WL5XWW2CQfAZyzoxQKpeBIvR1Qgmzj2BKuVrSCStwlgXkx -bIbEqVqNsKOQwIm037xuESalzg57w1nfdqsRaeXKHVFWCLmndFM0Clg/Fy1yDnsT -FzNsqf1HxUtiY8nsOLeBfRyai2sAEQEAAbQeQ2hyaXN0b3BoIEZlY2sgPGNmZWNr -QGtkZS5vcmc+iQFOBBMBCAA4FiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAllRpEYC -GwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ29LOiT4tHId5Zwf8DUTZ3lQv -ageyssiiUiJYyaF5Gitxpz7QeCWXWYxRDm188f4tXOCuUwwbuDUCaTIeTWpnmizO -tdSDYf/bz9w4X9ZWUeBBxIavtpBseJ5SK8+1ky5r6UdR0gsLdRXaXVXbZnPwcgOX -iTGYroSmg0g4rkyjnnRLd7cApirmlr8WVyQJX38mgr362FEKygACPeChbBPH1Fjm -mYs+2SWrILn3rUl7sodIhWpqkn8bkNf7J84LU+xz68h/JBWqdp59k9Z0jFdBCGfj -qLohFGKbD3gaTBxr7CyWSKa38v9nsHJmoGxczKLFJA+r521I70IyCvRbFNfvzABO -RMbOHmhLAoIyBrkBDQRZUaRGAQgAy5Sd81+t3HzGfsmNybowaQH9h6ldXKyuUfFR -RLqrvrb0l1KVVadCj0YU73bsZkKVYj2sIYtAx9lmT+N+ApX+eSkuh3cjnWt6Y6Du -iFKTBEsB3AnvEK42tp+Eqe0WHn83G5pfFpUhjWa69ltMCwhHKSzaMISlSgrjdnx2 -vj9A+EGy2ywHxzMMwTVPDivtf5HCMWtCoMi0W/p/QEh0TBHjraSEsTC9tdE3WfOz -7pjR+glskJLdUNkL2xyyusxUxX44QEXcNen3KlJawueS4E88i6zpjwaPsm9hQG2t -SEovlrujkbdN71iHAaA4pWpaWdyzpkuI5XoecbQE7fF09yfT1wARAQABiQE2BBgB -CAAgFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAllRpEYCGwwACgkQ29LOiT4tHIdp -EwgAjlhpN8Z5AOZHTwjYu/O04Qf/dgXrdw0I/9Wn5YC0X8qvyYwWkVKhMck0yLun -3riUdhNM/M95DMvNXdrKJCOr4MezocWZiXve6TOUYZzsoOXKG6BCOboCo22qpcBX -KRqLGcWPyN/Za1AaXWGqmbwaENEGZnJyoyqd7i1miS6OG2l0Lqy5G9wAHRL6VFlT -CtjTmTo1zUDwnyT+XFddr0rNc1qoqyqmmAFmioo3fNLjXjq4SO+4uyEJqtn/q5SJ -28/QsFNHscrJ7kD1B1uOWD2q+1HtgXeGrLiDU9E1lZGWxDWmQJ0JN81MD4dhTMrQ -RJWljvaVa8fj2U2D659nVsq8og== -=5Ltf ------END PGP PUBLIC KEY BLOCK-----
  26. Download patch debian/tests/testsuite.xsession

    --- 4:17.08.3-1/debian/tests/testsuite.xsession 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/tests/testsuite.xsession 2018-03-16 13:33:05.000000000 +0000 @@ -1,6 +1,5 @@ #!/bin/sh export LANG=C.UTF-8 export LC_ALL=C.UTF-8 -kdeinit5 -trap kdeinit5_shutdown EXIT +kdeinit4 dh_auto_test
  27. Download patch debian/control

    --- 4:17.08.3-1/debian/control 2017-12-09 08:33:50.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/control 2018-03-16 13:33:05.000000000 +0000 @@ -5,25 +5,39 @@ Maintainer: Debian/Kubuntu Qt/KDE Mainta Uploaders: Maximiliano Curia <maxy@debian.org> Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 5.16.0~), - libkf5codecs-dev (>= 5.16.0~), - libkf5config-dev (>= 5.16.0~), - libkf5coreaddons-dev (>= 5.16.0~), - libkf5i18n-dev (>= 5.16.0~), - libkf5kio-dev (>= 5.16.0~), - libkf5xmlgui-dev (>= 5.16.0~), - pkg-kde-tools (>= 0.12), -Standards-Version: 4.1.2 + extra-cmake-modules (>= 5.31.0~), + libkf5codecs-dev (>= 5.31.0~), + libkf5config-dev (>= 5.31.0~), + libkf5coreaddons-dev (>= 5.31.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5kio-dev (>= 5.31.0~), + libkf5parts-dev (>= 5.31.0~), + libkf5xmlgui-dev (>= 5.31.0~), + pkg-kde-tools (>= 0.12) +Standards-Version: 3.9.6 Homepage: http://www.kde.org/ -Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/libkomparediff2.git -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/libkomparediff2.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkomparediff2 +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/libkomparediff2 Package: libkomparediff2-5 Section: libs Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: kompare (<< 4:16.08), kpart5-kompare (<< 4:16.08), ${kde-l10n:all} +Depends: libkomparediff-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: library to compare files and strings + This package contains a library used to compare files and strings, and is + used in Kompare and KDevelop. + . + This package is part of the KDE Software Development Kit module. + +Package: libkomparediff-data +Section: libs +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: ${kde-10n:all} Replaces: ${kde-l10n:all} Description: library to compare files and strings This package contains a library used to compare files and strings, and is @@ -35,14 +49,8 @@ Package: libkomparediff2-dev Section: libdevel Architecture: any Depends: libkomparediff2-5 (= ${binary:Version}), - libkf5codecs-dev, - libkf5config-dev, - libkf5coreaddons-dev, - libkf5i18n-dev, - libkf5kio-dev, - libkf5xmlgui-dev, - qtbase5-dev (>= 5.4.0~), - ${misc:Depends}, + qtbase5-dev (>= 5.6.1~), + ${misc:Depends} Description: library to compare files and strings - development files This package contains a library used to compare files and strings, and is used in Kompare and KDevelop.
  28. Download patch tests/levenshteintest.cpp

    --- 4:17.08.3-1/tests/levenshteintest.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/tests/levenshteintest.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -48,7 +48,7 @@ template<> char* toString(const Marker& void LevenshteinTest::testFirstEmptyString() { DifferenceString* string1 = new DifferenceString(QString("12345")); - DifferenceString* string2 = new DifferenceString(QString("")); + DifferenceString* string2 = new DifferenceString(QString()); DifferenceStringPair* pair = new DifferenceStringPair(string1, string2); LevenshteinTable<DifferenceStringPair> table; table.createTable(pair); @@ -67,7 +67,7 @@ void LevenshteinTest::testFirstEmptyStri void LevenshteinTest::testSecondEmptyString() { - DifferenceString* string1 = new DifferenceString(QString("")); + DifferenceString* string1 = new DifferenceString(QString()); DifferenceString* string2 = new DifferenceString(QString("12345")); DifferenceStringPair* pair = new DifferenceStringPair(string1, string2); LevenshteinTable<DifferenceStringPair> table; @@ -111,7 +111,7 @@ void LevenshteinTest::testStringLists() QStringList list1; list1 << "delete1" << "line1" << "line2" << "line3" << "delete2" << "delete3" << "line4"; QStringList list2; - list2 << "line1" << "line2" << "line3" << "insert1" << "line4" <<"insert2"; + list2 << "line1" << "line2" << "line3" << "insert1" << "line4" << "insert2"; StringListPair* pair = new StringListPair(list1, list2); LevenshteinTable<StringListPair> table; table.createTable(pair);
  29. Download patch po/sv/libkomparediff2.po

    --- 4:17.08.3-1/po/sv/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/sv/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-27 08:52+0200\n" "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n" "Language-Team: Swedish <kde-i18n-doc@kde.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Applicera skillnad" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Ångra &applicera skillnad" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "App&licera alla" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Å&ngra applicera alla" @@ -57,7 +57,7 @@ msgstr "&Föregående skillnad" msgid "&Next Difference" msgstr "Nästa s&killnad" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgstr "" "<qt>Inga modeller eller inga skillnader. Den här filen: <b>%1</b>, är inte " "en giltig jämförelsefil.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>Det uppstod problem att applicera jämförelsen <b>%1</b> med filen <b>%2</" "b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,19 +84,19 @@ msgstr "" "<qt>Det uppstod problem att applicera jämförelsen <b>%1</b> med katalogen <b>" "%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Kunde inte öppna en tillfällig fil." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Kunde inte skriva till den tillfälliga filen <b>%1</b>. Tar bort den.</" "qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Kunde inte skapa målkatalogen <b>%1</b>.\n" "Filen har inte sparats.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "tillfälliga filen är fortfarande tillgänglig under <b>%2</b>. Du kan kopiera " "den till rätt plats för hand.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Kunde inte tolka jämförelseutmatning." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Filerna är identiska." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Kunde inte skriva till den tillfälliga filen." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  30. Download patch po/sl/libkomparediff2.po

    --- 4:17.08.3-1/po/sl/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/sl/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-11-17 10:51+0100\n" "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n" "Language-Team: Slovenian <lugos-slo@lugos.si>\n" @@ -25,22 +25,22 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Uveljavi razliko" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "R&azveljavi razliko" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Uve&ljavi vse" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Razveljavi vse" @@ -65,7 +65,7 @@ msgstr "&Predhodna razlika" msgid "&Next Difference" msgstr "&Naslednja razlika" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -74,7 +74,7 @@ msgstr "" "<qt>Ni modelov ali ni razlik. Ta datoteka, <b>%1</b>, ni veljavna datoteka " "diff.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -83,7 +83,7 @@ msgstr "" "<qt>Prišlo je do težav med uveljavljanjem diff <b>%1</b> v datoteki <b>%2</" "b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -92,19 +92,19 @@ msgstr "" "<qt>Prišlo je do težav med uveljavljanjem diff <b>%1</b> v mapi <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Ni bilo mogoče odpreti začasne datoteke." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Ni bilo mogoče pisati v začasno datoteko <b>%1</b>, zato bo izbrisana.</" "qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -113,7 +113,7 @@ msgstr "" "<qt>Ni bilo mogoče ustvariti ciljne mape <b>%1</b>.\n" "Datoteka ni bila shranjena.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -124,22 +124,22 @@ msgstr "" "Začasna datoteka je še vedno na voljo v: <b>%2</b>. Lahko jo ročno kopirate " "na pravo mesto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Ni bilo mogoče razčleniti izhoda diffa." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Datoteki sta enaki." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Ni bilo mogoče pisati v začasno datoteko." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  31. Download patch po/hi/libkomparediff2.po

    --- 4:17.08.3-1/po/hi/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/hi/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2008-02-23 17:35+0530\n" "Last-Translator: Ravishankar Shrivastava <aviratlami@aol.in>\n" "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n" @@ -18,22 +18,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: KBabel 1.11.4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "भिन्नताएँ लागू करें (&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "भिन्नताएँ लागू नहीं करें (&a)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "सभी लागू करें (&l)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "सभी लागू नहीं करें (&U)" @@ -58,7 +58,7 @@ msgstr "पिछली भिन्न msgid "&Next Difference" msgstr "अगली भिन्नता (&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,38 +67,38 @@ msgstr "" "<qt>कोई मॉडल नहीं या कोई भिन्नता नहीं, यह फ़ाइल:<b>%1</b>, एक वैध डिफ़ फ़ाइल नहीं है." "</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt>डिफ़ <b>%1</b> को फ़ाइल <b>%2</b> में लागू करने में समस्याएँ हैं.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt>डिफ़ <b>%1</b> को फ़ोल्डर <b>%2</b> में लागू करने में कुछ समस्याएँ हैं.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "अस्थायी फ़ाइल खोल नहीं सकते." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>अस्थाई फ़ाइल <b>%1</b> पर लिखा नहीं जा सका, इसे मिटाया जा रहा है.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "डिफ़ आउटपुट पार्से नहीं कर सका." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "फ़ाइलें एक जैसी हैं." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "अस्थायी फ़ाइल पर लिख नहीं सका." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  32. Download patch diffsettings.h

    --- 4:17.08.3-1/diffsettings.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffsettings.h 2017-10-15 18:34:06.000000000 +0000 @@ -19,7 +19,6 @@ #define DIFFSETTINGS_H #include <QStringList> -#include <QWidget> #include "kompare.h" #include "settingsbase.h" @@ -27,39 +26,39 @@ class DIFF2_EXPORT DiffSettings : public SettingsBase { -Q_OBJECT + Q_OBJECT public: - explicit DiffSettings(QWidget* parent); - virtual ~DiffSettings(); + explicit DiffSettings(QWidget* parent); + ~DiffSettings() override; public: - // some virtual functions that will be overloaded from the base class - void loadSettings( KConfig* config ) Q_DECL_OVERRIDE; - void saveSettings( KConfig* config ) Q_DECL_OVERRIDE; + // some virtual functions that will be overloaded from the base class + void loadSettings(KConfig* config) override; + void saveSettings(KConfig* config) override; public: - QString m_diffProgram; - int m_linesOfContext; - Kompare::Format m_format; - bool m_largeFiles; // -H - bool m_ignoreWhiteSpace; // -b - bool m_ignoreAllWhiteSpace; // -w - bool m_ignoreEmptyLines; // -B - bool m_ignoreChangesDueToTabExpansion; // -E - bool m_createSmallerDiff; // -d - bool m_ignoreChangesInCase; // -i - bool m_showCFunctionChange; // -p - bool m_convertTabsToSpaces; // -t - bool m_ignoreRegExp; // -I - QString m_ignoreRegExpText; // the RE for -I - QStringList m_ignoreRegExpTextHistory; - bool m_recursive; // -r - bool m_newFiles; // -N -// bool m_allText; // -a - bool m_excludeFilePattern; // -x - QStringList m_excludeFilePatternList; // The list of patterns for -x - bool m_excludeFilesFile; // -X - QString m_excludeFilesFileURL; // The filename to -X - QStringList m_excludeFilesFileHistoryList; // The history list of filenames + QString m_diffProgram; + int m_linesOfContext; + Kompare::Format m_format; + bool m_largeFiles; // -H + bool m_ignoreWhiteSpace; // -b + bool m_ignoreAllWhiteSpace; // -w + bool m_ignoreEmptyLines; // -B + bool m_ignoreChangesDueToTabExpansion; // -E + bool m_createSmallerDiff; // -d + bool m_ignoreChangesInCase; // -i + bool m_showCFunctionChange; // -p + bool m_convertTabsToSpaces; // -t + bool m_ignoreRegExp; // -I + QString m_ignoreRegExpText; // the RE for -I + QStringList m_ignoreRegExpTextHistory; + bool m_recursive; // -r + bool m_newFiles; // -N +// bool m_allText; // -a + bool m_excludeFilePattern; // -x + QStringList m_excludeFilePatternList; // The list of patterns for -x + bool m_excludeFilesFile; // -X + QString m_excludeFilesFileURL; // The filename to -X + QStringList m_excludeFilesFileHistoryList; // The history list of filenames }; #endif
  33. Download patch stringlistpair.cpp

    --- 4:17.08.3-1/stringlistpair.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/stringlistpair.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -64,11 +64,11 @@ StringListPair::StringListPair(const QSt m_hashesFirst = new unsigned int[m_lengthFirst]; m_hashesSecond = new unsigned int[m_lengthSecond]; - m_hashesFirst[0] = qHash(QString("")); + m_hashesFirst[0] = qHash(QString()); for (unsigned int i = 1; i < m_lengthFirst; ++i) { m_hashesFirst[i] = qHash(first[i - 1]); } - m_hashesSecond[0] = qHash(QString("")); + m_hashesSecond[0] = qHash(QString()); for (unsigned int i = 1; i < m_lengthSecond; ++i) { m_hashesSecond[i] = qHash(second[i - 1]); }
  34. Download patch po/ug/libkomparediff2.po

    --- 4:17.08.3-1/po/ug/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ug/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n" "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n" @@ -17,22 +17,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -57,45 +57,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "ۋاقىتلىق ھۆججەتنى ئاچالمىدى." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>ۋاقىتلىق ھۆججەت<b>%1</b> كە يازغىلى بولمىدى، ئۆچۈرۈۋاتىدۇ.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -103,22 +103,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "diff نىڭ نەتىجىسىنى تەھلىل قىلالمىدى." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "ھۆججەتلەر ئوپئوخشاش." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "ۋاقىتلىق ھۆججەتكە يازالمىدى." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  35. Download patch po/pt_BR/libkomparediff2.po

    --- 4:17.08.3-1/po/pt_BR/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/pt_BR/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libkomparediff2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-27 00:59-0300\n" "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n" "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplicar a diferença" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Ign&orar diferença" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&licar tudo" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Não &aplicar tudo" @@ -58,7 +58,7 @@ msgstr "Diferença &anterior" msgid "&Next Difference" msgstr "&Próxima diferença" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>Não existem modelos ou diferenças, este arquivo: <b>%1</b> não é um " "arquivo diff válido.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgid "" msgstr "" "<qt>Ocorreram problemas ao aplicar o diff <b>%1</b> à pasta <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -83,18 +83,18 @@ msgid "" msgstr "" "<qt>Ocorreram problemas ao aplicar o diff <b>%1</b> à pasta <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Não foi possível abrir um arquivo temporário." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Não foi possível gravar o arquivo temporário <b>%1</b>, excluindo-o.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -103,7 +103,7 @@ msgstr "" "<qt>Não foi possível criar o diretório destino <b>%1</b>.\n" "O arquivo não foi salvo.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -114,22 +114,22 @@ msgstr "" "destino <b>%1</b>. O arquivo temporário ainda se mantém em <b>%2</b>. Você " "poderá copiá-lo manualmente para o local correto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Não foi possível analisar o resultado do diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Os arquivos são idênticos." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Não foi possível gravar o arquivo temporário." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  36. Download patch po/ga/libkomparediff2.po

    --- 4:17.08.3-1/po/ga/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ga/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdesdk/kompare.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Cuir Difríocht i bh&Feidhm" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "&Cuir Gach Ceann i bhFeidhm" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -57,45 +57,45 @@ msgstr "An Difríocht Roimhe &Seo" msgid "&Next Difference" msgstr "An &Chéad Difríocht Eile" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Ní féidir comhad sealadach a oscailt." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -103,22 +103,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Ní féidir an t-aschur diff a pharsáil." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Is ionann iad na comhaid seo." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Níorbh fhéidir scríobh sa chomhad sealadach." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  37. Download patch po/es/libkomparediff2.po

    --- 4:17.08.3-1/po/es/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/es/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-26 13:32+0200\n" "Last-Translator: Javier Viñal <fjvinal@gmail.com>\n" "Language-Team: Spanish <kde-l10n-es@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplicar la diferencia" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Desh&acer diferencia" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&licar todo" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Ignorar todo" @@ -60,7 +60,7 @@ msgstr "Anterior di&ferencia" msgid "&Next Difference" msgstr "Siguie&nte diferencia" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>No hay modelos o diferencias, este archivo: <b>%1</b>, no es un archivo " "diff válido.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,7 +78,7 @@ msgstr "" "<qt>Se produjeron problemas aplicando el diff <b>%1</b> al archivo <b>%2</b>." "</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,18 +87,18 @@ msgstr "" "<qt>Se produjeron problemas aplicando el diff <b>%1</b> a la carpeta<b>%2</" "b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "No se pudo abrir un archivo temporal." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format 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>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -107,7 +107,7 @@ msgstr "" "<qt>Imposible crear directorio de destino<b>%1</b>.\n" "El archivo no ha sido guardado.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -118,22 +118,22 @@ msgstr "" "b>. El archivo temporal está todavía disponible en: <b>%2</b>. Puede " "copiarlo manualmente al lugar correcto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "No fue posible analizar la salida de diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Los archivos son idénticos." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "No se pudo escribir al archivo temporal." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  38. Download patch po/sr/libkomparediff2.po

    --- 4:17.08.3-1/po/sr/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/sr/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: libkomparediff2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2017-09-28 18:00+0200\n" "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n" "Language-Team: Serbian <kde-i18n-sr@kde.org>\n" @@ -22,22 +22,22 @@ msgstr "" "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Примени разлику" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "По&ништи примену разлике" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Примени &све" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Поништи с&ве примене" @@ -62,7 +62,7 @@ msgstr "Пре&тходна разлик msgid "&Next Difference" msgstr "След&ећа разлика" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -71,7 +71,7 @@ msgstr "" "<qt>Нема модела или нема разлика, фајл <tt>%1</tt> није добар фајл разлике.</" "qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -79,7 +79,7 @@ msgid "" msgstr "" "<qt>Проблем при примењивању разлике <tt>%1</tt> на фајл <tt>%2</tt>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,17 +87,17 @@ msgid "" msgstr "" "<qt>Проблем при примењивању разлике <tt>%1</tt> на фасциклу <tt>%2</tt>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Не могу да отворим привремени фајл." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>Не могу да пишем у привремени фајл <tt>%1</tt>, бришем га.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -106,7 +106,7 @@ msgstr "" "<qt>Не могу да направим одредишну фасциклу <tt>%1</tt>. Фајл није сачуван.</" "qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -117,22 +117,22 @@ msgstr "" "Привремени фајл је још увек доступан као <tt>%2</tt>, тако да се може ручно " "копирати на право место.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Не могу да рашчланим излаз разлике." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Фајлови су истоветни." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Не могу да пишем у привремени фајл." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  39. Download patch komparemodellist.cpp
  40. Download patch diffhunk.cpp

    --- 4:17.08.3-1/diffhunk.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffhunk.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -17,19 +17,15 @@ #include "diffhunk.h" -#include "difference.h" - -#include <QLoggingCategory> - -Q_DECLARE_LOGGING_CATEGORY(LIBKOMPAREDIFF2) +#include <komparediffdebug.h> using namespace Diff2; -DiffHunk::DiffHunk( int sourceLine, int destinationLine, QString function, Type type ) : - m_sourceLine( sourceLine ), - m_destinationLine( destinationLine ), - m_function( function ), - m_type( type ) +DiffHunk::DiffHunk(int sourceLine, int destinationLine, const QString& function, Type type) : + m_sourceLine(sourceLine), + m_destinationLine(destinationLine), + m_function(function), + m_type(type) { } @@ -37,81 +33,81 @@ DiffHunk::~DiffHunk() { } -void DiffHunk::add( Difference* diff ) +void DiffHunk::add(Difference* diff) { - m_differences.append( diff ); + m_differences.append(diff); } int DiffHunk::sourceLineCount() const { - DifferenceListConstIterator diffIt = m_differences.begin(); - DifferenceListConstIterator dEnd = m_differences.end(); + DifferenceListConstIterator diffIt = m_differences.begin(); + DifferenceListConstIterator dEnd = m_differences.end(); - int lineCount = 0; + int lineCount = 0; - for ( ; diffIt != dEnd; ++diffIt ) - lineCount += (*diffIt)->sourceLineCount(); + for (; diffIt != dEnd; ++diffIt) + lineCount += (*diffIt)->sourceLineCount(); - return lineCount; + return lineCount; } int DiffHunk::destinationLineCount() const { - DifferenceListConstIterator diffIt = m_differences.begin(); - DifferenceListConstIterator dEnd = m_differences.end(); + DifferenceListConstIterator diffIt = m_differences.begin(); + DifferenceListConstIterator dEnd = m_differences.end(); - int lineCount = 0; + int lineCount = 0; - for ( ; diffIt != dEnd; ++diffIt ) - lineCount += (*diffIt)->destinationLineCount(); + for (; diffIt != dEnd; ++diffIt) + lineCount += (*diffIt)->destinationLineCount(); - return lineCount; + return lineCount; } QString DiffHunk::recreateHunk() const { - QString hunk; - QString differences; + QString hunk; + QString differences; - // recreate body - DifferenceListConstIterator diffIt = m_differences.begin(); - DifferenceListConstIterator dEnd = m_differences.end(); - - int slc = 0; // source line count - int dlc = 0; // destination line count - for ( ; diffIt != dEnd; ++diffIt ) - { - switch ( (*diffIt)->type() ) - { - case Difference::Unchanged: - case Difference::Change: - slc += (*diffIt)->sourceLineCount(); - dlc += (*diffIt)->destinationLineCount(); - break; - case Difference::Insert: - dlc += (*diffIt)->destinationLineCount(); - break; - case Difference::Delete: - slc += (*diffIt)->sourceLineCount(); - break; - } - differences += (*diffIt)->recreateDifference(); - } - - // recreate header - hunk += QString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .arg( m_sourceLine ) - .arg( m_destinationLine ) - .arg( slc ) - .arg( dlc ); - - if ( !m_function.isEmpty() ) - hunk += ' ' + m_function; + // recreate body + DifferenceListConstIterator diffIt = m_differences.begin(); + DifferenceListConstIterator dEnd = m_differences.end(); + + int slc = 0; // source line count + int dlc = 0; // destination line count + for (; diffIt != dEnd; ++diffIt) + { + switch ((*diffIt)->type()) + { + case Difference::Unchanged: + case Difference::Change: + slc += (*diffIt)->sourceLineCount(); + dlc += (*diffIt)->destinationLineCount(); + break; + case Difference::Insert: + dlc += (*diffIt)->destinationLineCount(); + break; + case Difference::Delete: + slc += (*diffIt)->sourceLineCount(); + break; + } + differences += (*diffIt)->recreateDifference(); + } + + // recreate header + hunk += QStringLiteral("@@ -%1,%3 +%2,%4 @@") + .arg(m_sourceLine) + .arg(m_destinationLine) + .arg(slc) + .arg(dlc); + + if (!m_function.isEmpty()) + hunk += QLatin1Char(' ') + m_function; - hunk += QString::fromLatin1( "\n" ); + hunk += QLatin1Char('\n'); - hunk += differences; + hunk += differences; - qCDebug(LIBKOMPAREDIFF2) << hunk; - return hunk; + qCDebug(LIBKOMPAREDIFF2) << hunk; + return hunk; }
  41. Download patch debian/libkomparediff2-5.install

    --- 4:17.08.3-1/debian/libkomparediff2-5.install 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/libkomparediff2-5.install 2018-03-16 13:33:05.000000000 +0000 @@ -1,3 +1,2 @@ usr/lib/*/libkomparediff2.so.5 usr/lib/*/libkomparediff2.so.5.* -usr/share/locale/
  42. Download patch po/el/libkomparediff2.po

    --- 4:17.08.3-1/po/el/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/el/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2011-08-27 15:36+0200\n" "Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n" "Language-Team: Greek <kde-i18n-el@kde.org>\n" @@ -22,22 +22,22 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Εφαρμογή διαφοράς" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Αν&αίρεση εφαρμογής διαφοράς" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ε&φαρμογή όλων" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Α&ναίρεση εφαρμογής όλων" @@ -62,7 +62,7 @@ msgstr "Πρ&οηγούμενη διαφ msgid "&Next Difference" msgstr "Επό&μενη διαφορά" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -71,7 +71,7 @@ msgstr "" "<qt>Χωρίς μοντέλα ή χωρίς διαφορές, το αρχείο: <b>%1</b>, δεν είναι ένα " "έγκυρο αρχείο διαφορών.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -80,7 +80,7 @@ msgstr "" "<qt>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο αρχείο <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -89,18 +89,18 @@ msgstr "" "<qt>Υπήρξαν προβλήματα εφαρμογής του diff <b>%1</b> στο φάκελο <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Αδύνατο το άνοιγμα ενός προσωρινού αρχείου." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Αδύνατη η εγγραφή στο προσωρινό αρχείο <b>%1</b>, το διαγράφω.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -109,7 +109,7 @@ msgstr "" "<qt>Αδύνατη η δημιουργία του καταλόγου προορισμού <b>%1</b>.\n" "Το αρχείο δεν αποθηκεύτηκε.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -120,22 +120,22 @@ msgstr "" "%1</b>. Το προσωρινό αρχείο είναι ακόμη διαθέσιμο κάτω από το: <b>%2</b>. " "Μπορείτε να το αντιγράψετε χειροκίνητα στη σωστή θέση.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Δεν ήταν δυνατή η επεξεργασία της εξόδου του diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Τα αρχεία είναι όμοια." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Αδύνατο η εγγραφή στο προσωρινό αρχείο." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  43. Download patch parser.cpp
  44. Download patch CMakeLists.txt

    --- 4:17.08.3-1/CMakeLists.txt 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/CMakeLists.txt 2018-03-06 00:23:59.000000000 +0000 @@ -10,6 +10,7 @@ include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMSetupVersion) include(ECMPackageConfigHelpers) +include(ECMQtDeclareLoggingCategory) include(FeatureSummary) include(GenerateExportHeader) @@ -21,12 +22,12 @@ find_package(Qt5Widgets ${QT_MIN_VERSION set_package_properties(Qt5Widgets PROPERTIES TYPE REQUIRED) find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) -set(KF5_DEP_VERSION "5.16.0") +set(KF5_DEP_VERSION "5.28.0") find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS CoreAddons Codecs Config XmlGui I18n KIO ) -set(KOMPAREDIFF2_VERSION "5.1") +set(KOMPAREDIFF2_VERSION "5.2") ecm_setup_version(${KOMPAREDIFF2_VERSION} VARIABLE_PREFIX LIBKOMPAREDIFF2 PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LibKompareDiff2ConfigVersion.cmake" @@ -37,13 +38,23 @@ add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_USE_QSTRINGBUILDER -DQT_NO_CAST_TO_ASCII + -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_STRICT_ITERATORS ) +add_definitions(-DTRANSLATION_DOMAIN=\"libkomparediff2\") + +ecm_qt_declare_logging_category(komparediff2_DBG_SRCS + HEADER komparediffdebug.h + IDENTIFIER LIBKOMPAREDIFF2 + CATEGORY_NAME "libkomparediff" +) + set(komparediff2_SRCS + ${komparediff2_DBG_SRCS} kompareprocess.cpp komparemodellist.cpp diffmodellist.cpp @@ -61,7 +72,6 @@ set(komparediff2_SRCS kompare.cpp ) - add_library(komparediff2 ${komparediff2_SRCS}) generate_export_header(komparediff2 BASE_NAME diff2)
  45. Download patch po/sk/libkomparediff2.po

    --- 4:17.08.3-1/po/sk/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/sk/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libkomparediff2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-02-24 12:58+0100\n" "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n" "Language-Team: Slovak <kde-sk@linux.sk>\n" @@ -18,22 +18,22 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Použiť rozdiel" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Vrátiť rozdiel" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "P&oužiť všetky" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Vrá&tiť všetky zmeny" @@ -58,7 +58,7 @@ msgstr "&Predchádzajúci rozdiel" msgid "&Next Difference" msgstr "&Nasledujúci rozdiel" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>Žiadne modely ani rozdiely v súbore: <b>%1</b>. Nie je to platný súbor " "diff.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgid "" msgstr "" "<qt>Nastali problémy pri použití rozdielu <b>%1</b> na súbor <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,18 +84,18 @@ msgstr "" "<qt>Nastali problémy pri použití rozdielu <b>%1</b> na priečinok <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Nepodarilo sa otvoriť dočasný súbor." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Nepodaril sa zápis do dočasného súboru <b>%1</b>, súbor bol zmazaný.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -104,7 +104,7 @@ msgstr "" "<qt>Nepodarilo sa vytvoriť cieľový adresár <b>%1</b>.\n" "Súbor nebol uložený.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -115,22 +115,22 @@ msgstr "" "Dočasný súbor je k dispozícii pod: <b>%2</b>. Môžete ho na správne miesto " "skopírovať ručne.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Nepodarilo sa spracovať výstup diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Súbory sú rovnaké." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Nepodaril sa zápis do dočasného súboru." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  46. Download patch po/eo/libkomparediff2.po

    --- 4:17.08.3-1/po/eo/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/eo/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n" "Language-Team: esperanto <kde-i18n-eo@kde.org>\n" @@ -16,22 +16,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: pology\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -56,45 +56,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -102,22 +102,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  47. Download patch difference.cpp
  48. Download patch cvsdiffparser.cpp
  49. Download patch po/fi/libkomparediff2.po

    --- 4:17.08.3-1/po/fi/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/fi/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-04-14 00:45+0300\n" "Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n" "Language-Team: Finnish <lokalisointi@lists.coss.fi>\n" @@ -26,22 +26,22 @@ msgstr "" "X-POT-Import-Date: 2012-12-01 22:25:32+0000\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Ota käyttöön muutokset" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Kumoa muutokset" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "O&ta käyttöön kaikki" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "K&umoa kaikki" @@ -66,7 +66,7 @@ msgstr "E&dellinen ero" msgid "&Next Difference" msgstr "Seu&raava ero" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -75,7 +75,7 @@ msgstr "" "<qt>Ei malleja tai ei eroja, tässä tiedostossa: <b>%1</b>, ei ole " "kelvollinen diff-tiedosto.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -84,7 +84,7 @@ msgstr "" "<qt>Diff-tiedoston <b>%1</b> muutosten yhdistämisessä tiedostoon <b>%2</b> " "oli ongelmia.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -93,18 +93,18 @@ msgstr "" "<qt>Diff-tiedoston <b>%1</b> muutosten yhdistämisessä kansioon <b>%2</b> oli " "ongelmia.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Väliaikaistiedostoa ei voi avata." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Väliaikaistiedostoon <b>%1</b> ei voitu kirjoittaa. Poistetaan se.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -113,7 +113,7 @@ msgstr "" "<qt>Ei voitu luoda kohdekansiota <b>%1</b>.\n" "Tiedostoa ei ole talletettu.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -124,22 +124,22 @@ msgstr "" "Väliaikaistiedosto on edelleen käytettävissä: <b>%2</b>. Voit kopioida sen " "oikeaan paikkaan käsin.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Diff-tulostetta ei voi jäsentää." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Tiedostot ovat identtisiä." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Väliaikaistiedostoon ei voi kirjoittaa." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  50. Download patch kompare.h

    --- 4:17.08.3-1/kompare.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/kompare.h 2017-10-15 18:34:06.000000000 +0000 @@ -27,90 +27,90 @@ class QTemporaryDir; namespace Kompare { - enum Format { - Context = 0, - Ed = 1, - Normal = 2, - RCS = 3, - Unified = 4, - SideBySide = 5, - UnknownFormat = -1 - }; - - enum Generator { - CVSDiff = 0, - Diff = 1, - Perforce = 2, - SubVersion = 3, - Reserved2 = 4, - Reserved3 = 5, - Reserved4 = 6, - Reserved5 = 7, - Reserved6 = 8, - Reserved7 = 9, - UnknownGenerator = -1 - }; - - enum Mode { - ComparingFiles, // compareFiles - ComparingFileString, // Compare a source file with a destination string - ComparingStringFile, // Compare a source string with a destination file - ComparingDirs, // compareDirs - ShowingDiff, // openDiff - BlendingDir, // openDirAndDiff - BlendingFile, // openFileAndDiff - UnknownMode // Used to initialize the Infoi struct - }; - - enum DiffMode { - Default, - Custom, - UnknownDiffMode // Use to initialize the Info struct - }; - - enum Status { - RunningDiff, - Parsing, - FinishedParsing, - FinishedWritingDiff, - ReRunningDiff // When a change has been detected after diff has run - }; - - enum Target { - Source, - Destination - }; - - struct DIFF2_EXPORT Info { - Info ( - enum Mode _mode = UnknownMode, - enum DiffMode _diffMode = UnknownDiffMode, - enum Format _format = UnknownFormat, - enum Generator _generator = UnknownGenerator, - QUrl _source = QUrl(), - QUrl _destination = QUrl(), - QString _localSource = QString(), - QString _localDestination = QString(), - QTemporaryDir* _sourceQTempDir = 0, - QTemporaryDir* _destinationQTempDir = 0, - uint _depth = 0, - bool _applied = true - ); - void swapSourceWithDestination(); - - enum Mode mode; - enum DiffMode diffMode; - enum Format format; - enum Generator generator; - QUrl source; - QUrl destination; - QString localSource; - QString localDestination; - QTemporaryDir* sourceQTempDir; - QTemporaryDir* destinationQTempDir; - uint depth; - bool applied; - }; +enum Format { + Context = 0, + Ed = 1, + Normal = 2, + RCS = 3, + Unified = 4, + SideBySide = 5, + UnknownFormat = -1 +}; + +enum Generator { + CVSDiff = 0, + Diff = 1, + Perforce = 2, + SubVersion = 3, + Reserved2 = 4, + Reserved3 = 5, + Reserved4 = 6, + Reserved5 = 7, + Reserved6 = 8, + Reserved7 = 9, + UnknownGenerator = -1 +}; + +enum Mode { + ComparingFiles, // compareFiles + ComparingFileString, // Compare a source file with a destination string + ComparingStringFile, // Compare a source string with a destination file + ComparingDirs, // compareDirs + ShowingDiff, // openDiff + BlendingDir, // openDirAndDiff + BlendingFile, // openFileAndDiff + UnknownMode // Used to initialize the Infoi struct +}; + +enum DiffMode { + Default, + Custom, + UnknownDiffMode // Use to initialize the Info struct +}; + +enum Status { + RunningDiff, + Parsing, + FinishedParsing, + FinishedWritingDiff, + ReRunningDiff // When a change has been detected after diff has run +}; + +enum Target { + Source, + Destination +}; + +struct DIFF2_EXPORT Info { + Info( + enum Mode _mode = UnknownMode, + enum DiffMode _diffMode = UnknownDiffMode, + enum Format _format = UnknownFormat, + enum Generator _generator = UnknownGenerator, + QUrl _source = QUrl(), + QUrl _destination = QUrl(), + QString _localSource = QString(), + QString _localDestination = QString(), + QTemporaryDir* _sourceQTempDir = nullptr, + QTemporaryDir* _destinationQTempDir = nullptr, + uint _depth = 0, + bool _applied = true + ); + void swapSourceWithDestination(); + + enum Mode mode; + enum DiffMode diffMode; + enum Format format; + enum Generator generator; + QUrl source; + QUrl destination; + QString localSource; + QString localDestination; + QTemporaryDir* sourceQTempDir; + QTemporaryDir* destinationQTempDir; + uint depth; + bool applied; +}; } // End of namespace Kompare #endif
  51. Download patch po/tr/libkomparediff2.po

    --- 4:17.08.3-1/po/tr/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/tr/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kdesdk-kde4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2014-06-08 14:01+0000\n" "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/kdesdk-k-tr/" @@ -22,22 +22,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Değişiklikleri &Uygula" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Değişiklikleri &Geri Al" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Tümünü &Uygula" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Tümünü &Geri Al" @@ -62,7 +62,7 @@ msgstr "&Önceki Değişiklikler" msgid "&Next Difference" msgstr "&Sonraki Değişklikler" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -71,7 +71,7 @@ msgstr "" "<qt>Modeller veya farklılıklar yok, <b>%1</b> dosyası geçerli bir diff " "dosyası değil.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -80,7 +80,7 @@ msgstr "" "<qt><b>%1</b> diff dosyası <b>%2</b> dosyasına uygulanırken bazı sorunlar " "oluştu.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -89,17 +89,17 @@ msgstr "" "<qt><b>%1</b> diff çıktısı <b>%2</b> dizinine uygulanırken bazı sorunlar " "oluştu.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Geçici dosya açılamadı." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt><b>%1</b> geçici dosyasına yazılamadı, siliniyor.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -108,7 +108,7 @@ msgstr "" "<qt><b>%1</b> hedef dizini yaratılamadı.\n" "Dosya kaydedilemedi.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -118,22 +118,22 @@ msgstr "" "<qt>Geçici dosya <b>%1</b> hedef konumuna yüklenemedi.Buna rağmen geçici " "dosya <b>%2</b> altında mevcut.Lütfen dosyayı elle yerine kopyalayın.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Diff çıktısı ayrıştırılamıyor." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Dosyalar birbiri ile aynı." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Geçici dosya yazılamıyor." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  52. Download patch po/eu/libkomparediff2.po

    --- 4:17.08.3-1/po/eu/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/eu/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2011-10-14 23:11+0200\n" "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n" "Language-Team: Basque <itzulpena@euskalgnu.org>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplikatu desberdintasunak" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Desberdintasunaren &aplikazioa desegin" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&likatu dena" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Desegin dena" @@ -60,7 +60,7 @@ msgstr "A&urreko desberdintasuna" msgid "&Next Difference" msgstr "Hurre&ngo desberdintasuna" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Ez dago eredu edo desberdintasunik, fitxategi hau: <b>%1</b>, ez da " "baliozko diff fitxategia.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,25 +78,25 @@ msgstr "" "<qt>Arazoak <b>%1</b> diff fitxategia <b>%2</b> fitxategiari aplikatzean.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt>Arazoak <b>%1</b> diff-a <b>%2</b> direktorioari aplikatzean.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Ezin izan da behin-behineko fitxategirik ireki." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Ezin izan da <b>%1</b> behin behineko fitxategian idatzi, ezabatzen.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Ezin izan da <b>%1</b> helburu direktorioa sortu.\n" "Fitxategia ez da gorde.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "kargatu. Behin behineko fitxategia oraindik eskuragarri dago hemen: <b>%2</" "b>. Eskuz kopia dezakezu kokaleku zuzenera.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Ezin izan da diff irteera analizatu." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Fitxategiak berdinak dira." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Ezin izan da behin behineko fitxategian idatzi." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  53. Download patch tests/CMakeLists.txt

    --- 4:17.08.3-1/tests/CMakeLists.txt 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/tests/CMakeLists.txt 2017-10-15 18:34:06.000000000 +0000 @@ -4,6 +4,10 @@ include(ECMMarkAsTest) set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) +remove_definitions( + -DQT_NO_CAST_FROM_ASCII +) + set(interactiveDiffTest_SRCS interactivedifftest.cpp ../perforceparser.cpp @@ -19,6 +23,7 @@ set(interactiveDiffTest_SRCS ../parserbase.cpp ../stringlistpair.cpp ../kompare.cpp + ${komparediff2_DBG_SRCS} ) add_executable(interactiveDiffTest ${interactiveDiffTest_SRCS}) @@ -38,6 +43,7 @@ set(levenshteinTest_SRCS levenshteintest.cpp ../difference.cpp ../stringlistpair.cpp + ${komparediff2_DBG_SRCS} ) add_executable(levenshteintest ${levenshteinTest_SRCS})
  54. Download patch po/pt/libkomparediff2.po

    --- 4:17.08.3-1/po/pt/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/pt/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: libkomparediff2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-27 13:14+0000\n" "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n" "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "X-POFile-SpellExtra: diff\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplicar a Diferença" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Ign&orar a Diferença" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&licar Tudo" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Ignorar T&udo" @@ -58,7 +58,7 @@ msgstr "Diferença &Anterior" msgid "&Next Difference" msgstr "&Próxima Diferença" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>Não existem modelos ou diferenças, este ficheiro: <b>%1</b> não é um " "ficheiro de 'diff' válido.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -76,7 +76,7 @@ msgstr "" "<qt>Ocorreram problemas ao aplicar o 'diff' <b>%1</b> ao ficheiro <b>%2</b>." "</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,18 +84,18 @@ msgid "" msgstr "" "<qt>Ocorreram problemas ao aplicar o 'diff' <b>%1</b> à pasta <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Não foi possível aceder a um ficheiro temporário." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Não foi possível gravar no ficheiro temporário <b>%1</b>, a apagar.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -104,7 +104,7 @@ msgstr "" "<qt>Não foi possível criar a pasta de destino <b>%1</b>.\n" "O ficheiro não foi gravado.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -115,22 +115,22 @@ msgstr "" "destino <b>%1</b>. O ficheiro temporário mantém-se à mesma em <b>%2</b>. " "Você poderá copiá-lo manualmente para o local correcto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Não consigo analisar o resultado do diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Os ficheiros são idênticos." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Não foi possível gravar no ficheiro temporário." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  55. Download patch po/fr/libkomparediff2.po

    --- 4:17.08.3-1/po/fr/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/fr/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-08-13 10:30+0200\n" "Last-Translator: xavier <xavier.besnard@neuf.fr>\n" "Language-Team: French <kde-i18n-doc@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Appliquer une différence" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Annuler une différence" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Tout &appliquer" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Tout ann&uler" @@ -60,7 +60,7 @@ msgstr "Différence &précédente" msgid "&Next Difference" msgstr "Différe&nce suivante" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Aucun modèle ou aucune différence. Ce fichier : <b>%1</b> n'est pas un " "fichier « diff » valable.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,7 +78,7 @@ msgstr "" "<qt>Des problèmes ont été rencontrés lors de l'application du « diff »<b>%1</" "b> sur le fichier <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,19 +87,19 @@ msgstr "" "<qt>Des problèmes ont été rencontrés lors de l'application du « diff » <b>" "%1</b> pour le dossier <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Impossible d'ouvrir un fichier temporaire." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Impossible d'écrire dans le fichier temporaire <b>%1</b>. Suppression de " "celui-ci.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -108,7 +108,7 @@ msgstr "" "<qt>Impossible de créer un dossier cible <b>%1</b>.\n" "Le fichier n'a pu être enregistré.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -119,22 +119,22 @@ msgstr "" "destination <b>%1</b>. Le fichier temporaire est toujours disponible dans <b>" "%2</b>. Vous pouvez le copier manuellement vers son emplacement correct.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Impossible d'analyser la sortie du « diff »." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Les fichiers sont identiques." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Impossible d'écrire dans le fichier temporaire." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  56. Download patch diffmodellist.cpp

    --- 4:17.08.3-1/diffmodellist.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffmodellist.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -19,12 +19,12 @@ using namespace Diff2; -bool diffModelCompare(DiffModel* model1, DiffModel* model2) +static bool diffModelCompare(DiffModel* model1, DiffModel* model2) { - return *model1 < *model2; + return *model1 < *model2; } void DiffModelList::sort() { - std::sort(begin(), end(), diffModelCompare); + std::sort(begin(), end(), diffModelCompare); }
  57. Download patch po/ro/libkomparediff2.po

    --- 4:17.08.3-1/po/ro/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ro/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2012-12-22 11:55+0200\n" "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n" "Language-Team: Romanian <kde-i18n-ro@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -60,45 +60,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  58. Download patch debian/tests/testsuite

    --- 4:17.08.3-1/debian/tests/testsuite 2017-11-21 19:37:54.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/tests/testsuite 2018-03-16 13:33:05.000000000 +0000 @@ -1,4 +1,4 @@ #!/bin/sh xvfb-run -a --server-args="-screen 0 1024x768x24" \ - dbus-run-session -- debian/tests/testsuite.xsession + dbus-launch --exit-with-session debian/tests/testsuite.xsession
  59. Download patch po/fa/libkomparediff2.po

    --- 4:17.08.3-1/po/fa/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/fa/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2007-06-30 17:00+0330\n" "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n" "Language-Team: Persian <kde-i18n-fa@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&اعمال تفاوت‌" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "تفاوت &اعمال نشود‌" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "&اعمال همه‌" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "همه &اعمال نشود‌" @@ -58,7 +58,7 @@ msgstr "تفاوت &قبلی‌" msgid "&Next Difference" msgstr "تفاوت &بعدی‌" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,31 +67,31 @@ msgstr "" "<qt>هیچ مدل یا تفاوتی وجود ندارد، این پرونده <b>%1</b>،یک پرونده تفاوت معتبر " "نیست.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt>مسائلی در اعمال تفاوت وجود دارد<b>%1</b>به پرونده<b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt>مسائلی در اعمال تفاوت وجود دارد <b>%1</b>به پوشه<b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "نتوانست پرونده موقت را باز کند." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>نتوانست در پرونده موقت بنویسد <b>%1</b>، حذف آن.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -100,7 +100,7 @@ msgstr "" "<qt>نتوانست فهرست راهنمای مقصد را ایجاد کند<b>%1</b>.\n" "این پرونده ذخیره نشده است.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -111,22 +111,22 @@ msgstr "" "هنوز در دسترس است تحت :<b>%2</b>. می‌توانید به طور دستی آن را در مکان درست " "رونوشت کنید. </qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "نتوانست خروجی تفاوت را تجزیه کند." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "پرونده‌ها یکسانند." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "نتوانست در پرونده موقت بنویسد." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  60. Download patch po/et/libkomparediff2.po

    --- 4:17.08.3-1/po/et/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/et/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2012-05-22 14:58+0300\n" "Last-Translator: Marek Laane <bald@smail.ee>\n" "Language-Team: Estonian <kde-et@linux.ee>\n" @@ -18,22 +18,22 @@ msgstr "" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Rakenda erinevus" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Eemalda erinevus" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "&Rakenda kõik" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Eemalda rakendus kõigilt" @@ -58,7 +58,7 @@ msgstr "Ee&lmine erinevus" msgid "&Next Difference" msgstr "Jär&gmine erinevus" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>Ei ole mudelit ega erinevusi, sest fail <b>%1</b> ei ole mitte korralik " "diff-fail.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -76,7 +76,7 @@ msgstr "" "<qt>Diff-faili <b>%1</b> rakendamisel failile <b>%2</b> tekkis probleeme.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -85,18 +85,18 @@ msgstr "" "<qt>Diff-faili <b>%1</b> rakendamisel kataloogile <b>%2</b> tekkis probleeme." "</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Ajutise faili avamine nurjus." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Ajutisse faili <b>%1</b> kirjutamine nurjus, see kustutatakse.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Sihtkataloogi <b>%1</b> loomine nurjus.\n" "Faili ei salvestatud.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "endiselt kättesaadav (<b>%2</b>). Kui soovid, võid selle käsitsi õigesse " "kohta kopeerida.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Võrdlemise väljundi parsimine nurjus." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Failid on identsed." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Ajutisse faili kirjutamine nurjus." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  61. Download patch po/ca/libkomparediff2.po
  62. Download patch po/ru/libkomparediff2.po

    --- 4:17.08.3-1/po/ru/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ru/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-03-28 19:55+0400\n" "Last-Translator: Yuri Efremov <yur.arh@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" @@ -25,22 +25,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Применить различия" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Отменить различия" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Применить &все" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Отменить все" @@ -65,7 +65,7 @@ msgstr "Пр&едыдущее разли msgid "&Next Difference" msgstr "С&ледующее различие" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -74,7 +74,7 @@ msgstr "" "<qt>Нет макетов или различий. Файл <b>%1</b> не является файлом формата " "diff.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -83,7 +83,7 @@ msgstr "" "<qt>Возникли проблемы при применении различий <b>%1</b> к файлу <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -92,17 +92,17 @@ msgstr "" "<qt>Возникли проблемы при применении различий <b>%1</b> к каталогу <b>%2</b>." "</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Не удалось открыть временный файл." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>Не удалось записать <b>%1</b> во временный файл, файл удалён.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -111,7 +111,7 @@ msgstr "" "<qt>Не удалось создать сравниваемый каталог <b>%1</b>.\n" "Файл не был сохранён.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -122,22 +122,22 @@ msgstr "" "Временный файл всё ещё доступен под именем <b>%2</b>. Вы можете вручную " "скопировать его в нужное место.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Не удалось обработать результаты различий." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Файлы идентичны." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Не удалось записать во временный файл." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  63. Download patch debian/watch

    --- 4:17.08.3-1/debian/watch 2017-12-04 21:01:43.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/watch 2018-03-16 13:33:05.000000000 +0000 @@ -1,2 +1,3 @@ -version=4 -opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/applications/([\d.]+)/src/@PACKAGE@-([\d.]+)\.tar\.xz +version=3 +http://download.kde.org/stable/applications/([\d.]+)/src/libkomparediff2-([\d.]+).tar.xz +http://download.kde.org/unstable/applications/([\d.]+)/src/libkomparediff2-([\d.]+).tar.xz
  64. Download patch po/de/libkomparediff2.po

    --- 4:17.08.3-1/po/de/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/de/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-02-24 14:49+0100\n" "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n" "Language-Team: German <kde-i18n-de@kde.org>\n" @@ -22,22 +22,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Abweichung &annehmen" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Annahme rückgängig" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "A&lle annehmen" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Alle Änderungen &zurücknehmen" @@ -62,7 +62,7 @@ msgstr "&Vorherige Abweichung" msgid "&Next Difference" msgstr "Nächste Ab&weichung" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -71,7 +71,7 @@ msgstr "" "<qt>Keine Modelle oder keine Unterschiede vorhanden. Die Datei <b>%1</b> ist " "keine gültige diff-Datei.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -80,7 +80,7 @@ msgstr "" "<qt>Es sind Probleme beim Einfügen des diff <b>%1</b> in die Datei <b>%2</b> " "aufgetreten.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -89,19 +89,19 @@ msgstr "" "<qt>Es sind Probleme beim Einfügen des diff <b>%1</b> in den Ordner <b>%2</" "b> aufgetreten.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Eine temporäre Datei kann nicht geöffnet werden." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>In die temporäre Datei <b>%1</b> kann nicht geschrieben werden. Sie wird " "gelöscht.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -110,7 +110,7 @@ msgstr "" "<qt>Der Zielordner <b>%1</b> kann nicht angelegt werden.\n" "Die Datei wurde nicht gespeichert.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -121,22 +121,22 @@ msgstr "" "temporäre Datei ist noch verfügbar unter <b>%2</b>. Sie können diese Datei " "manuell an die richtige Stelle kopieren.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Die Diff-Ausgabe lässt sich nicht einlesen." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Die Dateien sind identisch." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Eine temporäre Datei kann nicht gespeichert werden." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  65. Download patch diffhunk.h

    --- 4:17.08.3-1/diffhunk.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffhunk.h 2017-10-15 18:34:06.000000000 +0000 @@ -29,34 +29,34 @@ class Difference; class DiffHunk { public: - enum Type { Normal, AddedByBlend }; + enum Type { Normal, AddedByBlend }; public: - DiffHunk( int sourceLine, int destinationLine, QString function = QString(), Type type = Normal ); - ~DiffHunk(); + DiffHunk(int sourceLine, int destinationLine, const QString& function = QString(), Type type = Normal); + ~DiffHunk(); - const DifferenceList& differences() const { return m_differences; }; - const QString& function() const { return m_function; }; + const DifferenceList& differences() const { return m_differences; }; + const QString& function() const { return m_function; }; - int sourceLineNumber() const { return m_sourceLine; }; - int destinationLineNumber() const { return m_destinationLine; }; + int sourceLineNumber() const { return m_sourceLine; }; + int destinationLineNumber() const { return m_destinationLine; }; - int sourceLineCount() const; - int destinationLineCount() const; + int sourceLineCount() const; + int destinationLineCount() const; - Type type() const { return m_type; } - void setType( Type type ) { m_type = type; } + Type type() const { return m_type; } + void setType(Type type) { m_type = type; } - void add( Difference* diff ); + void add(Difference* diff); - QString recreateHunk() const; + QString recreateHunk() const; private: - int m_sourceLine; - int m_destinationLine; - DifferenceList m_differences; - QString m_function; - Type m_type; + int m_sourceLine; + int m_destinationLine; + DifferenceList m_differences; + QString m_function; + Type m_type; }; typedef QList<DiffHunk*> DiffHunkList;
  66. Download patch po/pl/libkomparediff2.po

    --- 4:17.08.3-1/po/pl/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/pl/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2016-04-23 07:31+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n" "Language-Team: Polish <kde-i18n-doc@kde.org>\n" @@ -26,22 +26,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Zastosuj różnicę" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "C&ofnij różnicę" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Z&astosuj wszystkie" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Cofnij zastosowanie dla wszystkich" @@ -66,7 +66,7 @@ msgstr "&Poprzednia różnica" msgid "&Next Difference" msgstr "&Następna różnica" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -75,7 +75,7 @@ msgstr "" "<qt>Brak modeli lub brak różnic. Ten plik: <b>%1</b> nie jest poprawnym " "plikiem różnic.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -84,7 +84,7 @@ msgstr "" "<qt>Podczas nakładania poprawki <b>%1</b> na plik <b>%2</b> wystąpiły " "problemy.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -93,18 +93,18 @@ msgstr "" "<qt>Podczas nakładania poprawki <b>%1</b> na katalog <b>%2</b> wystąpiły " "problemy.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Nie można otworzyć pliku tymczasowego." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Nie można zapisać pliku tymczasowego <b>%1</b>, zostanie usunięty.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -113,7 +113,7 @@ msgstr "" "<qt>Nie można utworzyć katalogu docelowego <b>%1</b>.\n" "Plik nie został zapisany.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -124,22 +124,22 @@ msgstr "" "Plik tymczasowy jest ciągle dostępny: <b>%2</b>. Można go ręcznie skopiować " "we właściwe miejsce.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Nie można przetworzyć wyników diffa." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Pliki są identyczne." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Nie można zapisać do pliku tymczasowego." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  67. Download patch po/ca@valencia/libkomparediff2.po
  68. Download patch diffparser.h

    --- 4:17.08.3-1/diffparser.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffparser.h 2017-10-15 18:34:06.000000000 +0000 @@ -24,11 +24,11 @@ namespace Diff2 class DiffParser : public ParserBase { public: - DiffParser( const KompareModelList* list, const QStringList& diff ); - virtual ~DiffParser(); + DiffParser(const KompareModelList* list, const QStringList& diff); + ~DiffParser() override; protected: - enum Kompare::Format determineFormat() Q_DECL_OVERRIDE; + enum Kompare::Format determineFormat() override; }; } // End of namespace Diff2
  69. Download patch po/da/libkomparediff2.po

    --- 4:17.08.3-1/po/da/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/da/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-03 20:47+0200\n" "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n" "Language-Team: Danish <kde-i18n-doc@kde.org>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Anvend forskel" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Fjern anvendelse af forskel" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "An&vend alt" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Fjern anvendelse af alt" @@ -60,7 +60,7 @@ msgstr "&Forrige forskel" msgid "&Next Difference" msgstr "&Næste forskel" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Ingen modeller eller ingen forskelle, denne fil: <b>%1</b>, er ikke en " "gyldig diff-fil</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -77,7 +77,7 @@ msgid "" msgstr "" "<qt>Der var problemer med at anvende diff <b>%1</b> på filen <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -85,18 +85,18 @@ msgid "" msgstr "" "<qt>Der var problemer med at anvende diff <b>%1</b> på mappen <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Kunne ikke åbne en midlertidig fil." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Kunne ikke skrive til en midlertidig fil.<b>%1</b>, sletter den.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Kunne ikke skrive til en midlertidig mappe.<b>%1</b>.\n" "Filen er ikke blevet gemt.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "midlertidige fil er stadig til stede i: <b>%2</b>. Du kan kopiere den " "manuelt til det rigtige sted.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Kunne ikke fortolke diff-uddata." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Filerne er identiske." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Kunne ikke skrive til en midlertidig fil." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  70. Download patch po/bs/libkomparediff2.po

    --- 4:17.08.3-1/po/bs/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/bs/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kdesdk\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2014-10-20 19:39+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: Bosnian <bs@li.org>\n" @@ -20,22 +20,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Primijeni razliku" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Poništi primijenjenu razliku" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Primj&eni sve" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Poništi sve primijenjeno" @@ -60,7 +60,7 @@ msgstr "&Prethodna razlika" msgid "&Next Difference" msgstr "&Sljedeća razlika" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Nema modela ili nema razlika, ova datoteka: <b>%1</b>, nije ispravana " "datoteka razlike</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,7 +78,7 @@ msgstr "" "<qt>Došlo je do problema prilikom primjene razlike <b>%1</b> na datoteku <b>" "%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,18 +87,18 @@ msgstr "" "<qt>Došlo je do problema prilikom primjene razlike <b>%1</b> na direktorij " "<b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Nisam mogao otvoriti privremenu datoteku." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Nisam mogao da pišem u privremenu datoteku <b>%1</b>, brišem je.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -107,7 +107,7 @@ msgstr "" "<qt>Nisam mogao da napravim odredišni direktorij <b>%1</b>.\n" "Datoteka nije snimljena.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -118,22 +118,22 @@ msgstr "" "b>. Privremena datoteka je još uvijek dostupana pod: <b>%2</b>. Možete je " "ručno iskopirati na pravo mjesto.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Nisam mogao da analiziram izlaz razlike." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Datoteke su identične." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Nisam mogao da pišem u privremenu datoteku." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  71. Download patch po/ar/libkomparediff2.po

    --- 4:17.08.3-1/po/ar/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ar/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2012-02-09 17:29+0200\n" "Last-Translator: Abdalrahim Fakhouri <abdilra7eem@yahoo.com>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" @@ -20,22 +20,22 @@ msgstr "" "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Lokalize 1.2\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "تطبيق الاختلاف" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "إلغاء تطبيق الاختلاف" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "تطبيق الكل" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "إ&لغ كل التطبيقات" @@ -60,45 +60,45 @@ msgstr "التغيّر السابق" msgid "&Next Difference" msgstr "التغيّّر التالي" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, fuzzy, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "<qt> لا أو لا ملفّ<b></b> هو ليس a سليم ملفّ</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, fuzzy, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt> هناك<b></b> إلى ملفّ<b></b></qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, fuzzy, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt> هناك<b></b> إلى مجلد<b></b></qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "فشل فتح ملف مؤقَت." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, fuzzy, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt> يمكن أن ليس كتابة إلى مؤقت ملفّ<b></b> الإيطالية</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, fuzzy, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "<qt> يمكن أن ليس إ_نشئ مقصد دليل<b></b> ملفّ ليس</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, fuzzy, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -108,22 +108,22 @@ msgstr "" "<qt> يمكن أن ليس ارفع مؤقت ملفّ إلى مقصد موقع<b></b> الـ مؤقت ملفّ هو " "متوفّر<b></b> أنت يدويّاً نسخ الإيطالية إلى يمين</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "فشل إعراب مخرجات الإختلافات." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "هذه الملفات متطابقة." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "فشل الكتابة إلى الملف المؤقَت." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  72. Download patch diffmodel.cpp
  73. Download patch parserbase.h

    --- 4:17.08.3-1/parserbase.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/parserbase.h 2017-10-15 18:34:06.000000000 +0000 @@ -21,7 +21,6 @@ #include "kompare.h" #include "difference.h" -#include "diffmodellist.h" class QStringList; class QString; @@ -30,106 +29,108 @@ namespace Diff2 { class KompareModelList; +class DiffModelList; +class DiffModel; class ParserBase { public: - ParserBase( const KompareModelList* list, const QStringList& diff ); - virtual ~ParserBase(); + ParserBase(const KompareModelList* list, const QStringList& diff); + virtual ~ParserBase(); - static QString escapePath( QString path ); - static QString unescapePath( QString path ); + static QString escapePath(QString path); + static QString unescapePath(QString path); public: - enum Kompare::Format format() { return determineFormat(); }; - DiffModelList* parse( bool* malformed = 0 ); + enum Kompare::Format format() { return determineFormat(); }; + DiffModelList* parse(bool* malformed = nullptr); protected: - virtual bool parseContextDiffHeader(); - virtual bool parseEdDiffHeader(); - virtual bool parseNormalDiffHeader(); - virtual bool parseRCSDiffHeader(); - virtual bool parseUnifiedDiffHeader(); - - virtual bool parseContextHunkHeader(); - virtual bool parseEdHunkHeader(); - virtual bool parseNormalHunkHeader(); - virtual bool parseRCSHunkHeader(); - virtual bool parseUnifiedHunkHeader(); - - virtual bool parseContextHunkBody(); - virtual bool parseEdHunkBody(); - virtual bool parseNormalHunkBody(); - virtual bool parseRCSHunkBody(); - virtual bool parseUnifiedHunkBody(); - - virtual DiffModelList* parseContext(); - virtual DiffModelList* parseEd(); - virtual DiffModelList* parseNormal(); - virtual DiffModelList* parseRCS(); - virtual DiffModelList* parseUnified(); + virtual bool parseContextDiffHeader(); + virtual bool parseEdDiffHeader(); + virtual bool parseNormalDiffHeader(); + virtual bool parseRCSDiffHeader(); + virtual bool parseUnifiedDiffHeader(); + + virtual bool parseContextHunkHeader(); + virtual bool parseEdHunkHeader(); + virtual bool parseNormalHunkHeader(); + virtual bool parseRCSHunkHeader(); + virtual bool parseUnifiedHunkHeader(); + + virtual bool parseContextHunkBody(); + virtual bool parseEdHunkBody(); + virtual bool parseNormalHunkBody(); + virtual bool parseRCSHunkBody(); + virtual bool parseUnifiedHunkBody(); + + virtual DiffModelList* parseContext(); + virtual DiffModelList* parseEd(); + virtual DiffModelList* parseNormal(); + virtual DiffModelList* parseRCS(); + virtual DiffModelList* parseUnified(); protected: // Helper methods to speed things up - bool matchesUnifiedHunkLine( QString line ) const; - void checkHeader( const QRegExp& header ); + bool matchesUnifiedHunkLine(const QString& line) const; + void checkHeader(const QRegExp& header); protected: - /** What is format of the diff */ - virtual enum Kompare::Format determineFormat(); + /** What is format of the diff */ + virtual enum Kompare::Format determineFormat(); protected: - // Regexps for context parsing - QRegExp m_contextDiffHeader1; - QRegExp m_contextDiffHeader2; - - QRegExp m_contextHunkHeader1; - QRegExp m_contextHunkHeader2; - QRegExp m_contextHunkHeader3; - - QRegExp m_contextHunkBodyRemoved; - QRegExp m_contextHunkBodyAdded; - QRegExp m_contextHunkBodyChanged; - QRegExp m_contextHunkBodyContext; - QRegExp m_contextHunkBodyLine; // Added for convenience - - // Regexps for normal parsing - QRegExp m_normalDiffHeader; - - QRegExp m_normalHunkHeaderAdded; - QRegExp m_normalHunkHeaderRemoved; - QRegExp m_normalHunkHeaderChanged; - - QRegExp m_normalHunkBodyRemoved; - QRegExp m_normalHunkBodyAdded; - QRegExp m_normalHunkBodyDivider; - - enum Difference::Type m_normalDiffType; - - // RegExps for rcs parsing - QRegExp m_rcsDiffHeader; - - // Regexps for unified parsing - QRegExp m_unifiedDiffHeader1; - QRegExp m_unifiedDiffHeader2; - - QRegExp m_unifiedHunkHeader; - - QRegExp m_unifiedHunkBodyAdded; - QRegExp m_unifiedHunkBodyRemoved; - QRegExp m_unifiedHunkBodyContext; - QRegExp m_unifiedHunkBodyLine; // Added for convenience + // Regexps for context parsing + QRegExp m_contextDiffHeader1; + QRegExp m_contextDiffHeader2; + + QRegExp m_contextHunkHeader1; + QRegExp m_contextHunkHeader2; + QRegExp m_contextHunkHeader3; + + QRegExp m_contextHunkBodyRemoved; + QRegExp m_contextHunkBodyAdded; + QRegExp m_contextHunkBodyChanged; + QRegExp m_contextHunkBodyContext; + QRegExp m_contextHunkBodyLine; // Added for convenience + + // Regexps for normal parsing + QRegExp m_normalDiffHeader; + + QRegExp m_normalHunkHeaderAdded; + QRegExp m_normalHunkHeaderRemoved; + QRegExp m_normalHunkHeaderChanged; + + QRegExp m_normalHunkBodyRemoved; + QRegExp m_normalHunkBodyAdded; + QRegExp m_normalHunkBodyDivider; + + enum Difference::Type m_normalDiffType; + + // RegExps for rcs parsing + QRegExp m_rcsDiffHeader; + + // Regexps for unified parsing + QRegExp m_unifiedDiffHeader1; + QRegExp m_unifiedDiffHeader2; + + QRegExp m_unifiedHunkHeader; + + QRegExp m_unifiedHunkBodyAdded; + QRegExp m_unifiedHunkBodyRemoved; + QRegExp m_unifiedHunkBodyContext; + QRegExp m_unifiedHunkBodyLine; // Added for convenience protected: - const QStringList& m_diffLines; - DiffModel* m_currentModel; - DiffModelList* m_models; - QStringList::ConstIterator m_diffIterator; + const QStringList& m_diffLines; + DiffModel* m_currentModel; + DiffModelList* m_models; + QStringList::ConstIterator m_diffIterator; - bool m_singleFileDiff; - bool m_malformed; + bool m_singleFileDiff; + bool m_malformed; protected: - const KompareModelList* m_list; + const KompareModelList* m_list; }; } // End of namespace Diff2
  74. Download patch po/pa/libkomparediff2.po

    --- 4:17.08.3-1/po/pa/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/pa/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2012-07-05 07:33+0530\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" @@ -18,22 +18,22 @@ msgstr "" "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "ਅੰਤਰ ਲਾਗੂ(&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "ਅੰਤਰ ਲਾਗੂ ਕਰਨਾ ਵਾਪਸ(&a)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "ਸਭ ਲਾਗੂ(&l)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "ਸਭ ਲਾਗੂ ਵਾਪਸ(&U)" @@ -58,45 +58,45 @@ msgstr "ਪਿੱਛੇ ਅੰਤਰ(&P) msgid "&Next Difference" msgstr "ਅੱਗੇ ਅੰਤਰ(&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "ਇੱਕ ਆਰਜ਼ੀ ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -104,22 +104,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "ਫਾਇਲਾਂ ਇੱਕੋ ਜਿਹੀਆਂ ਹੀ ਹਨ।" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "ਫਾਰਮੈਟਫਾਇਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  75. Download patch difference.h
  76. Download patch komparemodellist.h
  77. Download patch po/nl/libkomparediff2.po

    --- 4:17.08.3-1/po/nl/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/nl/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-27 09:00+0200\n" "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "Verschil toep&assen" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Toegep&ast verschil ongedaan maken" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "A&lles toepassen" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Alle toepassi&ngen ongedaan maken" @@ -57,7 +57,7 @@ msgstr "&Vorig verschil" msgid "&Next Difference" msgstr "Volge&nd verschil" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgstr "" "<qt>Geen modellen of verschillen gevonden, het bestand <b>%1</b> is geen " "geldig diff-bestand.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>Er zijn problemen opgetreden tijdens het toepassen van de diff <b>%1</b> " "op bestand <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,19 +84,19 @@ msgstr "" "<qt>Er zijn problemen opgetreden tijdens het toepassen van diff <b>%1</b> op " "map <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Kon geen tijdelijk bestand openen." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Kon niet naar het tijdelijke bestand <b>%1</b>schrijven. Het wordt " "verwijderd.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -105,7 +105,7 @@ msgstr "" "<qt>Kan de doelmap <b>%1</b> niet aanmaken.\n" "Het bestand is niet opgeslagen.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -116,22 +116,22 @@ msgstr "" "tijdelijke bestand is nog steeds beschikbaar als: <b>%2</b>. U kunt het " "eventueel handmatig verplaatsen naar de juiste locatie.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Kon de diff-uitvoer niet ontleden." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "De bestanden zijn identiek." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Kon niet naar het tijdelijke bestand schrijven." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  78. Download patch po/nb/libkomparediff2.po

    --- 4:17.08.3-1/po/nb/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/nb/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-04-08 21:44+0200\n" "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -22,22 +22,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Legg på forskjellen" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "T&a vekk forskjellen" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Le&gg på alle" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Ta vekk alle" @@ -62,7 +62,7 @@ msgstr "&Forrige forskjell" msgid "&Next Difference" msgstr "&Neste forskjell" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -71,7 +71,7 @@ msgstr "" "<qt>Ingen modeller eller ingen forskjeller, denne fila: <b>%1</b>, er ikke " "en gyldig diff-fil.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -79,7 +79,7 @@ msgid "" msgstr "" "<qt>Det var problemer med å legge på diff <b>%1</b> på fila <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,18 +87,18 @@ msgid "" msgstr "" "<qt>Det var problemer med å legge på diff <b>%1</b> på mappa <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Klarte ikke åpne en midlertidig fil." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Klarte ikke skrive til den midlertidige fila <b>%1</b>, sletter den.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -107,7 +107,7 @@ msgstr "" "<qt>Kunne ikke opprette målmappa <b>%1</b>.\n" "Fila ble ikke lagret.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -118,22 +118,22 @@ msgstr "" "fremdeles tilgjengelig under: <b>%2</b>. Du kan kopiere den manuelt til det " "riktige stedet.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Klarte ikke tolke utdata fra diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Filene er identiske." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Klarte ikke skrive til den midlertidige fila." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  79. Download patch po/cs/libkomparediff2.po

    --- 4:17.08.3-1/po/cs/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/cs/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-07-29 09:30+0200\n" "Last-Translator: Vit Pelcak <vit@pelcak.org>\n" "Language-Team: Czech <kde-i18n-doc@kde.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Aplikovat rozdíl" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Vrátit rozdíl" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Ap&likovat všechny" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Vrátit vš&e" @@ -57,7 +57,7 @@ msgstr "&Předchozí rozdíl" msgid "&Next Difference" msgstr "&Následující rozdíl" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgstr "" "<qt>Žádné modely ani rozdíly v souboru: <b>%1</b>, není to platný rozdílový " "soubor.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>Nastaly problémy při aplikování rozdílů <b>%1</b> do souboru <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,17 +84,17 @@ msgstr "" "<qt>Nastaly problémy při aplikování rozdílů <b>%1</b> do složky <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Nelze otevřít dočasný soubor." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>Selhal zápis do dočasného souboru <b>%1</b>, probíhá mazání.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -103,7 +103,7 @@ msgstr "" "<qt>Nelze vytvořit cílovou složku <b>%1</b>.\n" "Soubor nebyl uložen.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -114,22 +114,22 @@ msgstr "" "je k dispozici pod: <b>%2</b>. Můžete jej na správné místo zkopírovat ručně." "</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Nelze zpracovat výstup z diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Soubory jsou stejné." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Selhal zápis do dočasného souboru." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  80. Download patch differencestringpair.h

    --- 4:17.08.3-1/differencestringpair.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/differencestringpair.h 2017-10-15 18:34:06.000000000 +0000 @@ -34,11 +34,11 @@ class DifferenceStringPair { public: DifferenceStringPair(DifferenceString* first, DifferenceString* second) : m_first(first), m_second(second), - m_strFirst(' ' + first->string()), m_strSecond(' ' + second->string()), - m_lengthFirst(m_strFirst.length()), m_lengthSecond(m_strSecond.length()), - m_arrayFirst(m_strFirst.unicode()), m_arraySecond(m_strSecond.unicode()) + m_strFirst(QLatin1Char(' ') + first->string()), m_strSecond(QLatin1Char(' ') + second->string()), + m_lengthFirst(m_strFirst.length()), m_lengthSecond(m_strSecond.length()), + m_arrayFirst(m_strFirst.unicode()), m_arraySecond(m_strSecond.unicode()) { - // Actual contents must be indented by 1 + // Actual contents must be indented by 1 } bool equal(unsigned int firstIndex, unsigned int secondIndex) const {
  81. Download patch levenshteintable.h
  82. Download patch kompareprocess.cpp
  83. Download patch debian/libkomparediff2-5.symbols

    --- 4:17.08.3-1/debian/libkomparediff2-5.symbols 2016-06-04 08:58:17.000000000 +0000 +++ 4:17.12.3-0ubuntu1/debian/libkomparediff2-5.symbols 2018-03-16 13:33:05.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 4:14.12.50 amd64 +# SymbolsHelper-Confirmed: 4:17.11.70+git20171028 amd64 libkomparediff2.so.5 libkomparediff2-5 #MINVER# _ZN12DiffSettings11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:14.12.50 _ZN12DiffSettings11qt_metacastEPKc@Base 4:14.12.50 @@ -41,6 +41,7 @@ libkomparediff2.so.5 libkomparediff2-5 # _ZN5Diff216KompareModelList11qt_metacallEN11QMetaObject4CallEiPPv@Base 4:14.12.50 _ZN5Diff216KompareModelList11qt_metacastEPKc@Base 4:14.12.50 _ZN5Diff216KompareModelList11setEncodingERK7QString@Base 4:14.12.50 + _ZN5Diff216KompareModelList12setReadWriteEb@Base 4:17.11.70+git20171028 _ZN5Diff216KompareModelList12setSelectionEPKNS_10DifferenceE@Base 4:14.12.50 _ZN5Diff216KompareModelList12setSelectionEPKNS_9DiffModelEPKNS_10DifferenceE@Base 4:14.12.50 _ZN5Diff216KompareModelList13modelsChangedEPKNS_13DiffModelListE@Base 4:14.12.50 @@ -152,6 +153,7 @@ libkomparediff2.so.5 libkomparediff2-5 # _ZNK5Diff216KompareModelList11hasNextDiffEv@Base 4:14.12.50 _ZNK5Diff216KompareModelList11hasPrevDiffEv@Base 4:14.12.50 _ZNK5Diff216KompareModelList11isDirectoryERK7QString@Base 4:14.12.50 + _ZNK5Diff216KompareModelList11isReadWriteEv@Base 4:17.11.70+git20171028 _ZNK5Diff216KompareModelList12appliedCountEv@Base 4:14.12.50 _ZNK5Diff216KompareModelList12hasNextModelEv@Base 4:14.12.50 _ZNK5Diff216KompareModelList12hasPrevModelEv@Base 4:14.12.50
  84. Download patch po/bg/libkomparediff2.po

    --- 4:17.08.3-1/po/bg/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/bg/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-09-17 22:29+0300\n" "Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -18,22 +18,22 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Прилагане на разликите" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Отмяна прилагането на разликите" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "&Прилагане на всички" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Отмяна на прилагане на всички" @@ -58,7 +58,7 @@ msgstr "&Предишна разлика msgid "&Next Difference" msgstr "&Следваща разлика" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -66,7 +66,7 @@ msgid "" msgstr "" "<qt>Няма модели или разлики. Файлът: <b>%1</b> не е валиден diff файл.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -75,7 +75,7 @@ msgstr "" "<qt>Има проблеми при прилагането на разлика <b>%1</b> към файл <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,18 +84,18 @@ msgstr "" "<qt>Има проблеми при прилагането на разлика <b>%1</b> към папка <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Временният файл не може да бъде творен." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Записът във временният файл <b>%1</b> е невъзможен. Ще бъде изтрит.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -104,7 +104,7 @@ msgstr "" "<qt>Не може да бъде създадена отправна директория <b>%1</b>.\n" "Файлът не е записан.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -115,22 +115,22 @@ msgstr "" "зареден. Той е достъпен като: <b>%2</b>. Можете ръчно да го копирате в " "подходящото място..</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Данните за разликите не могат да бъдат обработени." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Файловете са същите." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Записът във временния файл е невъзможен." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  85. Download patch po/nn/libkomparediff2.po

    --- 4:17.08.3-1/po/nn/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/nn/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-06-17 00:34+0200\n" "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Legg over skilnaden" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "T&a vekk skilnaden" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Legg &over alle" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "Ta &vekk alle" @@ -60,7 +60,7 @@ msgstr "&Førre skilnad" msgid "&Next Difference" msgstr "&Neste skilnad" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -69,7 +69,7 @@ msgstr "" "<qt>Ingen modellar eller ingen skilnadar. Fila <b>%1</b> er ikkje ei gyldig " "diff-fil.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -78,7 +78,7 @@ msgstr "" "<qt>Det var problem med å leggja over diffen <b>%1</b> på fila <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -87,19 +87,19 @@ msgstr "" "<qt>Det var problem med å leggja over diffen <b>%1</b> på mappa <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Klarte ikkje opna mellombelsfil." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" "<qt>Klarte ikkje skriva til den mellombelse fila <b>%1</b>. Ho vert derfor " "sletta.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -108,7 +108,7 @@ msgstr "" "<qt>Klarte ikkje oppretta målmappa <b>%1</b>.\n" "Fila vart ikkje lagra.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -119,22 +119,22 @@ msgstr "" "framleis tilgjengeleg under <b>%2</b>. Du kan kopiera henne manuelt til den " "rette staden.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Klarte ikkje tolka utdata frå diff." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Filene er like." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Klarte ikkje skriva til den mellombelse fila." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  86. Download patch po/lv/libkomparediff2.po

    --- 4:17.08.3-1/po/lv/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/lv/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2009-06-04 12:04+0300\n" "Last-Translator: Viesturs Zariņš <viesturs.zarins@mii.lu.lv>\n" "Language-Team: Latvian <locale@laka.lv>\n" @@ -19,22 +19,22 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Pielietot atšķirību" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "&Atcelt atšķirību" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "Pie&lietot visas" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "A&tcelt visas" @@ -59,7 +59,7 @@ msgstr "&Iepriekšējā atšķirība" msgid "&Next Difference" msgstr "&Nākamā atšķirība" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -68,7 +68,7 @@ msgstr "" "<qt>Šajā failā nav ne modeļu ne atšķirību: <b>%1</b>, nav derīgs diff fails." "</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -76,7 +76,7 @@ msgid "" msgstr "" "<qt>Gadījās problēmas diff <b>%1</b> pielietošanāto uz failu <b>%2</b>.</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -84,17 +84,17 @@ msgid "" msgstr "" "<qt>Gadījās problēmas diff <b>%1</b> pielietošanā uz mapi <b>%2</b>.</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Neizdevās atvērt pagaidu failu." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>Neizdevas rakstīt pagaidu failā <b>%1</b>, izdzēš to.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -103,7 +103,7 @@ msgstr "" "<qt>Neizdevās izveidot mērķa mapi <b>%1</b>.\n" "Fails netika saglabāts.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -114,22 +114,22 @@ msgstr "" "joprojām atrodas iekš: <b>%2</b>. Jūs varat to pārkopēt pats uz pareizo " "vietu.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Neizdevās analizēt diff izvadu." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "Faili ir identiski." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Neizdevās rakstīt pagaidu failā." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  87. Download patch parser.h

    --- 4:17.08.3-1/parser.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/parser.h 2017-10-15 18:34:06.000000000 +0000 @@ -17,38 +17,37 @@ #ifndef DIFF2_PARSER_H #define DIFF2_PARSER_H -#include "diffmodellist.h" #include "kompare.h" namespace Diff2 { -class DiffModel; +class DiffModelList; class KompareModelList; class Parser { public: - explicit Parser(const KompareModelList* list); - ~Parser(); + explicit Parser(const KompareModelList* list); + ~Parser(); public: - DiffModelList* parse( QStringList& diffLines, bool* malformed = 0 ); + DiffModelList* parse(QStringList& diffLines, bool* malformed = nullptr); - enum Kompare::Generator generator() const { return m_generator; }; - enum Kompare::Format format() const { return m_format; }; + enum Kompare::Generator generator() const { return m_generator; }; + enum Kompare::Format format() const { return m_format; }; private: - /** Which program was used to generate the output */ - enum Kompare::Generator determineGenerator( const QStringList& diffLines ); + /** Which program was used to generate the output */ + enum Kompare::Generator determineGenerator(const QStringList& diffLines); - int cleanUpCrap( QStringList& diffLines ); + int cleanUpCrap(QStringList& diffLines); private: - enum Kompare::Generator m_generator; - enum Kompare::Format m_format; + enum Kompare::Generator m_generator; + enum Kompare::Format m_format; - const KompareModelList* m_list; + const KompareModelList* m_list; }; } // End of namespace Diff2
  88. Download patch diffmodel.h
  89. Download patch po/zh_TW/libkomparediff2.po

    --- 4:17.08.3-1/po/zh_TW/libkomparediff2.po 2017-11-07 01:22:35.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/zh_TW/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-02-23 13:04+0800\n" "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n" "Language-Team: Chinese Traditional <kde-tw@googlegroups.com>\n" @@ -20,22 +20,22 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "套用差異處(&A)" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "取消套用差異處(&A)" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "全部套用(&L)" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "全部取消套用(&U)" @@ -60,45 +60,45 @@ msgstr "上一個差異(&P)" msgid "&Next Difference" msgstr "下一個差異(&N)" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "<qt>檔案 <b>%1</b> 不是合法的 diff 檔,沒有任何模式或差異處。</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "<qt>套用 <b>%1</b>到檔案 <b>%2</b> 時發生問題。</qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "<qt>套用 <b>%1</b>到資料夾 <b>%2</b> 時發生問題。</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "無法開啟暫存檔。" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>無法寫入暫存檔 <b>%1</b>,暫存檔將被刪除。</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "<qt>無法建立目標資料夾 <b>%1</b>。檔案尚未儲存。</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -108,22 +108,22 @@ msgstr "" "<qt>無法將暫存檔上傳到目標位置 <b>%1</b>。暫存檔仍然在 <b>%2</b>。您可以手動" "複製到正確的地方。</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "無法分析 diff 輸出。" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "檔案完全相同。" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "無法寫入暫存檔。" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  90. Download patch po/en_GB/libkomparediff2.po

    --- 4:17.08.3-1/po/en_GB/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/en_GB/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2010-05-30 15:14+0100\n" "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n" "Language-Team: British English <kde-i18n-doc@kde.org>\n" @@ -18,22 +18,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "&Apply Difference" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "Un&apply Difference" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "App&ly All" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "&Unapply All" @@ -58,7 +58,7 @@ msgstr "&Previous Difference" msgid "&Next Difference" msgstr "&Next Difference" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " @@ -67,7 +67,7 @@ msgstr "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" @@ -76,7 +76,7 @@ msgstr "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." @@ -85,17 +85,17 @@ msgstr "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "Could not open a temporary file." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" @@ -104,7 +104,7 @@ msgstr "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -115,22 +115,22 @@ msgstr "" "b>. The temporary file is still available under: <b>%2</b>. You can manually " "copy it to the right place.</qt>" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "Could not parse diff output." -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "The files are identical." -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "Could not write to the temporary file." -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  91. Download patch perforceparser.cpp
  92. Download patch settingsbase.cpp

    --- 4:17.08.3-1/settingsbase.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/settingsbase.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -5,7 +5,7 @@ Copyright 2001 Otto Bruggeman <otto.bruggeman@home.nl> Copyright 2001 John Firebaugh <jfirebaugh@kde.org> ****************************************************************************/ - + /*************************************************************************** ** ** This program is free software; you can redistribute it and/or modify @@ -19,7 +19,7 @@ #include <QWidget> -SettingsBase::SettingsBase( QWidget* parent ) : QObject( parent ) +SettingsBase::SettingsBase(QWidget* parent) : QObject(parent) { } @@ -29,11 +29,11 @@ SettingsBase::~SettingsBase() } -void SettingsBase::loadSettings( KConfig* /* config */ ) +void SettingsBase::loadSettings(KConfig* /* config */) { } -void SettingsBase::saveSettings( KConfig* /* config */ ) +void SettingsBase::saveSettings(KConfig* /* config */) { }
  93. Download patch marker.h

    --- 4:17.08.3-1/marker.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/marker.h 2017-10-15 18:34:06.000000000 +0000 @@ -37,7 +37,7 @@ public: m_type = Marker::Start; m_offset = 0; } - Marker( enum Marker::Type type, unsigned int offset ) + Marker(enum Marker::Type type, unsigned int offset) { m_type = type; m_offset = offset; @@ -45,11 +45,11 @@ public: ~Marker() {} public: - enum Marker::Type type() const { return m_type; } + enum Marker::Type type() const { return m_type; } unsigned int offset() const { return m_offset; } - void setType ( enum Marker::Type type ) { m_type = type; } - void setOffset( unsigned int offset ) { m_offset = offset; } + void setType(enum Marker::Type type) { m_type = type; } + void setOffset(unsigned int offset) { m_offset = offset; } bool operator == (const Marker& rhs) const { return this->type() == rhs.type() && this->offset() == rhs.offset();
  94. Download patch po/km/libkomparediff2.po

    --- 4:17.08.3-1/po/km/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/km/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2008-12-19 10:22+0700\n" "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n" "Language-Team: Khmer <support@khmeros.info>\n" @@ -20,22 +20,22 @@ msgstr "" "\n" "X-Generator: KBabel 1.11.4\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -60,45 +60,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -106,22 +106,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  95. Download patch po/mr/libkomparediff2.po

    --- 4:17.08.3-1/po/mr/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/mr/libkomparediff2.po 2018-03-06 00:23:59.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2013-03-28 14:37+0530\n" "Last-Translator: Chetan Khona <chetan@kompkin.com>\n" "Language-Team: Marathi <kde-i18n-doc@kde.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.5\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -57,45 +57,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, fuzzy, kde-format msgid "Could not open a temporary file." msgstr "तात्पुरती फाईल उघडता आली नाही." -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -103,22 +103,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  96. Download patch po/ast/libkomparediff2.po

    --- 4:17.08.3-1/po/ast/libkomparediff2.po 2017-11-07 01:22:34.000000000 +0000 +++ 4:17.12.3-0ubuntu1/po/ast/libkomparediff2.po 2018-03-06 00:23:58.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 20:17+0100\n" +"POT-Creation-Date: 2017-10-17 03:39+0200\n" "PO-Revision-Date: 2016-12-19 02:45+0100\n" "Last-Translator: enolp <enolp@softastur.org>\n" "Language-Team: Asturian <alministradores@softastur.org>\n" @@ -17,22 +17,22 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: komparemodellist.cpp:74 +#: komparemodellist.cpp:68 #, kde-format msgid "&Apply Difference" msgstr "" -#: komparemodellist.cpp:78 +#: komparemodellist.cpp:72 #, kde-format msgid "Un&apply Difference" msgstr "" -#: komparemodellist.cpp:82 +#: komparemodellist.cpp:76 #, kde-format msgid "App&ly All" msgstr "" -#: komparemodellist.cpp:86 +#: komparemodellist.cpp:80 #, kde-format msgid "&Unapply All" msgstr "" @@ -57,45 +57,45 @@ msgstr "" msgid "&Next Difference" msgstr "" -#: komparemodellist.cpp:262 komparemodellist.cpp:287 +#: komparemodellist.cpp:266 komparemodellist.cpp:291 #, kde-format msgid "" "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff " "file.</qt>" msgstr "" -#: komparemodellist.cpp:271 +#: komparemodellist.cpp:275 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</" "qt>" msgstr "" -#: komparemodellist.cpp:298 +#: komparemodellist.cpp:302 #, kde-format msgid "" "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>." "</qt>" msgstr "" -#: komparemodellist.cpp:330 komparemodellist.cpp:666 +#: komparemodellist.cpp:334 komparemodellist.cpp:684 #, kde-format msgid "Could not open a temporary file." msgstr "" -#: komparemodellist.cpp:378 komparemodellist.cpp:385 +#: komparemodellist.cpp:382 komparemodellist.cpp:389 #, kde-format msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" msgstr "" -#: komparemodellist.cpp:416 +#: komparemodellist.cpp:420 #, kde-format msgid "" "<qt>Could not create destination directory <b>%1</b>.\n" "The file has not been saved.</qt>" msgstr "" -#: komparemodellist.cpp:435 +#: komparemodellist.cpp:439 #, kde-format msgid "" "<qt>Could not upload the temporary file to the destination location <b>%1</" @@ -103,22 +103,22 @@ msgid "" "copy it to the right place.</qt>" msgstr "" -#: komparemodellist.cpp:500 komparemodellist.cpp:613 komparemodellist.cpp:633 +#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651 #, kde-format msgid "Could not parse diff output." msgstr "" -#: komparemodellist.cpp:516 +#: komparemodellist.cpp:534 #, kde-format msgid "The files are identical." msgstr "" -#: komparemodellist.cpp:698 +#: komparemodellist.cpp:716 #, kde-format msgid "Could not write to the temporary file." msgstr "" -#: komparemodellist.cpp:972 +#: komparemodellist.cpp:990 #, kde-format msgid "" "The diff is malformed. Some lines could not be parsed and will not be "
  97. Download patch kompareprocess.h

    --- 4:17.08.3-1/kompareprocess.h 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/kompareprocess.h 2017-10-15 18:34:06.000000000 +0000 @@ -19,7 +19,7 @@ #ifndef KOMPAREPROCESS_H #define KOMPAREPROCESS_H -#include <kprocess.h> +#include <KProcess> #include "kompare.h" @@ -29,39 +29,39 @@ class DiffSettings; class KompareProcess : public KProcess { - Q_OBJECT + Q_OBJECT public: - KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, const QString & source, - const QString & destination, const QString& directory = QString(), enum Kompare::Mode = Kompare::UnknownMode ); - ~KompareProcess(); + KompareProcess(DiffSettings* diffSettings, enum Kompare::DiffMode mode, const QString& source, + const QString& destination, const QString& directory = QString(), enum Kompare::Mode = Kompare::UnknownMode); + ~KompareProcess() override; - void start(); + void start(); - QString diffOutput() { return m_stdout; } - QString stdOut() { return m_stdout; } - QString stdErr() { return m_stderr; } + QString diffOutput() { return m_stdout; } + QString stdOut() { return m_stdout; } + QString stdErr() { return m_stderr; } - void setEncoding( const QString& encoding ); + void setEncoding(const QString& encoding); Q_SIGNALS: - void diffHasFinished( bool finishedNormally ); + void diffHasFinished(bool finishedNormally); protected: - void writeDefaultCommandLine(); - void writeCommandLine(); + void writeDefaultCommandLine(); + void writeCommandLine(); protected Q_SLOTS: - void slotFinished( int, QProcess::ExitStatus ); + void slotFinished(int, QProcess::ExitStatus); private: - DiffSettings* m_diffSettings; - enum Kompare::DiffMode m_mode; - const QString * m_customString; // Used when a comparison between a file and a string is requested - QString m_stdout; - QString m_stderr; - QTextDecoder* m_textDecoder; - QTextCodec * m_codec; + DiffSettings* m_diffSettings; + enum Kompare::DiffMode m_mode; + const QString* m_customString; // Used when a comparison between a file and a string is requested + QString m_stdout; + QString m_stderr; + QTextDecoder* m_textDecoder; + QTextCodec* m_codec; }; #endif
  98. Download patch diffparser.cpp

    --- 4:17.08.3-1/diffparser.cpp 2017-06-02 05:37:55.000000000 +0000 +++ 4:17.12.3-0ubuntu1/diffparser.cpp 2017-10-15 18:34:06.000000000 +0000 @@ -16,17 +16,16 @@ #include "diffparser.h" #include <QRegExp> -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY(LIBKOMPAREDIFF2) +#include <komparediffdebug.h> using namespace Diff2; -DiffParser::DiffParser( const KompareModelList* list, const QStringList& diff ) : ParserBase( list, diff ) +DiffParser::DiffParser(const KompareModelList* list, const QStringList& diff) : ParserBase(list, diff) { - // The regexps needed for context diff parsing, the rest is the same as in parserbase.cpp - m_contextDiffHeader1.setPattern( "\\*\\*\\* ([^\\t]+)(\\t([^\\t]+))?\\n" ); - m_contextDiffHeader2.setPattern( "--- ([^\\t]+)(\\t([^\\t]+))?\\n" ); + // The regexps needed for context diff parsing, the rest is the same as in parserbase.cpp + m_contextDiffHeader1.setPattern(QStringLiteral("\\*\\*\\* ([^\\t]+)(\\t([^\\t]+))?\\n")); + m_contextDiffHeader2.setPattern(QStringLiteral("--- ([^\\t]+)(\\t([^\\t]+))?\\n")); } DiffParser::~DiffParser() @@ -35,46 +34,46 @@ DiffParser::~DiffParser() enum Kompare::Format DiffParser::determineFormat() { - qCDebug(LIBKOMPAREDIFF2) << "Determining the format of the diff Diff" << m_diffLines; + qCDebug(LIBKOMPAREDIFF2) << "Determining the format of the diff Diff" << m_diffLines; - QRegExp normalRE ( "[0-9]+[0-9,]*[acd][0-9]+[0-9,]*" ); - QRegExp unifiedRE( "^--- " ); - QRegExp contextRE( "^\\*\\*\\* " ); - QRegExp rcsRE ( "^[acd][0-9]+ [0-9]+" ); - QRegExp edRE ( "^[0-9]+[0-9,]*[acd]" ); - - QStringList::ConstIterator it = m_diffLines.begin(); - - while( it != m_diffLines.end() ) - { - qCDebug(LIBKOMPAREDIFF2) << (*it); - if( it->indexOf( normalRE, 0 ) == 0 ) - { - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Normal diff..."; - return Kompare::Normal; - } - else if( it->indexOf( unifiedRE, 0 ) == 0 ) - { - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Unified diff..."; - return Kompare::Unified; - } - else if( it->indexOf( contextRE, 0 ) == 0 ) - { - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Context diff..."; - return Kompare::Context; - } - else if( it->indexOf( rcsRE, 0 ) == 0 ) - { - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an RCS diff..."; - return Kompare::RCS; - } - else if( it->indexOf( edRE, 0 ) == 0 ) - { - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an ED diff..."; - return Kompare::Ed; - } - ++it; - } - qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an unknown diff..."; - return Kompare::UnknownFormat; + QRegExp normalRE(QStringLiteral("[0-9]+[0-9,]*[acd][0-9]+[0-9,]*")); + QRegExp unifiedRE(QStringLiteral("^--- ")); + QRegExp contextRE(QStringLiteral("^\\*\\*\\* ")); + QRegExp rcsRE(QStringLiteral("^[acd][0-9]+ [0-9]+")); + QRegExp edRE(QStringLiteral("^[0-9]+[0-9,]*[acd]")); + + QStringList::ConstIterator it = m_diffLines.begin(); + + while (it != m_diffLines.end()) + { + qCDebug(LIBKOMPAREDIFF2) << (*it); + if (it->indexOf(normalRE, 0) == 0) + { + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Normal diff..."; + return Kompare::Normal; + } + else if (it->indexOf(unifiedRE, 0) == 0) + { + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Unified diff..."; + return Kompare::Unified; + } + else if (it->indexOf(contextRE, 0) == 0) + { + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from a Context diff..."; + return Kompare::Context; + } + else if (it->indexOf(rcsRE, 0) == 0) + { + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an RCS diff..."; + return Kompare::RCS; + } + else if (it->indexOf(edRE, 0) == 0) + { + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an ED diff..."; + return Kompare::Ed; + } + ++it; + } + qCDebug(LIBKOMPAREDIFF2) << "Difflines are from an unknown diff..."; + return Kompare::UnknownFormat; }
  1. kompare
  2. libkomparediff2