Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2017-10-23 16:31:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Mon Oct 23 16:31:44 2017 rev:56 rq:534757 version:17.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2017-09-12 19:48:31.896977382 +0200 +++ /work/SRC/openSUSE:Factory/.kompare.new/kompare.changes 2017-10-23 16:31:45.505156214 +0200 @@ -1,0 +2,12 @@ +Tue Oct 17 00:32:23 CEST 2017 - [email protected] + +- Update to 17.08.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.2.php +- Changes since 17.08.1: + * Fix missing component data of KomparePart + * Only do i18n setup and calls after QApp instance is created + * Fix missing setting of translationDomain + +------------------------------------------------------------------- Old: ---- kompare-17.08.1.tar.xz New: ---- kompare-17.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.AnmUzu/_old 2017-10-23 16:31:46.121127376 +0200 +++ /var/tmp/diff_new_pack.AnmUzu/_new 2017-10-23 16:31:46.125127190 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kompare -Version: 17.08.1 +Version: 17.08.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ kompare-17.08.1.tar.xz -> kompare-17.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/interfaces/CMakeLists.txt new/kompare-17.08.2/interfaces/CMakeLists.txt --- old/kompare-17.08.1/interfaces/CMakeLists.txt 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/interfaces/CMakeLists.txt 2017-10-09 18:45:25.000000000 +0200 @@ -1,5 +1,4 @@ - - +add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/komparenavtreepart/CMakeLists.txt new/kompare-17.08.2/komparenavtreepart/CMakeLists.txt --- old/kompare-17.08.1/komparenavtreepart/CMakeLists.txt 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/komparenavtreepart/CMakeLists.txt 2017-10-09 18:45:25.000000000 +0200 @@ -1,3 +1,4 @@ +add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../komparepart) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/komparepart/CMakeLists.txt new/kompare-17.08.2/komparepart/CMakeLists.txt --- old/kompare-17.08.1/komparepart/CMakeLists.txt 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/komparepart/CMakeLists.txt 2017-10-09 18:45:25.000000000 +0200 @@ -1,4 +1,4 @@ -#define TRANSLATION_DOMAIN "kompare" +add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../libdialogpages ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/komparepart/kompare_part.cpp new/kompare-17.08.2/komparepart/kompare_part.cpp --- old/kompare-17.08.1/komparepart/kompare_part.cpp 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/komparepart/kompare_part.cpp 2017-10-09 18:45:25.000000000 +0200 @@ -64,10 +64,25 @@ ViewSettings* KomparePart::m_viewSettings = 0L; DiffSettings* KomparePart::m_diffSettings = 0L; +static KAboutData createAboutData() +{ + KAboutData about(QStringLiteral("kompare"), i18n("KomparePart"), QStringLiteral("4.0"), + QString(), KAboutLicense::GPL); + about.addAuthor(i18n("John Firebaugh"), i18n("Author"), "[email protected]"); + about.addAuthor(i18n("Otto Bruggeman"), i18n("Author"), "[email protected]" ); + about.addAuthor(i18n("Kevin Kofler"), i18n("Author"), "[email protected]" ); + return about; +} + KomparePart::KomparePart( QWidget *parentWidget, QObject *parent, const QVariantList & /*args*/ ) : KParts::ReadWritePart(parent), m_info() { + setComponentData(createAboutData()); + + // set our XML-UI resource file + setXMLFile(QStringLiteral("komparepartui.rc")); + if( !m_viewSettings ) { m_viewSettings = new ViewSettings( 0 ); } @@ -149,9 +164,6 @@ setupActions(); - // set our XML-UI resource file - setXMLFile( "komparepartui.rc" ); - // we are read-write by default -> uhm what if we are opened by lets say konq in RO mode ? // Then we should not be doing this... setReadWrite( true ); @@ -644,15 +656,6 @@ qCDebug(KOMPAREPART) << "Done painting something..."; } -KAboutData* KomparePart::createAboutData() -{ - KAboutData *about = new KAboutData("kompare", i18n("KomparePart"), "4.0"); - about->addAuthor(i18n("John Firebaugh"), i18n("Author"), "[email protected]"); - about->addAuthor(i18n("Otto Bruggeman"), i18n("Author"), "[email protected]" ); - about->addAuthor(i18n("Kevin Kofler"), i18n("Author"), "[email protected]" ); - return about; -} - void KomparePart::slotSetStatus( enum Kompare::Status status ) { updateActions(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/komparepart/kompare_part.h new/kompare-17.08.2/komparepart/kompare_part.h --- old/kompare-17.08.1/komparepart/kompare_part.h 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/komparepart/kompare_part.h 2017-10-09 18:45:25.000000000 +0200 @@ -85,8 +85,6 @@ // Do we really want to expose this ??? const Diff2::KompareModelList* model() const { return m_modelList; }; - static KAboutData *createAboutData(); - public: // Reimplemented from the KompareInterface /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/komparepart/komparepartui.rc new/kompare-17.08.2/komparepart/komparepartui.rc --- old/kompare-17.08.1/komparepart/komparepartui.rc 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/komparepart/komparepartui.rc 2017-10-09 18:45:25.000000000 +0200 @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="kompare_part" version="6"> +<kpartgui name="kompare_part" version="6" translationDomain="kompare"> <MenuBar> <Menu name="file"><text>&File</text> <Action name="file_save"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/libdialogpages/CMakeLists.txt new/kompare-17.08.2/libdialogpages/CMakeLists.txt --- old/kompare-17.08.1/libdialogpages/CMakeLists.txt 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/libdialogpages/CMakeLists.txt 2017-10-09 18:45:25.000000000 +0200 @@ -1,3 +1,4 @@ +add_definitions(-DTRANSLATION_DOMAIN=\"kompare\") ########### next target ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/main.cpp new/kompare-17.08.2/main.cpp --- old/kompare-17.08.1/main.cpp 2017-07-26 09:33:42.000000000 +0200 +++ new/kompare-17.08.2/main.cpp 2017-10-09 18:45:25.000000000 +0200 @@ -71,7 +71,9 @@ */ int main(int argc, char *argv[]) { + QApplication app(argc, argv); KLocalizedString::setApplicationDomain("kompare"); + KAboutData aboutData( "kompare", i18n("Kompare"), version, i18n(description), KAboutLicense::GPL, i18n("(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) 2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler") ); @@ -83,21 +85,22 @@ aboutData.addCredit( i18n("Malte Starostik"), i18n("A lot of good advice"), "[email protected]" ); aboutData.addCredit( i18n("Bernd Gehrmann"), i18n("Cervisia diff viewer"), "[email protected]" ); - QApplication app(argc, argv); + KAboutData::setApplicationData(aboutData); app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kompare"), app.windowIcon())); + QCommandLineParser parser; - KAboutData::setApplicationData(aboutData); parser.addVersionOption(); parser.addHelpOption(); aboutData.setupCommandLine(&parser); - parser.addOption(QCommandLineOption("c", i18n("This will compare URL1 with URL2"))); parser.addOption(QCommandLineOption("o", i18n( "This will open URL1 and expect it to be diff output. URL1 can also be a '-' and then it will read from standard input. Can be used for instance for cvs diff | kompare -o -. Kompare will do a check to see if it can find the original file(s) and then blend the original file(s) into the diffoutput and show that in the viewer. -n disables the check." ))); parser.addOption(QCommandLineOption("b", i18n( "This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the file or folder that the diffoutput needs to be blended into. " ))); parser.addOption(QCommandLineOption("n", i18n( "Disables the check for automatically finding the original file(s) when using '-' as URL with the -o option." ))); parser.addOption(QCommandLineOption("e <encoding>", i18n( "Use this to specify the encoding when calling it from the command line. It will default to the local encoding if not specified." ))); + parser.process(app); aboutData.processCommandLine(&parser); + bool difault = false; KompareShell* ks; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/po/cs/kompare.po new/kompare-17.08.2/po/cs/kompare.po --- old/kompare-17.08.1/po/cs/kompare.po 2017-09-05 02:35:26.000000000 +0200 +++ new/kompare-17.08.2/po/cs/kompare.po 2017-10-10 02:13:25.000000000 +0200 @@ -1,6 +1,6 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák <[email protected]>, 2011, 2012, 2013, 2014, 2015. +# Vít Pelčák <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2017. # Tomáš Chvátal <[email protected]>, 2013. # msgid "" @@ -8,7 +8,7 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2015-04-17 10:21+0100\n" +"PO-Revision-Date: 2017-09-12 11:44+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: cs\n" @@ -658,7 +658,7 @@ #: kompareui.rc:27 #, kde-format msgid "Main Toolbar" -msgstr "Hlavní nástrojová lišta" +msgstr "Hlavní panel nástrojů" #: kompareurldialog.cpp:46 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/po/gl/kompare.po new/kompare-17.08.2/po/gl/kompare.po --- old/kompare-17.08.1/po/gl/kompare.po 2017-09-05 02:35:26.000000000 +0200 +++ new/kompare-17.08.2/po/gl/kompare.po 2017-10-10 02:13:25.000000000 +0200 @@ -3,14 +3,14 @@ # mvillarino <[email protected]>, 2007, 2008, 2009. # Marce Villarino <[email protected]>, 2009, 2013, 2014. # Adrian Chaves Fernandez <[email protected]>, 2013, 2015, 2016, 2017. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2017-06-11 08:51+0100\n" -"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." -"com>\n" +"PO-Revision-Date: 2017-10-03 20:58+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -239,8 +239,8 @@ #, kde-format msgid "Applied: Insertion of %1 line undone" msgid_plural "Applied: Insertion of %1 lines undone" -msgstr[0] "Aplicado: Anulouse a inserción de %1 liña" -msgstr[1] "Aplicado: Anulouse a inserción de %1 liñas" +msgstr[0] "Aplicado: desfíxose a inserción de %1 liña" +msgstr[1] "Aplicado: desfíxose a inserción de %1 liñas" #: komparenavtreepart/komparenavtreepart.cpp:467 #, kde-format @@ -253,8 +253,8 @@ #, kde-format msgid "Applied: Deletion of %1 line undone" msgid_plural "Applied: Deletion of %1 lines undone" -msgstr[0] "Aplicado: Anulouse o borrado de %1 liña" -msgstr[1] "Aplicado: Anulouse o borrado de %1 liñas" +msgstr[0] "Aplicado: desfíxose o borrado de %1 liña" +msgstr[1] "Aplicado: desfíxose o borrado de %1 liñas" #: komparenavtreepart/komparenavtreepart.cpp:475 #, kde-format @@ -322,7 +322,7 @@ #: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>Non foi posíbel obter o URL <b>%1</b>.</qt>" +msgstr "<qt>Non foi posíbel descargar o URL <b>%1</b>.</qt>" #: komparepart/kompare_part.cpp:355 #, kde-format @@ -611,7 +611,7 @@ #: komparepart/komparesaveoptionsbase.ui:139 #, kde-format msgid "Ignore added or removed empty lines" -msgstr "Ignorar as liñas en branco engadidas ou eliminadas" +msgstr "Ignorar as liñas baleiras engadidas ou eliminadas" #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB) #: komparepart/komparesaveoptionsbase.ui:146 @@ -716,7 +716,7 @@ "this format the best so use it for sending patches." msgstr "" "Escolla o formato do resultado de «diff». «Unificado» é o máis usado por ser " -"bastante lexíbel. Os programadores de KDE gustan deste formato por ser o " +"bastante lexíbel. Os desenvolvedores de KDE gustan deste formato por ser o " "mellor para enviar parches." #: libdialogpages/diffpage.cpp:238 @@ -897,7 +897,7 @@ #: libdialogpages/diffpage.cpp:334 #, kde-format msgid "I&gnore added or removed empty lines" -msgstr "I&gnorar as liñas en branco engadidas ou eliminadas" +msgstr "I&gnorar as liñas baleiras engadidas ou eliminadas" #: libdialogpages/diffpage.cpp:335 #, kde-format @@ -911,7 +911,7 @@ "empty lines have been added or removed to improve legibility." msgstr "" "Isto pode ser de moita utilidade en situacións onde o código fose " -"reorganizado engadindo ou quitando liñas en branco para mellorar a " +"reorganizado engadindo ou quitando liñas baleiras para mellorar a " "lexibilidade." #: libdialogpages/diffpage.cpp:338 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/po/ja/kompare.po new/kompare-17.08.2/po/ja/kompare.po --- old/kompare-17.08.1/po/ja/kompare.po 2017-09-05 02:35:26.000000000 +0200 +++ new/kompare-17.08.2/po/ja/kompare.po 2017-10-10 02:13:25.000000000 +0200 @@ -384,7 +384,7 @@ #: komparepart/kompare_part.cpp:714 #, kde-format msgid "Comparing file %1 with file %2" -msgstr "ファイル <filename>%1</filename> を %2 と比較中" +msgstr "ファイル ‘%1’ を %2 と比較中" #: komparepart/kompare_part.cpp:719 #, kde-format @@ -399,7 +399,7 @@ #: komparepart/kompare_part.cpp:727 #, kde-format msgid "Blending diff output from %1 into file %2" -msgstr "%1 からの diff 出力をファイル <filename>%2</filename> に適用中" +msgstr "%1 からの diff 出力をファイル ‘%2’ に適用中" #: komparepart/kompare_part.cpp:732 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/po/sr/kompare.po new/kompare-17.08.2/po/sr/kompare.po --- old/kompare-17.08.1/po/sr/kompare.po 2017-09-05 02:35:26.000000000 +0200 +++ new/kompare-17.08.2/po/sr/kompare.po 2017-10-10 02:13:25.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2017-04-07 00:52+0200\n" +"PO-Revision-Date: 2017-09-28 18:00+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" "Language: sr\n" @@ -362,12 +362,12 @@ #: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>УРЛ <filename>%1</filename> не може бити преузет.</qt>" +msgstr "<qt>УРЛ <tt>%1</tt> не може бити преузет.</qt>" #: komparepart/kompare_part.cpp:355 #, kde-format msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>УРЛ <filename>%1</filename> не постоји на систему.</qt>" +msgstr "<qt>УРЛ <tt>%1</tt> не постоји на систему.</qt>" #: komparepart/kompare_part.cpp:543 #, kde-format @@ -1253,10 +1253,9 @@ "show that in the viewer. -n disables the check." msgstr "" "Отвара први УРЛ као излаз разлике. УРЛ такође може бити ‘-’, што задаје " -"читање са стандардног улаза (пример: <icode>cvs diff | kompare -o -</" -"icode>). К‑поређење ће проверити да ли може да нађе изворне фајлове и стопи " -"их са излазом разлике, и то отворити у приказивачу. <icode>-n</icode> " -"искључује проверу." +"читање са стандардног улаза (пример: „cvs diff | kompare -o -“). К‑поређење " +"ће проверити да ли може да нађе изворне фајлове и стопи их са излазом " +"разлике, и то отворити у приказивачу. „-n“ искључује проверу." #: main.cpp:96 #, kde-format @@ -1273,8 +1272,8 @@ "Disables the check for automatically finding the original file(s) when using " "'-' as URL with the -o option." msgstr "" -"Искључује аутоматско тражење изворних фајлова када се уз опцију <icode>-o</" -"icode> зада ‘-’ као УРЛ." +"Искључује аутоматско тражење изворних фајлова када се уз опцију „-o“ зада " +"‘-’ као УРЛ." #: main.cpp:98 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-17.08.1/po/zh_CN/kompare.po new/kompare-17.08.2/po/zh_CN/kompare.po --- old/kompare-17.08.1/po/zh_CN/kompare.po 2017-09-05 02:35:26.000000000 +0200 +++ new/kompare-17.08.2/po/zh_CN/kompare.po 2017-10-10 02:13:25.000000000 +0200 @@ -1,9 +1,19 @@ +# translation of kompare.po to 简体中文 +# Copyright (C) 2002,2003, 2004, 2008, 2009 Free Software Foundation, Inc. +# +# Li Zongliang <[email protected]>, 2001,2002. +# Xiong Jiang <[email protected]>, 2002,2003. +# Levin Du <[email protected]>, 2004. +# Ni Hui <[email protected]>, 2008, 2009, 2010, 2012. +# Lie Ex <[email protected]>, 2008, 2009. +# FengChao <[email protected]>, 2011. +# Weng Xuetian <[email protected]>, 2011, 2014. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-19 02:42+0100\n" -"PO-Revision-Date: 2017-08-31 05:21-0400\n" +"PO-Revision-Date: 2017-09-30 17:52-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
