Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2019-04-26 22:49:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Fri Apr 26 22:49:40 2019 rev:74 rq:696296 version:19.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2019-03-11 11:11:29.701411196 +0100 +++ /work/SRC/openSUSE:Factory/.kompare.new.5536/kompare.changes 2019-04-26 22:49:43.053481856 +0200 @@ -1,0 +2,38 @@ +Sat Apr 20 06:51:56 UTC 2019 - [email protected] + +- Update to 19.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.04.0.php +- Changes since 19.03.90: + * No code changes since 19.03.90 + +------------------------------------------------------------------- +Tue Apr 09 20:54:42 UTC 2019 - [email protected] + +- Update to 19.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/announce-applications-19.04-rc.php +- Changes since 19.03.80: + * No code changes since 19.03.80 + +------------------------------------------------------------------- +Wed Mar 27 06:41:05 UTC 2019 - [email protected] + +- Update to 19.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/announce-applications-19.04-beta.php +- Changes since 18.12.3: + * Deploy ui.rc files via qrc files + * Port away from foreach + * Port away from deprecated QLayout::setMargin() + * Bump min deps to Qt 5.9 & KF 5.53 + * Bump min Qt version to 5.6, as implied by KF min version 5.35 + * Use KF5_MIN_VERSION also for ECM, now that it is released together + * Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH + * Add JSON metadata to plugin binaries + * Install kparts plugins consistently to kf5/parts subdir + +------------------------------------------------------------------- Old: ---- kompare-18.12.3.tar.xz New: ---- kompare-19.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.ufh2Gg/_old 2019-04-26 22:49:44.073481334 +0200 +++ /var/tmp/diff_new_pack.ufh2Gg/_new 2019-04-26 22:49:44.077481332 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version: 18.12.3 +Version: 19.04.0 Release: 0 Summary: File Comparator License: GPL-2.0-only AND GFDL-1.2-only @@ -95,8 +95,6 @@ %{_kf5_appstreamdir}/ %{_kf5_bindir}/kompare %{_kf5_iconsdir}/hicolor/*/*/kompare.* -%{_kf5_kxmlguidir}/kompare/ -%{_kf5_kxmlguidir}/komparepart %{_kf5_libdir}/libkomparedialogpages.so.* %{_kf5_libdir}/libkompareinterface.so.* %{_kf5_plugindir}/ ++++++ kompare-18.12.3.tar.xz -> kompare-19.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/CMakeLists.txt new/kompare-19.04.0/CMakeLists.txt --- old/kompare-18.12.3/CMakeLists.txt 2019-03-05 01:17:01.000000000 +0100 +++ new/kompare-19.04.0/CMakeLists.txt 2019-04-12 02:11:38.000000000 +0200 @@ -2,9 +2,11 @@ project(kompare) -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}) +set(QT_MIN_VERSION "5.9.0") +set(KF5_MIN_VERSION "5.53.0") + +find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(FeatureSummary) include(KDEInstallDirs) @@ -15,14 +17,12 @@ include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) -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 @@ -46,7 +46,7 @@ add_definitions( -DQT_DEPRECATED_WARNINGS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050500 + -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER @@ -75,6 +75,10 @@ CATEGORY_NAME "kompareshell" ) +qt5_add_resources(kompare_SRCS + kompare_shell.qrc +) + ecm_add_app_icon(kompare_SRCS ICONS pics/16-apps-kompare.png pics/22-apps-kompare.png @@ -98,7 +102,6 @@ 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}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/kompare_shell.qrc new/kompare-19.04.0/kompare_shell.qrc --- old/kompare-18.12.3/kompare_shell.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kompare-19.04.0/kompare_shell.qrc 2019-03-11 02:30:41.000000000 +0100 @@ -0,0 +1,6 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource prefix="/kxmlgui5/kompare"> + <file>kompareui.rc</file> + </qresource> +</RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparenavtreepart/CMakeLists.txt new/kompare-19.04.0/komparenavtreepart/CMakeLists.txt --- old/kompare-18.12.3/komparenavtreepart/CMakeLists.txt 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparenavtreepart/CMakeLists.txt 2019-03-11 02:30:41.000000000 +0100 @@ -9,6 +9,7 @@ ) add_library(komparenavtreepart MODULE ${komparenavtreepart_PART_SRCS}) +kcoreaddons_desktop_to_json(komparenavtreepart komparenavtreepart.desktop) target_link_libraries(komparenavtreepart Qt5::Widgets @@ -17,6 +18,6 @@ KompareDiff2 ) -install(TARGETS komparenavtreepart DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS komparenavtreepart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts) install(FILES komparenavtreepart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparenavtreepart/komparenavtreepart.cpp new/kompare-19.04.0/komparenavtreepart/komparenavtreepart.cpp --- old/kompare-18.12.3/komparenavtreepart/komparenavtreepart.cpp 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparenavtreepart/komparenavtreepart.cpp 2019-03-11 02:30:41.000000000 +0100 @@ -523,8 +523,8 @@ bool KFileLVI::hasExtension(const QString& extensions, const QString& fileName) { - QStringList extList = extensions.split(QLatin1Char(' ')); - foreach (const QString& ext, extList) { + const QStringList extList = extensions.split(QLatin1Char(' ')); + for (const QString& ext : extList) { if (fileName.endsWith(ext, Qt::CaseInsensitive)) { return true; } @@ -772,8 +772,7 @@ return about; } -K_PLUGIN_FACTORY(KompareNavTreePartFactory, - registerPlugin<KompareNavTreePart>(); - ) +K_PLUGIN_FACTORY_WITH_JSON(KompareNavTreePartFactory, "komparenavtreepart.json", + registerPlugin<KompareNavTreePart>();) #include "komparenavtreepart.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparenavtreepart/komparenavtreepart.desktop new/kompare-19.04.0/komparenavtreepart/komparenavtreepart.desktop --- old/kompare-18.12.3/komparenavtreepart/komparenavtreepart.desktop 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparenavtreepart/komparenavtreepart.desktop 2019-03-11 02:30:41.000000000 +0100 @@ -61,6 +61,6 @@ Name[zh_TW]=KompareNavTreePart MimeType=text/x-patch; ServiceTypes=Kompare/NavigationPart -X-KDE-Library=komparenavtreepart +X-KDE-Library=kf5/parts/komparenavtreepart Type=Service Icon=kompare diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/CMakeLists.txt new/kompare-19.04.0/komparepart/CMakeLists.txt --- old/kompare-18.12.3/komparepart/CMakeLists.txt 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/CMakeLists.txt 2019-03-11 02:30:41.000000000 +0100 @@ -19,6 +19,10 @@ ki18n_wrap_ui(komparepart_PART_SRCS komparesaveoptionsbase.ui ) +qt5_add_resources(komparepart_PART_SRCS + kompare_part.qrc +) + add_library(komparepart MODULE ${komparepart_PART_SRCS}) target_link_libraries(komparepart @@ -31,7 +35,7 @@ Qt5::PrintSupport ) -install(TARGETS komparepart DESTINATION ${KDE_INSTALL_PLUGINDIR}) +install(TARGETS komparepart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts) +kcoreaddons_desktop_to_json(komparepart komparepart.desktop) install(FILES komparepart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) -install(FILES komparepartui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/komparepart) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/kompare_part.cpp new/kompare-19.04.0/komparepart/kompare_part.cpp --- old/kompare-18.12.3/komparepart/kompare_part.cpp 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/kompare_part.cpp 2019-03-11 02:30:41.000000000 +0100 @@ -92,8 +92,8 @@ // This creates the "Model creator" and connects the signals and slots m_modelList = new Diff2::KompareModelList(m_diffSettings, m_splitter, this, "komparemodellist" , (modus == ReadWriteModus)); - Q_FOREACH (QAction* action, m_modelList->actionCollection()->actions()) - { + const auto modelListActions = m_modelList->actionCollection()->actions(); + for (QAction* action : modelListActions) { actionCollection()->addAction(action->objectName(), action); } connect(m_modelList, &KompareModelList::status, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/kompare_part.qrc new/kompare-19.04.0/komparepart/kompare_part.qrc --- old/kompare-18.12.3/komparepart/kompare_part.qrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kompare-19.04.0/komparepart/kompare_part.qrc 2019-03-11 02:30:41.000000000 +0100 @@ -0,0 +1,6 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource prefix="/kxmlgui5/komparepart"> + <file>komparepartui.rc</file> + </qresource> +</RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/kompare_partfactory.h new/kompare-19.04.0/komparepart/kompare_partfactory.h --- old/kompare-18.12.3/komparepart/kompare_partfactory.h 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/kompare_partfactory.h 2019-03-11 02:30:41.000000000 +0100 @@ -24,7 +24,7 @@ class KomparePartFactory : public KPluginFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory") + Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "komparepart.json") Q_INTERFACES(KPluginFactory) public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/kompareconnectwidget.cpp new/kompare-19.04.0/komparepart/kompareconnectwidget.cpp --- old/kompare-18.12.3/komparepart/kompareconnectwidget.cpp 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/kompareconnectwidget.cpp 2019-03-11 02:30:41.000000000 +0100 @@ -54,7 +54,7 @@ bottomLine->setSizePolicy(QSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed)); bottomLine->setFixedHeight(1); m_layout.setSpacing(0); - m_layout.setMargin(0); + m_layout.setContentsMargins(0, 0, 0, 0); m_layout.addWidget(&m_label); m_layout.addWidget(bottomLine); m_layout.addWidget(&m_wid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/komparelistview.cpp new/kompare-19.04.0/komparepart/komparelistview.cpp --- old/kompare-18.12.3/komparepart/komparelistview.cpp 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/komparelistview.cpp 2019-03-11 02:30:41.000000000 +0100 @@ -67,7 +67,7 @@ bottomLine->setFixedHeight(1); m_label.setMargin(3); m_layout.setSpacing(0); - m_layout.setMargin(0); + m_layout.setContentsMargins(0, 0, 0, 0); m_layout.addWidget(&m_label); m_layout.addWidget(bottomLine); m_layout.addWidget(&m_view); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/komparepart/komparepart.desktop new/kompare-19.04.0/komparepart/komparepart.desktop --- old/kompare-18.12.3/komparepart/komparepart.desktop 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/komparepart/komparepart.desktop 2019-03-11 02:30:41.000000000 +0100 @@ -65,7 +65,7 @@ Name[zh_TW]=KomparePart MimeType=text/x-patch; ServiceTypes=Kompare/ViewPart,KParts/ReadWritePart,KParts/ReadOnlyPart -X-KDE-Library=komparepart +X-KDE-Library=kf5/parts/komparepart Type=Service Icon=kompare InitialPreference=10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/org.kde.kompare.appdata.xml new/kompare-19.04.0/org.kde.kompare.appdata.xml --- old/kompare-18.12.3/org.kde.kompare.appdata.xml 2019-02-05 01:54:23.000000000 +0100 +++ new/kompare-19.04.0/org.kde.kompare.appdata.xml 2019-03-11 02:30:41.000000000 +0100 @@ -8,6 +8,7 @@ <name xml:lang="ca-valencia">Kompare</name> <name xml:lang="cs">Kompare</name> <name xml:lang="de">Kompare</name> + <name xml:lang="el">Kompare</name> <name xml:lang="en-GB">Kompare</name> <name xml:lang="es">Kompare</name> <name xml:lang="fr">Kompare</name> @@ -38,6 +39,7 @@ <summary xml:lang="ca-valencia">Frontal del Diff/Patch</summary> <summary xml:lang="cs">Rozhraní pro Diff/Patch</summary> <summary xml:lang="de">Oberfläche für Diff und Patch</summary> + <summary xml:lang="el">Πρόγραμμα Diff/Patch</summary> <summary xml:lang="en-GB">Diff/Patch Frontend</summary> <summary xml:lang="es">Interfaz para diff/patch</summary> <summary xml:lang="fr">Interface graphique pour « Diff » et « Patch »</summary> @@ -49,7 +51,7 @@ <summary xml:lang="nn">Diff-/Patch-grensesnitt</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 do diff/patch</summary> + <summary xml:lang="pt-BR">Interface do 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> @@ -98,6 +100,7 @@ <p xml:lang="ca-valencia">Característiques:</p> <p xml:lang="cs">Vlastnosti:</p> <p xml:lang="de">Funktionen:</p> + <p xml:lang="el">Χαρακτηριστικά:</p> <p xml:lang="en-GB">Features:</p> <p xml:lang="es">Funciones:</p> <p xml:lang="fr">Fonctionnalités :</p> @@ -128,6 +131,7 @@ <li xml:lang="ca">Compara diferències en fitxers o en el contingut de carpetes recursivament.</li> <li xml:lang="ca-valencia">Compara diferències en fitxers o en el contingut de carpetes recursivament.</li> <li xml:lang="de">Vergleich des Unterschieds von Dateien oder rekursiven Ordnerinhalten.</li> + <li xml:lang="el">Συγκρίνοντας τις διαφορές στα αρχεία ή τα περιεχόμενα των φακέλων αναδρομικά.</li> <li xml:lang="en-GB">Comparing differences on files or the contents of folders recursively.</li> <li xml:lang="es">Comparación de diferencias entre archivos o del contenido de carpetas (recursivamente).</li> <li xml:lang="fr">Comparer les différences entre fichiers ou récursivement entre contenus de dossiers</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ar/kompare.po new/kompare-19.04.0/po/ar/kompare.po --- old/kompare-18.12.3/po/ar/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ar/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-10-15 16:25+0000\n" "Last-Translator: safaalfulaij <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/bg/kompare.po new/kompare-19.04.0/po/bg/kompare.po --- old/kompare-18.12.3/po/bg/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/bg/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2009-09-17 22:29+0300\n" "Last-Translator: Yasen Pramatarov <[email protected]>\n" "Language-Team: Bulgarian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/bs/kompare.po new/kompare-19.04.0/po/bs/kompare.po --- old/kompare-18.12.3/po/bs/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/bs/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdesdk\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2014-12-29 15:40+0000\n" "Last-Translator: Nejra Pašić <[email protected]>\n" "Language-Team: Bosnian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ca/kompare.po new/kompare-19.04.0/po/ca/kompare.po --- old/kompare-18.12.3/po/ca/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ca/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-11 17:54+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ca@valencia/kompare.po new/kompare-19.04.0/po/ca@valencia/kompare.po --- old/kompare-18.12.3/po/ca@valencia/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ca@valencia/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-11 17:54+0100\n" "Last-Translator: Josep Ma. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -1250,3 +1250,86 @@ msgstr "" "Useu per especificar la codificació en cridar des de la línia d'ordres. Per " "defecte s'usarà la codificació local." + +#~ msgid "Overwrite" +#~ msgstr "Sobreescriure" + +#~ msgid "Compare these files or folder" +#~ msgstr "Compara aquests fitxers o carpetes" + +#~ msgid "&Apply Difference" +#~ msgstr "&Aplica la diferència" + +#~ msgid "Un&apply Difference" +#~ msgstr "De&sfés diferència" + +#~ msgid "App&ly All" +#~ msgstr "Ap&lica-ho tot" + +#~ msgid "&Unapply All" +#~ msgstr "D&esaplica-ho tot" + +#~ msgid "P&revious File" +#~ msgstr "Fitxer p&revi" + +#~ msgid "&Previous Difference" +#~ msgstr "Di&ferència anterior" + +#~ msgid "&Next Difference" +#~ msgstr "Diferència següe&nt" + +#~ msgid "" +#~ "<qt>No models or no differences, this file: <b>%1</b>, is not a valid " +#~ "diff file.</qt>" +#~ msgstr "" +#~ "<qt>Sense models o diferencies, el fitxer <b>%1</b> no és un fitxer diff " +#~ "vàlid.</qt>" + +#~ msgid "" +#~ "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>." +#~ "</qt>" +#~ msgstr "" +#~ "<qt>S'han produït problemes durant l'aplicació del diff <b>%1</b> al " +#~ "fitxer <b>%2</b>.</qt>" + +#~ msgid "" +#~ "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</" +#~ "b>.</qt>" +#~ msgstr "" +#~ "<qt>S'han produït problemes durant l'aplicació del diff <b>%1</b> a la " +#~ "carpeta <b>%2</b>.</qt>" + +#~ msgid "Could not open a temporary file." +#~ msgstr "No s'ha pogut obrir un fitxer temporal." + +#~ msgid "" +#~ "<qt>Could not create destination directory <b>%1</b>.\n" +#~ "The file has not been saved.</qt>" +#~ msgstr "" +#~ "<qt>No s'ha pogut crear el directori de destinació <b>%1</b>.\n" +#~ "El fitxer no ha estat desat.</qt>" + +#~ msgid "" +#~ "<qt>Could not upload the temporary file to the destination location <b>" +#~ "%1</b>. The temporary file is still available under: <b>%2</b>. You can " +#~ "manually copy it to the right place.</qt>" +#~ msgstr "" +#~ "<qt>No s'ha pogut pujar el fitxer temporal a la localització de " +#~ "destinació <b>%1</b>. El fitxer temporal encara és disponible sota: <b>" +#~ "%2</b>. Podeu copiar-lo manualment a la ubicació correcta.</qt>" + +#~ msgid "Could not parse diff output." +#~ msgstr "No s'ha pogut analitzar la sortida de diff." + +#~ msgid "The files are identical." +#~ msgstr "Els fitxers són idèntics." + +#~ msgid "Could not write to the temporary file." +#~ msgstr "No s'ha pogut escriure al fitxer temporal." + +#~ msgid "" +#~ "The diff is malformed. Some lines could not be parsed and will not be " +#~ "displayed in the diff view." +#~ msgstr "" +#~ "El diff està mal format. Algunes línies no es poden analitzar i no es " +#~ "mostraran a la vista de diferències." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/cs/kompare.po new/kompare-19.04.0/po/cs/kompare.po --- old/kompare-18.12.3/po/cs/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/cs/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-11-13 15:31+0100\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/da/kompare.po new/kompare-19.04.0/po/da/kompare.po --- old/kompare-18.12.3/po/da/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/da/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-01-10 19:38+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/de/kompare.po new/kompare-19.04.0/po/de/kompare.po --- old/kompare-18.12.3/po/de/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/de/kompare.po 2019-04-12 02:11:37.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-15 21:51+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/el/kompare.po new/kompare-19.04.0/po/el/kompare.po --- old/kompare-18.12.3/po/el/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/el/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-10-18 16:08+0200\n" "Last-Translator: Long Run <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/en_GB/kompare.po new/kompare-19.04.0/po/en_GB/kompare.po --- old/kompare-18.12.3/po/en_GB/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/en_GB/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-11-26 14:19+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/eo/kompare.po new/kompare-19.04.0/po/eo/kompare.po --- old/kompare-18.12.3/po/eo/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/eo/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau <[email protected]>\n" "Language-Team: esperanto <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/es/kompare.po new/kompare-19.04.0/po/es/kompare.po --- old/kompare-18.12.3/po/es/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/es/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-12 11:28+0100\n" "Last-Translator: Eloy Cuadra <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/et/kompare.po new/kompare-19.04.0/po/et/kompare.po --- old/kompare-18.12.3/po/et/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/et/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2016-07-27 23:55+0300\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/eu/kompare.po new/kompare-19.04.0/po/eu/kompare.po --- old/kompare-18.12.3/po/eu/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/eu/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2011-10-14 23:11+0200\n" "Last-Translator: Iñigo Salvador Azurmendi <[email protected]>\n" "Language-Team: Basque <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/fa/kompare.po new/kompare-19.04.0/po/fa/kompare.po --- old/kompare-18.12.3/po/fa/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/fa/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2007-06-30 17:00+0330\n" "Last-Translator: Nazanin Kazemi <[email protected]>\n" "Language-Team: Persian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/fi/kompare.po new/kompare-19.04.0/po/fi/kompare.po --- old/kompare-18.12.3/po/fi/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/fi/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-08-04 21:01+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/fr/kompare.po new/kompare-19.04.0/po/fr/kompare.po --- old/kompare-18.12.3/po/fr/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/fr/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-12-13 11:39+0800\n" "Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ga/kompare.po new/kompare-19.04.0/po/ga/kompare.po --- old/kompare-18.12.3/po/ga/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ga/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdesdk/kompare.po\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Scannell <[email protected]>\n" "Language-Team: Irish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/gl/kompare.po new/kompare-19.04.0/po/gl/kompare.po --- old/kompare-18.12.3/po/gl/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/gl/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2019-01-01 15:30+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/hi/kompare.po new/kompare-19.04.0/po/hi/kompare.po --- old/kompare-18.12.3/po/hi/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/hi/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2008-02-23 17:35+0530\n" "Last-Translator: Ravishankar Shrivastava <[email protected]>\n" "Language-Team: Hindi <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/hr/kompare.po new/kompare-19.04.0/po/hr/kompare.po --- old/kompare-18.12.3/po/hr/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/hr/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kompare 0\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2004-04-20 13:26+CEST\n" "Last-Translator: auto\n" "Language-Team: Croatian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/hu/kompare.po new/kompare-19.04.0/po/hu/kompare.po --- old/kompare-18.12.3/po/hu/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/hu/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: KDE 4.2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-04-09 23:49+0200\n" "Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/is/kompare.po new/kompare-19.04.0/po/is/kompare.po --- old/kompare-18.12.3/po/is/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/is/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2015-04-17 11:51+0000\n" "Last-Translator: Sveinn í Felli <[email protected]>\n" "Language-Team: Icelandic <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/it/kompare.po new/kompare-19.04.0/po/it/kompare.po --- old/kompare-18.12.3/po/it/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/it/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-16 16:14+0100\n" "Last-Translator: Paolo Zamponi <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ja/kompare.po new/kompare-19.04.0/po/ja/kompare.po --- old/kompare-18.12.3/po/ja/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ja/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2009-07-20 23:29+0900\n" "Last-Translator: Yukiko Bando <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/kk/kompare.po new/kompare-19.04.0/po/kk/kompare.po --- old/kompare-18.12.3/po/kk/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/kk/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-06-27 04:14+0600\n" "Last-Translator: Sairan Kikkarin <[email protected]>\n" "Language-Team: Kazakh <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/km/kompare.po new/kompare-19.04.0/po/km/kompare.po --- old/kompare-18.12.3/po/km/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/km/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2008-12-19 10:22+0700\n" "Last-Translator: Khoem Sokhem <[email protected]>\n" "Language-Team: Khmer <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ko/kompare.po new/kompare-19.04.0/po/ko/kompare.po --- old/kompare-18.12.3/po/ko/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ko/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-12-03 23:40+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/lt/kompare.po new/kompare-19.04.0/po/lt/kompare.po --- old/kompare-18.12.3/po/lt/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/lt/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-06-28 10:15+0200\n" "Last-Translator: Mindaugas Baranauskas <[email protected]>\n" "Language-Team: Lithuanian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/lv/kompare.po new/kompare-19.04.0/po/lv/kompare.po --- old/kompare-18.12.3/po/lv/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/lv/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2009-06-04 12:04+0300\n" "Last-Translator: Viesturs Zariņš <[email protected]>\n" "Language-Team: Latvian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/mr/kompare.po new/kompare-19.04.0/po/mr/kompare.po --- old/kompare-18.12.3/po/mr/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/mr/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-03-28 14:37+0530\n" "Last-Translator: Chetan Khona <[email protected]>\n" "Language-Team: Marathi <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/nb/kompare.po new/kompare-19.04.0/po/nb/kompare.po --- old/kompare-18.12.3/po/nb/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/nb/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-04-08 21:44+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/nds/kompare.po new/kompare-19.04.0/po/nds/kompare.po --- old/kompare-18.12.3/po/nds/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/nds/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2011-09-05 22:49+0200\n" "Last-Translator: Manfred Wiese <[email protected]>\n" "Language-Team: Low Saxon <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/nl/kompare.po new/kompare-19.04.0/po/nl/kompare.po --- old/kompare-18.12.3/po/nl/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/nl/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-11 11:27+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/nn/kompare.po new/kompare-19.04.0/po/nn/kompare.po --- old/kompare-18.12.3/po/nn/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/nn/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-07-17 14:14+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/pa/kompare.po new/kompare-19.04.0/po/pa/kompare.po --- old/kompare-18.12.3/po/pa/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/pa/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2012-07-05 07:33+0530\n" "Last-Translator: A S Alam <[email protected]>\n" "Language-Team: Punjabi/Panjabi <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/pl/kompare.po new/kompare-19.04.0/po/pl/kompare.po --- old/kompare-18.12.3/po/pl/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/pl/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -1,6 +1,6 @@ # translation of kompare.po to Polish # translation of kompare.po to -# Version: $Revision: 1528210 $ +# Version: $Revision: 1522687 $ # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. # # Marta Rybczynska <[email protected]>, 2002, 2004, 2005. @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-12-09 07:04+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/pt/kompare.po new/kompare-19.04.0/po/pt/kompare.po --- old/kompare-18.12.3/po/pt/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/pt/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-11 10:59+0100\n" "Last-Translator: José Nuno Pires <[email protected]>\n" "Language-Team: pt <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/pt_BR/kompare.po new/kompare-19.04.0/po/pt_BR/kompare.po --- old/kompare-18.12.3/po/pt_BR/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/pt_BR/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2019-02-07 17:53-0200\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ro/kompare.po new/kompare-19.04.0/po/ro/kompare.po --- old/kompare-18.12.3/po/ro/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ro/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2012-12-22 11:55+0200\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ru/kompare.po new/kompare-19.04.0/po/ru/kompare.po --- old/kompare-18.12.3/po/ru/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ru/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2015-04-09 04:38+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/sk/kompare.po new/kompare-19.04.0/po/sk/kompare.po --- old/kompare-18.12.3/po/sk/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/sk/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-01-03 15:44+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/sl/kompare.po new/kompare-19.04.0/po/sl/kompare.po --- old/kompare-18.12.3/po/sl/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/sl/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -2,7 +2,7 @@ # translation of kompare.po to # Translation of kompare.po to Slovenian # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# $Id: kompare.po 1528210 2018-11-12 06:44:57Z scripty $ +# $Id: kompare.po 1522687 2018-08-16 08:38:04Z scripty $ # $Source$ # # Gregor Rakar <[email protected]>, 2003, 2004, 2005. @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-01-14 10:54+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/sr/kompare.po new/kompare-19.04.0/po/sr/kompare.po --- old/kompare-18.12.3/po/sr/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/sr/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-14 23:06+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/sv/kompare.po new/kompare-19.04.0/po/sv/kompare.po --- old/kompare-18.12.3/po/sv/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/sv/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-10-11 17:43+0100\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/tr/kompare.po new/kompare-19.04.0/po/tr/kompare.po --- old/kompare-18.12.3/po/tr/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/tr/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kdesdk-kde4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2017-06-04 11:31+0000\n" "Last-Translator: Mete <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/ug/kompare.po new/kompare-19.04.0/po/ug/kompare.po --- old/kompare-18.12.3/po/ug/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/ug/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <[email protected]>\n" "Language-Team: Uyghur Computer Science Association <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/uk/kompare.po new/kompare-19.04.0/po/uk/kompare.po --- old/kompare-18.12.3/po/uk/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/uk/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" "PO-Revision-Date: 2018-08-07 12:41+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/zh_CN/kompare.po new/kompare-19.04.0/po/zh_CN/kompare.po --- old/kompare-18.12.3/po/zh_CN/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/zh_CN/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" -"PO-Revision-Date: 2019-02-20 23:33\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" +"PO-Revision-Date: 2019-04-09 18:57\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-18.12.3/po/zh_TW/kompare.po new/kompare-19.04.0/po/zh_TW/kompare.po --- old/kompare-18.12.3/po/zh_TW/kompare.po 2019-03-05 01:17:00.000000000 +0100 +++ new/kompare-19.04.0/po/zh_TW/kompare.po 2019-04-12 02:11:38.000000000 +0200 @@ -5,13 +5,13 @@ # Frank Weng (a.k.a. Franklin) <[email protected]>, 2009. # Franklin Weng <[email protected]>, 2011, 2012, 2013, 2015. # Jeff Huang <[email protected]>, 2016. -# pan93412 <[email protected]>, 2018. +# pan93412 <[email protected]>, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-11-12 06:55+0100\n" -"PO-Revision-Date: 2018-03-24 22:13+0800\n" +"POT-Creation-Date: 2018-08-16 09:10+0200\n" +"PO-Revision-Date: 2019-01-19 19:40+0800\n" "Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "dot tw>\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #, kde-format @@ -818,7 +818,7 @@ #: libdialogpages/diffpage.cpp:290 #, kde-format msgid "Ignore regexp:" -msgstr "忽略正規表示式：" +msgstr "忽略正則表達式：" #: libdialogpages/diffpage.cpp:291 #, kde-format @@ -830,14 +830,14 @@ msgid "" "When this checkbox is enabled, an option to diff is given that will make " "diff ignore lines that match the regular expression." -msgstr "勾選此選項的話，在做 diff 時會忽略符合此正規表示式的行。" +msgstr "勾選此選項的話，在做 diff 時會忽略符合此正則表達式的行。" #: libdialogpages/diffpage.cpp:296 #, kde-format msgid "" "Add the regular expression here that you want to use\n" "to ignore lines that match it." -msgstr "在此新增正規表示式，若符合此式則忽略之。" +msgstr "在此新增正則表達式，若符合此式則忽略之。" #: libdialogpages/diffpage.cpp:302 #, kde-format @@ -849,7 +849,7 @@ msgid "" "Clicking this will open a regular expression dialog where\n" "you can graphically create regular expressions." -msgstr "點選以開啟正規表示式編輯視窗。" +msgstr "點選以開啟正則表達式編輯視窗。" #: libdialogpages/diffpage.cpp:312 #, kde-format
