Hello community,
here is the log from the commit of package libkomparediff2 for openSUSE:Factory checked in at 2018-12-19 13:37:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libkomparediff2 (Old)
and /work/SRC/openSUSE:Factory/.libkomparediff2.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkomparediff2"
Wed Dec 19 13:37:14 2018 rev:64 rq:658485 version:18.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libkomparediff2/libkomparediff2.changes 2018-11-12 09:32:01.901951659 +0100
+++ /work/SRC/openSUSE:Factory/.libkomparediff2.new.28833/libkomparediff2.changes 2018-12-19 13:37:17.964306679 +0100
@@ -1,0 +2,37 @@
+Fri Dec 14 06:09:19 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.12.0
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.12.0.php
+- Changes since 18.11.90:
+ * No code changes since 18.11.90
+
+-------------------------------------------------------------------
+Mon Dec 03 20:56:15 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.11.90
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.12-rc.php
+- Changes since 18.11.80:
+ * Honor BUILD_TESTING
+ * Port ECMPackageConfigHelpers -> CMakePackageConfigHelpers
+ * Require cmake 3.0, as expected by recent ECM
+
+-------------------------------------------------------------------
+Tue Nov 20 06:22:58 UTC 2018 - Luca Beltrame
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Tue Nov 20 05:57:27 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.11.80
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.12-beta.php
+- Changes since 18.08.3:
+ * Fix minor typos
+
+-------------------------------------------------------------------
@@ -47 +84 @@
- * https://www.kde.org/announcements/announce-applications-18.07.80.php
+ * https://www.kde.org/announcements/announce-applications-18.08-beta.php
@@ -97 +134 @@
- * https://www.kde.org/announcements/announce-applications-18.03.90.php
+ * https://www.kde.org/announcements/announce-applications-18.04-rc.php
@@ -223 +260 @@
- * https://www.kde.org/announcements/announce-applications-17.07.90.php
+ * https://www.kde.org/announcements/announce-applications-17.08-rc.php
@@ -290 +327 @@
- * https://www.kde.org/announcements/announce-applications-17.03.80.php
+ * https://www.kde.org/announcements/announce-applications-17.04-beta.php
@@ -382 +419 @@
- * https://www.kde.org/announcements/announce-applications-16.07.90.php
+ * https://www.kde.org/announcements/announce-applications-16.08-rc.php
@@ -498 +535 @@
- * https://www.kde.org/announcements/announce-applications-15.07.90.php
+ * https://www.kde.org/announcements/announce-applications-15.08-rc.php
Old:
----
libkomparediff2-18.08.3.tar.xz
New:
----
libkomparediff2-18.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libkomparediff2.spec ++++++
--- /var/tmp/diff_new_pack.Q2COME/_old 2018-12-19 13:37:18.476305950 +0100
+++ /var/tmp/diff_new_pack.Q2COME/_new 2018-12-19 13:37:18.480305945 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libkomparediff2
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,22 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%bcond_without lang
-
%define soname 5
-Name: libkomparediff2
-Version: 18.08.3
-Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%bcond_without lang
+Name: libkomparediff2
+Version: 18.12.0
+Release: 0
Summary: A library to compare files and strings
-License: (GPL-2.0+ and LGPL-2.0+) and BSD-2-Clause
+License: (GPL-2.0-or-later AND LGPL-2.0-or-later) AND BSD-2-Clause
Group: Development/Libraries/KDE
-Url: http://www.kde.org
+URL: http://www.kde.org
Source0: %{name}-%{version}.tar.xz
BuildRequires: extra-cmake-modules
BuildRequires: kcodecs-devel
@@ -45,7 +44,6 @@
BuildRequires: pkgconfig(Qt5Widgets) > 5.2.0
Obsoletes: %{name}-kf5 < %{version}
Provides: %{name}-kf5 = %{version}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A library to compare files and strings, used in Kompare and KDevelop.
@@ -63,10 +61,10 @@
%package %{soname}
Summary: A library to compare files and strings
Group: System/Libraries
+Provides: %{name} = %{version}
%if %{with lang}
Recommends: %{name}-lang
%endif
-Provides: %{name} = %{version}
%description %{soname}
A library to compare files and strings, used in Kompare and KDevelop.
@@ -92,20 +90,18 @@
%postun %{soname} -p /sbin/ldconfig
%files %{soname}
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
%{_kf5_libdir}/libkomparediff2.so.*
%files devel
-%defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
%{_kf5_cmakedir}/LibKompareDiff2/
%{_kf5_libdir}/libkomparediff2.so
%{_kf5_prefix}/include/libkomparediff2/
%if %{with lang}
%files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
%endif
%changelog
++++++ libkomparediff2-18.08.3.tar.xz -> libkomparediff2-18.12.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/CMakeLists.txt new/libkomparediff2-18.12.0/CMakeLists.txt
--- old/libkomparediff2-18.08.3/CMakeLists.txt 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/CMakeLists.txt 2018-12-07 01:36:53.000000000 +0100
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
project(LibKompareDiff2)
@@ -9,9 +9,9 @@
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMSetupVersion)
-include(ECMPackageConfigHelpers)
include(ECMQtDeclareLoggingCategory)
+include(CMakePackageConfigHelpers)
include(FeatureSummary)
include(GenerateExportHeader)
@@ -20,7 +20,9 @@
set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED)
find_package(Qt5Widgets ${QT_MIN_VERSION} NO_MODULE)
set_package_properties(Qt5Widgets PROPERTIES TYPE REQUIRED)
-find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
+if(BUILD_TESTING)
+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+endif()
set(KF5_DEP_VERSION "5.28.0")
find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS
@@ -95,7 +97,9 @@
install(TARGETS komparediff2 EXPORT LibKompareDiff2Targets ${INSTALL_TARGETS_DEFAULT_ARGS})
-add_subdirectory(tests)
+if (BUILD_TESTING)
+ add_subdirectory(tests)
+endif()
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/diff2_export.h
@@ -114,7 +118,7 @@
# Config.cmake file.
set(_LibKompareDiff2_CONFIG_DEST "${LIB_INSTALL_DIR}/cmake/LibKompareDiff2")
-ecm_configure_package_config_file(
+configure_package_config_file(
"${CMAKE_SOURCE_DIR}/LibKompareDiff2Config.cmake.in"
"${CMAKE_BINARY_DIR}/LibKompareDiff2Config.cmake"
INSTALL_DESTINATION "${_LibKompareDiff2_CONFIG_DEST}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/LibKompareDiff2Config.cmake.in new/libkomparediff2-18.12.0/LibKompareDiff2Config.cmake.in
--- old/libkomparediff2-18.08.3/LibKompareDiff2Config.cmake.in 2018-01-05 13:55:39.000000000 +0100
+++ new/libkomparediff2-18.12.0/LibKompareDiff2Config.cmake.in 2018-11-17 20:14:24.000000000 +0100
@@ -1,5 +1,6 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
find_dependency(Qt5Core "@QT_MIN_VERSION@")
find_dependency(Qt5Widgets "@QT_MIN_VERSION@")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/kompareprocess.cpp new/libkomparediff2-18.12.0/kompareprocess.cpp
--- old/libkomparediff2-18.08.3/kompareprocess.cpp 2018-01-05 13:55:39.000000000 +0100
+++ new/libkomparediff2-18.12.0/kompareprocess.cpp 2018-11-17 20:14:24.000000000 +0100
@@ -63,7 +63,7 @@
m_customString(nullptr),
m_textDecoder(nullptr)
{
- // connect the signal that indicates that the proces has exited
+ // connect the signal that indicates that the process has exited
typedef void(QProcess::*void_QProcess_argIntExitStatus)(int, QProcess::ExitStatus);
connect(this, static_cast(&QProcess::finished),
this, &KompareProcess::slotFinished);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/parserbase.cpp new/libkomparediff2-18.12.0/parserbase.cpp
--- old/libkomparediff2-18.08.3/parserbase.cpp 2018-01-05 13:55:39.000000000 +0100
+++ new/libkomparediff2-18.12.0/parserbase.cpp 2018-11-17 20:14:24.000000000 +0100
@@ -583,7 +583,7 @@
// Fetching the stuff we need from the hunkheader regexp that was parsed in parseUnifiedHunkHeader();
linenoA = m_unifiedHunkHeader.cap(1).toInt();
- int lineCountA = 1, lineCountB = 1; // an ommitted line count in the header implies a line count of 1
+ int lineCountA = 1, lineCountB = 1; // an omitted line count in the header implies a line count of 1
if (!m_unifiedHunkHeader.cap(3).isEmpty())
{
lineCountA = m_unifiedHunkHeader.cap(3).toInt(&wasNum);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ar/libkomparediff2.po new/libkomparediff2-18.12.0/po/ar/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ar/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ar/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2012-02-09 17:29+0200\n"
"Last-Translator: Abdalrahim Fakhouri \n"
"Language-Team: Arabic \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ast/libkomparediff2.po new/libkomparediff2-18.12.0/po/ast/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ast/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ast/libkomparediff2.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,126 +0,0 @@
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-#
-# enolp , 2016.
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
-"PO-Revision-Date: 2016-12-19 02:45+0100\n"
-"Last-Translator: enolp \n"
-"Language-Team: Asturian \n"
-"Language: ast\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
-
-#: komparemodellist.cpp:68
-#, kde-format
-msgid "&Apply Difference"
-msgstr ""
-
-#: komparemodellist.cpp:72
-#, kde-format
-msgid "Un&apply Difference"
-msgstr ""
-
-#: komparemodellist.cpp:76
-#, kde-format
-msgid "App&ly All"
-msgstr ""
-
-#: komparemodellist.cpp:80
-#, kde-format
-msgid "&Unapply All"
-msgstr ""
-
-#: komparemodellist.cpp:90
-#, kde-format
-msgid "P&revious File"
-msgstr ""
-
-#: komparemodellist.cpp:94
-#, kde-format
-msgid "N&ext File"
-msgstr "Ficheru &siguiente"
-
-#: komparemodellist.cpp:98
-#, kde-format
-msgid "&Previous Difference"
-msgstr ""
-
-#: komparemodellist.cpp:102
-#, kde-format
-msgid "&Next Difference"
-msgstr ""
-
-#: 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:275
-#, kde-format
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>."
-"qt>"
-msgstr ""
-
-#: 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:334 komparemodellist.cpp:684
-#, kde-format
-msgid "Could not open a temporary file."
-msgstr ""
-
-#: 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:420
-#, kde-format
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-
-#: komparemodellist.cpp:439
-#, kde-format
-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 ""
-
-#: komparemodellist.cpp:518 komparemodellist.cpp:631 komparemodellist.cpp:651
-#, kde-format
-msgid "Could not parse diff output."
-msgstr ""
-
-#: komparemodellist.cpp:534
-#, kde-format
-msgid "The files are identical."
-msgstr ""
-
-#: komparemodellist.cpp:716
-#, kde-format
-msgid "Could not write to the temporary file."
-msgstr ""
-
-#: 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 ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/bg/libkomparediff2.po new/libkomparediff2-18.12.0/po/bg/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/bg/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/bg/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2009-09-17 22:29+0300\n"
"Last-Translator: Yasen Pramatarov \n"
"Language-Team: Bulgarian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/bs/libkomparediff2.po new/libkomparediff2-18.12.0/po/bs/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/bs/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/bs/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kdesdk\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2014-10-20 19:39+0000\n"
"Last-Translator: Samir Ribić <Unknown>\n"
"Language-Team: Bosnian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ca/libkomparediff2.po new/libkomparediff2-18.12.0/po/ca/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ca/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ca/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2015-05-31 19:02+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ca@valencia/libkomparediff2.po new/libkomparediff2-18.12.0/po/ca@valencia/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ca@valencia/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ca@valencia/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2015-05-31 19:02+0200\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
@@ -144,764 +144,3 @@
msgstr ""
"El diff està mal format. Algunes línies no es poden analitzar i no es "
"mostraran a la vista de diferències."
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Albert Astals Cid,Antoni Bella"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "aacid@kde.org,antonibella5@yahoo.com"
-
-#~ msgid "Could not load our KompareViewPart."
-#~ msgstr "No s'ha pogut carregar el nostre KompareViewPart."
-
-#~ msgid "Navigation"
-#~ msgstr "Navegació"
-
-#~ msgid "Could not load our KompareNavigationPart."
-#~ msgstr "No s'ha pogut carregar el nostre KompareNavigationPart."
-
-#~ msgid "&Open Diff..."
-#~ msgstr "&Obre diff..."
-
-#~ msgid "&Compare Files..."
-#~ msgstr "&Compara fitxers..."
-
-#~ msgid "&Blend URL with Diff..."
-#~ msgstr "&Fusiona l'URL amb el diff..."
-
-#~ msgid "Show T&ext View"
-#~ msgstr "Mostra vista de &text"
-
-#~ msgid " 0 of 0 differences "
-#~ msgstr " 0 de 0 diferències "
-
-#~ msgid " 0 of 0 files "
-#~ msgstr " 0 de 0 fitxers "
-
-#~ msgid " %2 of %1 file "
-#~ msgid_plural " %2 of %1 files "
-#~ msgstr[0] "%2 d'%1 fitxer "
-#~ msgstr[1] " %2 de %1 fitxers "
-
-#~ msgid " %1 file "
-#~ msgid_plural " %1 files "
-#~ msgstr[0] " %1 fitxer "
-#~ msgstr[1] " %1 fitxers "
-
-#~ msgid " %2 of %1 difference, %3 applied "
-#~ msgid_plural " %2 of %1 differences, %3 applied "
-#~ msgstr[0] " %2 d'%1 diferència, %3 aplicada "
-#~ msgstr[1] " %2 de %1 diferències, %3 aplicades"
-
-#~ msgid " %1 difference "
-#~ msgid_plural " %1 differences "
-#~ msgstr[0] " %1 diferència "
-#~ msgstr[1] " %1 diferències "
-
-#~ msgid "Blend File/Folder with diff Output"
-#~ msgstr "Fusiona el fitxer/carpeta amb la sortida de diff"
-
-#~ msgid "File/Folder"
-#~ msgstr "Fitxer/carpeta"
-
-#~ msgid "Diff Output"
-#~ msgstr "Sortida de diff"
-
-#~ msgid "Blend"
-#~ msgstr "Fusiona"
-
-#~ msgid "Blend this file or folder with the diff output"
-#~ msgstr "Fusiona aquest fitxer o carpeta amb la sortida de diff"
-
-#~ msgid ""
-#~ "If you have entered a file or folder name and a file that contains diff "
-#~ "output in the fields in this dialog then this button will be enabled and "
-#~ "pressing it will open kompare's main view where the output of the entered "
-#~ "file or files from the folder are mixed with the diff output so you can "
-#~ "then apply the difference(s) to a file or to the files. "
-#~ msgstr ""
-#~ "Si heu entrat en els camps d'aquest diàleg un nom de fitxer o de carpeta "
-#~ "i un de fitxer que contindrà la sortida de diff, aleshores aquest botó "
-#~ "serà habilitat i prement-lo s'obrirà la finestra de vista principal de "
-#~ "kompare, a on el fitxer o fitxers de la carpeta seran mesclats amb la "
-#~ "sortida de diff, de manera que pugueu aplicar la(es) diferència(es) a un "
-#~ "fitxer o als fitxers. "
-
-#~ msgid "Compare Files or Folders"
-#~ msgstr "Compara fitxers o carpetes"
-
-#~ msgid "Source"
-#~ msgstr "Origen"
-
-#~ msgid "Destination"
-#~ msgstr "Destinació"
-
-#~ msgid "Compare"
-#~ msgstr "Compara"
-
-#~ msgid "Compare these files or folders"
-#~ msgstr "Compara aquests fitxers o carpetes"
-
-#~ msgid ""
-#~ "If you have entered 2 filenames or 2 folders in the fields in this dialog "
-#~ "then this button will be enabled and pressing it will start a comparison "
-#~ "of the entered files or folders. "
-#~ msgstr ""
-#~ "Si en els camps d'aquest diàleg heu introduït 2 noms de fitxer o 2 "
-#~ "carpetes, aleshores s'habilitarà aquest botó i prement-lo es començarà a "
-#~ "fer una comparació dels fitxers o carpetes introduïdes. "
-
-#~ msgid "Text View"
-#~ msgstr "Vista de text"
-
-#~ msgid "Source Folder"
-#~ msgstr "Carpeta d'origen"
-
-#~ msgid "Destination Folder"
-#~ msgstr "Carpeta de destinació"
-
-#~ msgid "Source File"
-#~ msgstr "Fitxer d'origen"
-
-#~ msgid "Destination File"
-#~ msgstr "Fitxer de destinació"
-
-#~ msgid "Source Line"
-#~ msgstr "Línia d'origen"
-
-#~ msgid "Destination Line"
-#~ msgstr "Línia de destinació"
-
-#~ msgid "Difference"
-#~ msgstr "Diferència"
-
-#~ msgid "Applied: Changes made to %1 line undone"
-#~ msgid_plural "Applied: Changes made to %1 lines undone"
-#~ msgstr[0] "S'ha aplicat: Els canvis realitzats a %1 línia s'han desfet"
-#~ msgstr[1] "S'ha aplicat: Els canvis realitzats a %1 línies s'han desfet"
-
-#~ msgid "Changed %1 line"
-#~ msgid_plural "Changed %1 lines"
-#~ msgstr[0] "S'ha canviat %1 línia"
-#~ msgstr[1] "S'han canviat %1 línies"
-
-#~ msgid "Applied: Insertion of %1 line undone"
-#~ msgid_plural "Applied: Insertion of %1 lines undone"
-#~ msgstr[0] "S'ha aplicat: La inserció de %1 línia ha estat desfeta"
-#~ msgstr[1] "S'ha aplicat: La inserció de %1 línies ha estat desfeta"
-
-#~ msgid "Inserted %1 line"
-#~ msgid_plural "Inserted %1 lines"
-#~ msgstr[0] "S'ha inserit %1 línia"
-#~ msgstr[1] "S'han inserit %1 línies"
-
-#~ msgid "Applied: Deletion of %1 line undone"
-#~ msgid_plural "Applied: Deletion of %1 lines undone"
-#~ msgstr[0] "S'ha aplicat: s'ha desfet l'eliminació de %1 línia"
-#~ msgstr[1] "S'ha aplicat: s'ha desfet l'eliminació de %1 línies"
-
-#~ msgid "Unknown"
-#~ msgstr "Desconegut"
-
-#~ msgid "KompareNavTreePart"
-#~ msgstr "KompareNavTreePart"
-
-#~ msgid "John Firebaugh"
-#~ msgstr "John Firebaugh"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Otto Bruggeman"
-#~ msgstr "Otto Bruggeman"
-
-#~ msgid "Save &All"
-#~ msgstr "Desa-ho &tot"
-
-#~ msgid "Save &Diff..."
-#~ msgstr "Desa &diff..."
-
-#~ msgid "Swap Source with Destination"
-#~ msgstr "Commuta l'origen amb la destinació"
-
-#~ msgid "Show Statistics"
-#~ msgstr "Mostra estadístiques"
-
-#~ msgid "Refresh Diff"
-#~ msgstr "Actualitza el diff"
-
-#~ msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-#~ msgstr "<qt>L'URL<b> %1</b> no s'ha pogut descarregar.</qt>"
-
-#~ msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-#~ msgstr "<qt>L'URL <b>%1</b> no existeix en el vostre sistema.</qt>"
-
-#~ msgid "Diff Options"
-#~ msgstr "Opcions de diff"
-
-#~ msgid "*.diff *.dif *.patch|Patch Files"
-#~ msgstr "*.diff *.dif *.patch|Fitxers pedaç"
-
-#~ msgid "Save .diff"
-#~ msgstr "Desa .diff"
-
-#~ msgid "The file exists or is write-protected; do you want to overwrite it?"
-#~ msgstr ""
-#~ "El fitxer existeix o està protegit contra escriptura, voleu "
-#~ "sobreescriure'l?"
-
-#~ msgid "File Exists"
-#~ msgstr "El fitxer ja existeix"
-
-#~ msgid "Overwrite"
-#~ msgstr "Sobreescriure"
-
-#~ msgid "Do Not Overwrite"
-#~ msgstr "No sobreescriure"
-
-#~ msgid "KomparePart"
-#~ msgstr "KomparePart"
-
-#~ msgid "Kevin Kofler"
-#~ msgstr "Kevin Kofler"
-
-#~ msgid "Running diff..."
-#~ msgstr "S'està executant diff..."
-
-#~ msgid "Parsing diff output..."
-#~ msgstr "S'està analitzant la sortida de diff..."
-
-#~ msgid "Comparing file %1 with file %2"
-#~ msgstr "Es compara el fitxer %1 amb el fitxer %2"
-
-#~ msgid "Comparing files in %1 with files in %2"
-#~ msgstr "Es comparen els fitxers de %1 amb els de %2"
-
-#~ msgid "Viewing diff output from %1"
-#~ msgstr "S'està analitzant la sortida de diff des de %1"
-
-#~ msgid "Blending diff output from %1 into file %2"
-#~ msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2"
-
-#~ msgid "Blending diff output from %1 into folder %2"
-#~ msgstr "S'està fusionant la sortida de diff de %1 en el fitxer %2"
-
-#~ msgid ""
-#~ "You have made changes to the destination file(s).\n"
-#~ "Would you like to save them?"
-#~ msgstr ""
-#~ "Heu realitzat canvis en el(s) fitxer(s) de destinació.\n"
-#~ "Desitgeu desar-los?"
-
-#~ msgid "Save Changes?"
-#~ msgstr "Desar els canvis?"
-
-#~ msgid "Unified"
-#~ msgstr "Unificat"
-
-#~ msgid "Context"
-#~ msgstr "Context"
-
-#~ msgid "RCS"
-#~ msgstr "RCS"
-
-#~ msgid "Ed"
-#~ msgstr "Ed"
-
-#~ msgid "Normal"
-#~ msgstr "Normal"
-
-#~ msgid ""
-#~ "No diff file, or no 2 files have been diffed. Therefore no stats are "
-#~ "available."
-#~ msgstr ""
-#~ "No hi ha fitxer diff o no s'han comparat 2 fitxers. Pel que no hi ha "
-#~ "estadístiques disponibles."
-
-#~ msgid "Diff Statistics"
-#~ msgstr "Estadístiques del diff"
-
-#~ msgid ""
-#~ "Statistics:\n"
-#~ "\n"
-#~ "Old file: %1\n"
-#~ "New file: %2\n"
-#~ "\n"
-#~ "Format: %3\n"
-#~ "Number of hunks: %4\n"
-#~ "Number of differences: %5"
-#~ msgstr ""
-#~ "Estadístiques:\n"
-#~ "\n"
-#~ "Fitxer antic: %1\n"
-#~ "Fitxer nou: %2\n"
-#~ "\n"
-#~ "Format: %3\n"
-#~ "Nombre de blocs: %4\n"
-#~ "Nombre de diferències: %5"
-
-#~ msgid ""
-#~ "Statistics:\n"
-#~ "\n"
-#~ "Number of files in diff file: %1\n"
-#~ "Format: %2\n"
-#~ "\n"
-#~ "Current old file: %3\n"
-#~ "Current new file: %4\n"
-#~ "\n"
-#~ "Number of hunks: %5\n"
-#~ "Number of differences: %6"
-#~ msgstr ""
-#~ "Estadístiques:\n"
-#~ "\n"
-#~ "Nombre de fitxers en el fitxer diff: %1\n"
-#~ "Format: %2\n"
-#~ "\n"
-#~ "Fitxer antic actual: %3\n"
-#~ "Fitxer nou actual: %4\n"
-#~ "\n"
-#~ "Nombre de blocs: %5\n"
-#~ "Nombre de diferències: %6"
-
-#~ msgid "&File"
-#~ msgstr "&Fitxer"
-
-#~ msgid "&Difference"
-#~ msgstr "&Diferència"
-
-#~ msgid "&Settings"
-#~ msgstr "A&rranjament"
-
-#~ msgid "Preferences"
-#~ msgstr "Preferències"
-
-#~ msgid "View"
-#~ msgstr "Visualitza"
-
-#~ msgid "View Settings"
-#~ msgstr "Arranjament de la vista"
-
-#~ msgid "Diff"
-#~ msgstr "Diff"
-
-#~ msgid "Diff Settings"
-#~ msgstr "Arranjament de diff"
-
-#~ msgid "Run Diff In"
-#~ msgstr "Executa diff en"
-
-#~ msgid "Command Line"
-#~ msgstr "Línia d'ordres"
-
-#~ msgid "cd dir && diff -udHprNa -- source destination"
-#~ msgstr "cd dir i diff -udHprNa -- codi_font de destinació"
-
-#~ msgid "Options"
-#~ msgstr "Opcions"
-
-#~ msgid "Look for smaller changes"
-#~ msgstr "Cerca canvis menors"
-
-#~ msgid "Optimize for large files"
-#~ msgstr "Optimitza per a fitxers grans"
-
-#~ msgid "Ignore changes in case"
-#~ msgstr "Ignora canvis entre minúscula/majúscula"
-
-#~ msgid "Expand tabs to spaces"
-#~ msgstr "Expandir tabulacions a espais"
-
-#~ msgid "Ignore added or removed empty lines"
-#~ msgstr "Ignora línies buides afegides o eliminades"
-
-#~ msgid "Ignore changes in whitespace"
-#~ msgstr "Ignora canvis en espais en blanc"
-
-#~ msgid "Show function names"
-#~ msgstr "Mostra noms de les funcions"
-
-#~ msgid "Compare folders recursively"
-#~ msgstr "Compara carpetes recursivament"
-
-#~ msgid "Treat new files as empty"
-#~ msgstr "Tracta als fitxers nous com a buits"
-
-#~ msgid "Format"
-#~ msgstr "Format"
-
-#~ msgid "Side-by-side"
-#~ msgstr "Cara-a-cara"
-
-#~ msgid "Number of context lines:"
-#~ msgstr "Nombre de línies de context:"
-
-#~ msgid "Main Toolbar"
-#~ msgstr "Barra d'eines principal"
-
-#~ msgid "Files"
-#~ msgstr "Fitxers"
-
-#~ msgid "Here you can enter the files you want to compare."
-#~ msgstr "Aquí podeu introduir les fitxers que voleu comparar."
-
-#~ msgid "Here you can change the options for comparing the files."
-#~ msgstr "Aquí podeu canviar les opcions de comparació dels fitxers."
-
-#~ msgid "Appearance"
-#~ msgstr "Aparença"
-
-#~ msgid "Here you can change the options for the view."
-#~ msgstr "Aquí podeu canviar les opcions de la vista."
-
-#~ msgid ""
-#~ "File used for excluding files cannot be found, please specify another "
-#~ "file."
-#~ msgstr ""
-#~ "Fitxer usat per excloure fitxers no s'han pogut pot trobar, si us plau, "
-#~ "especifiqueu un altre fitxer."
-
-#~ msgid "Diff Program"
-#~ msgstr "Programa de diff"
-
-#~ msgid ""
-#~ "You can select a different diff program here. On Solaris the standard "
-#~ "diff program does not support all the options that the GNU version does. "
-#~ "This way you can select that version."
-#~ msgstr ""
-#~ "Aquí podeu seleccionar un programa de diff diferent. Sobre Solaris el "
-#~ "programa estàndard per a diff no permet totes les opcions que posseeix la "
-#~ "versió de GNU. D'aquesta manera podeu seleccionar aquesta versió."
-
-#~ msgid ""
-#~ "Select the format of the output generated by diff. Unified is the one "
-#~ "that is used most frequently because it is very readable. The KDE "
-#~ "developers like this format the best so use it for sending patches."
-#~ msgstr ""
-#~ "Seleccioneu el format de la sortida generada per diff. Unificada és "
-#~ "l'emprada més sovint atès que és de més fàcil lectura. És la que agrada "
-#~ "més als desenvolupadors del KDE pel que es recomana usar-la per enviar "
-#~ "pedaços."
-
-#~ msgid "Output Format"
-#~ msgstr "Format de la sortida"
-
-#~ msgid "Lines of Context"
-#~ msgstr "Línies de context"
-
-#~ msgid ""
-#~ "The number of context lines is normally 2 or 3. This makes the diff "
-#~ "readable and applicable in most cases. More than 3 lines will only bloat "
-#~ "the diff unnecessarily."
-#~ msgstr ""
-#~ "El nombre de línies de context normalment és de 2 o 3. Això torna "
-#~ "llegible al diff i aplicable en la majoria dels casos. Més de 3 línies "
-#~ "complicarà el diff innecessàriament."
-
-#~ msgid "General"
-#~ msgstr "General"
-
-#~ msgid "&Treat new files as empty"
-#~ msgstr "&Tracta als fitxers nous com a buits"
-
-#~ msgid "This option corresponds to the -N diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -N de diff."
-
-#~ msgid ""
-#~ "With this option enabled diff will treat a file that only exists in one "
-#~ "of the directories as empty in the other directory. This means that the "
-#~ "file is compared with an empty file and because of this will appear as "
-#~ "one big insertion or deletion."
-#~ msgstr ""
-#~ "Amb aquesta opció activada diff tractarà un fitxer que només existeix a "
-#~ "un dels directoris com si fos buit a un altre directori. Això significa "
-#~ "que el fitxer es compara amb un fitxer buit i per això apareixerà com una "
-#~ "gran inserció o supressió."
-
-#~ msgid "&Look for smaller changes"
-#~ msgstr "&Cerca canvis menors"
-
-#~ msgid "This corresponds to the -d diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -d de diff."
-
-#~ msgid ""
-#~ "With this option enabled diff will try a little harder (at the cost of "
-#~ "more memory) to find fewer changes."
-#~ msgstr ""
-#~ "Amb aquesta opció activada diff tractarà de cercar petits canvis difícils "
-#~ "de trobar (gastant més memòria)."
-
-#~ msgid "O&ptimize for large files"
-#~ msgstr "O&ptimitza per a fitxers grans"
-
-#~ msgid "This corresponds to the -H diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -H de diff."
-
-#~ msgid ""
-#~ "This option lets diff makes better diffs when using large files. The "
-#~ "definition of large is nowhere to be found though."
-#~ msgstr ""
-#~ "Aquesta opció permet a diff fer millors comparacions quan s'usen fitxers "
-#~ "grans. La definició de gran no s'especifica enlloc."
-
-#~ msgid "&Ignore changes in case"
-#~ msgstr "&Ignora canvis entre minúscula/majúscula"
-
-#~ msgid "This corresponds to the -i diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -i de diff."
-
-#~ msgid ""
-#~ "With this option to ignore changes in case enabled, diff will not "
-#~ "indicate a difference when something in one file is changed into "
-#~ "SoMEthing in the other file."
-#~ msgstr ""
-#~ "Amb aquesta opció per ignorar canvis, en cas que es trobi activada, diff "
-#~ "no indicarà una diferencia quan «alguna cosa» en un fitxer s'ha canviat a "
-#~ "«Alguna CoSA» a l'altre fitxer."
-
-#~ msgid "Ignore regexp:"
-#~ msgstr "Ignora expressió regular:"
-
-#~ msgid "This option corresponds to the -I diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -I de diff."
-
-#~ msgid ""
-#~ "When this checkbox is enabled, an option to diff is given that will make "
-#~ "diff ignore lines that match the regular expression."
-#~ msgstr ""
-#~ "Quan aquesta casella de selecció està activada, es dóna una opció a diff "
-#~ "que fa que ignori les línies coincidents amb l'expressió regular."
-
-#~ msgid ""
-#~ "Add the regular expression here that you want to use\n"
-#~ "to ignore lines that match it."
-#~ msgstr ""
-#~ "Afegiu aquí l'expressió regular que voleu usar\n"
-#~ "per ignorar línies que coincideixen amb aquesta."
-
-#~ msgid "&Edit..."
-#~ msgstr "&Edita..."
-
-#~ msgid ""
-#~ "Clicking this will open a regular expression dialog where\n"
-#~ "you can graphically create regular expressions."
-#~ msgstr ""
-#~ "Fent clic aquí s'obrirà un diàleg d'expressió regular a on\n"
-#~ "podreu crear expressions regulars en mode gràfic."
-
-#~ msgid "Whitespace"
-#~ msgstr "Espai en blanc"
-
-#~ msgid "E&xpand tabs to spaces in output"
-#~ msgstr "&Expandeix les tabulacions a espais a la sortida"
-
-#~ msgid "This option corresponds to the -t diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -t de diff."
-
-#~ msgid ""
-#~ "This option does not always produce the right result. Due to this "
-#~ "expansion Kompare may have problems applying the change to the "
-#~ "destination file."
-#~ msgstr ""
-#~ "Aquesta opció no sempre produeix el resultat correcte. Degut a aquesta "
-#~ "expansió Kompare pot tenir problemes en aplicar els canvis al fitxer de "
-#~ "destinació."
-
-#~ msgid "I&gnore added or removed empty lines"
-#~ msgstr "I&gnora línies buides afegides o eliminades"
-
-#~ msgid "This option corresponds to the -B diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -B de diff."
-
-#~ msgid "Ig&nore changes in the amount of whitespace"
-#~ msgstr "Ig&nora canvis en la quantitat d'espais en blanc"
-
-#~ msgid "This option corresponds to the -b diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -b de diff."
-
-#~ msgid ""
-#~ "If you are uninterested in differences arising due to, for example, "
-#~ "changes in indentation, then use this option."
-#~ msgstr ""
-#~ "Useu aquesta opció si no esteu interessat en diferències que sorgeixen a "
-#~ "causa de, per exemple, els canvis de sagnat."
-
-#~ msgid "Ign&ore all whitespace"
-#~ msgstr "Ig&nora tots els espais en blanc"
-
-#~ msgid "This option corresponds to the -w diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -w de diff."
-
-#~ msgid ""
-#~ "This is useful for seeing the significant changes without being "
-#~ "overwhelmed by all the white space changes."
-#~ msgstr ""
-#~ "Això és útil per veure els canvis significatius sense sentir-vos "
-#~ "aclaparat per tots els canvis als espais en blanc."
-
-#~ msgid "Igno&re changes due to tab expansion"
-#~ msgstr "Igno&ra canvis provocats per l'expansió de tabulació"
-
-#~ msgid "This option corresponds to the -E diff option."
-#~ msgstr "Aquesta opció es correspon amb l'opció -E de diff."
-
-#~ msgid ""
-#~ "If there is a change because tabs have been expanded into spaces in the "
-#~ "other file, then this option will make sure that these do not show up. "
-#~ "Kompare currently has some problems applying such changes so be careful "
-#~ "when you use this option."
-#~ msgstr ""
-#~ "Aquesta opció garanteix que no es mostrarà si hi ha un canvi degut a que "
-#~ "els tabuladors s'han expandit per espais a l'altre fitxer. Kompare "
-#~ "actualment té alguns problemes per aplicar aquests canvis així que "
-#~ "tingueu cura quan utilitzeu aquesta opció."
-
-#~ msgid "File Pattern to Exclude"
-#~ msgstr "Patró de fitxer a excloure"
-
-#~ msgid ""
-#~ "If this is checked you can enter a shell pattern in the text box on the "
-#~ "right or select entries from the list."
-#~ msgstr ""
-#~ "Si està marcada podeu introduir un patró d'intèrpret d'ordres al quadre "
-#~ "de text de la dreta o triar-ne una entrada de la llista."
-
-#~ msgid ""
-#~ "Here you can enter or remove a shell pattern or select one or more "
-#~ "entries from the list."
-#~ msgstr ""
-#~ "Aquí podeu introduir o eliminar un patró per a l'intèrpret d'ordres o "
-#~ "triar-ne un o més des de les entrades que apareixen a la llista."
-
-#~ msgid "File with Filenames to Exclude"
-#~ msgstr "Fitxer amb noms de fitxer a excloure"
-
-#~ msgid "If this is checked you can enter a filename in the combo box below."
-#~ msgstr ""
-#~ "Si això està marcat podreu introduir un nom de fitxer en el quadre "
-#~ "combinat de la dreta."
-
-#~ msgid ""
-#~ "Here you can enter the URL of a file with shell patterns to ignore during "
-#~ "the comparison of the folders."
-#~ msgstr ""
-#~ "Aquí podeu introduir l'URL d'un fitxer amb patrons per a l'intèrpret "
-#~ "d'ordres que seran ignorats durant la comparació de les carpetes."
-
-#~ msgid ""
-#~ "Any file you select in the dialog that pops up when you click it will be "
-#~ "put in the dialog to the left of this button."
-#~ msgstr ""
-#~ "Qualsevol fitxer que seleccioneu en el diàleg que aparegui quan feu clic "
-#~ "serà inclòs en el diàleg que apareix a l'esquerra d'aquest botó."
-
-#~ msgid "Exclude"
-#~ msgstr "Exclou"
-
-#~ msgid "Encoding"
-#~ msgstr "Codificació"
-
-#~ msgid "Colors"
-#~ msgstr "Colors"
-
-#~ msgid "Removed color:"
-#~ msgstr "Color d'eliminació:"
-
-#~ msgid "Changed color:"
-#~ msgstr "Color de canvi:"
-
-#~ msgid "Added color:"
-#~ msgstr "Color d'afegit:"
-
-#~ msgid "Applied color:"
-#~ msgstr "Color d'aplicat:"
-
-#~ msgid "Mouse Wheel"
-#~ msgstr "Roda del ratolí"
-
-#~ msgid "Number of lines:"
-#~ msgstr "Nombre de línies:"
-
-#~ msgid "Tabs to Spaces"
-#~ msgstr "Tabulacions a espais"
-
-#~ msgid "Number of spaces to convert a tab character to:"
-#~ msgstr "Nombre d'espais als que convertir un caràcter de tabulació:"
-
-#~ msgid "Text Font"
-#~ msgstr "Tipus de lletra del text"
-
-#~ msgid "Font:"
-#~ msgstr "Tipus de lletra:"
-
-#~ msgid "Size:"
-#~ msgstr "Mida:"
-
-#~ msgid "Fonts"
-#~ msgstr "Tipus de lletra"
-
-#~ msgid ""
-#~ "A program to view the differences between files and optionally generate a "
-#~ "diff"
-#~ msgstr ""
-#~ "Un programa per a veure diferències entre fitxers i opcionalment generar "
-#~ "un fitxer diff"
-
-#~ msgid "Kompare"
-#~ msgstr "Kompare"
-
-#~ msgid ""
-#~ "(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
-#~ "2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"
-#~ msgstr ""
-#~ "(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) "
-#~ "2004-2005 Jeff Snyder, (c) 2007-2012 Kevin Kofler"
-
-#~ msgid "Jeff Snyder"
-#~ msgstr "Jeff Snyder"
-
-#~ msgid "Developer"
-#~ msgstr "Desenvolupador"
-
-#~ msgid "Maintainer"
-#~ msgstr "Mantenidor"
-
-#~ msgid "Chris Luetchford"
-#~ msgstr "Chris Luetchford"
-
-#~ msgid "Kompare icon artist"
-#~ msgstr "Creador de la icona del Kompare"
-
-#~ msgid "Malte Starostik"
-#~ msgstr "Malte Starostik"
-
-#~ msgid "A lot of good advice"
-#~ msgstr "Un munt de bons consells"
-
-#~ msgid "Bernd Gehrmann"
-#~ msgstr "Bernd Gehrmann"
-
-#~ msgid "Cervisia diff viewer"
-#~ msgstr "Visor diff de Cervisia"
-
-#~ msgid "This will compare URL1 with URL2"
-#~ msgstr "Això compararà URL1 amb URL2"
-
-#~ msgid ""
-#~ "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. "
-#~ msgstr ""
-#~ "Això fusionarà URL 2 dintre d'URL 1, s'esperarà que URL 2 sigui una "
-#~ "sortida de diff i que el fitxer o carpeta d'URL 1 sigui el corresponent "
-#~ "per a dita sortida de diff. "
-
-#~ msgid ""
-#~ "Use this to specify the encoding when calling it from the command line. "
-#~ "It will default to the local encoding if not specified."
-#~ msgstr ""
-#~ "Useu per especificar la codificació en cridar des de la línia d'ordres. "
-#~ "Per defecte s'usarà la codificació local."
-
-#~ msgid "Compare these files or folder"
-#~ msgstr "Compara aquests fitxers o carpetes"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/cs/libkomparediff2.po new/libkomparediff2-18.12.0/po/cs/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/cs/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/cs/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-29 09:30+0200\n"
"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/da/libkomparediff2.po new/libkomparediff2-18.12.0/po/da/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/da/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/da/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-03 20:47+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/de/libkomparediff2.po new/libkomparediff2-18.12.0/po/de/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/de/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/de/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-02-24 14:49+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/el/libkomparediff2.po new/libkomparediff2-18.12.0/po/el/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/el/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/el/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2011-08-27 15:36+0200\n"
"Last-Translator: Dimitrios Glentadakis \n"
"Language-Team: Greek \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/en_GB/libkomparediff2.po new/libkomparediff2-18.12.0/po/en_GB/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/en_GB/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/en_GB/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2010-05-30 15:14+0100\n"
"Last-Translator: Andrew Coles \n"
"Language-Team: British English \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/eo/libkomparediff2.po new/libkomparediff2-18.12.0/po/eo/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/eo/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/eo/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2009-11-15 12:06+0100\n"
"Last-Translator: Axel Rousseau \n"
"Language-Team: esperanto \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/es/libkomparediff2.po new/libkomparediff2-18.12.0/po/es/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/es/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/es/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-26 13:32+0200\n"
"Last-Translator: Javier Viñal \n"
"Language-Team: Spanish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/et/libkomparediff2.po new/libkomparediff2-18.12.0/po/et/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/et/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/et/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2012-05-22 14:58+0300\n"
"Last-Translator: Marek Laane \n"
"Language-Team: Estonian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/eu/libkomparediff2.po new/libkomparediff2-18.12.0/po/eu/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/eu/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/eu/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2011-10-14 23:11+0200\n"
"Last-Translator: Iñigo Salvador Azurmendi \n"
"Language-Team: Basque \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/fa/libkomparediff2.po new/libkomparediff2-18.12.0/po/fa/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/fa/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/fa/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2007-06-30 17:00+0330\n"
"Last-Translator: Nazanin Kazemi \n"
"Language-Team: Persian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/fi/libkomparediff2.po new/libkomparediff2-18.12.0/po/fi/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/fi/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/fi/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-04-14 00:45+0300\n"
"Last-Translator: Lasse Liehu \n"
"Language-Team: Finnish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/fr/libkomparediff2.po new/libkomparediff2-18.12.0/po/fr/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/fr/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/fr/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-08-13 10:30+0200\n"
"Last-Translator: xavier \n"
"Language-Team: French \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ga/libkomparediff2.po new/libkomparediff2-18.12.0/po/ga/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ga/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ga/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdesdk/kompare.po\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2004-12-03 14:52-0500\n"
"Last-Translator: Kevin Scannell \n"
"Language-Team: Irish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/gl/libkomparediff2.po new/libkomparediff2-18.12.0/po/gl/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/gl/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/gl/libkomparediff2.po 2018-12-07 01:36:52.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-03-17 12:32+0100\n"
"Last-Translator: Marce Villarino \n"
"Language-Team: Galician \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/hi/libkomparediff2.po new/libkomparediff2-18.12.0/po/hi/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/hi/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/hi/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2008-02-23 17:35+0530\n"
"Last-Translator: Ravishankar Shrivastava \n"
"Language-Team: Hindi \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/hr/libkomparediff2.po new/libkomparediff2-18.12.0/po/hr/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/hr/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/hr/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kompare 0\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2004-04-20 13:26+CEST\n"
"Last-Translator: auto\n"
"Language-Team: Croatian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/hu/libkomparediff2.po new/libkomparediff2-18.12.0/po/hu/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/hu/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/hu/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: KDE 4.2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-04-09 23:49+0200\n"
"Last-Translator: Balázs Úr \n"
"Language-Team: Hungarian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/is/libkomparediff2.po new/libkomparediff2-18.12.0/po/is/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/is/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/is/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2009-07-28 20:22+0000\n"
"Last-Translator: Sveinn í Felli \n"
"Language-Team: Icelandic \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/it/libkomparediff2.po new/libkomparediff2-18.12.0/po/it/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/it/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/it/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-06-17 08:52+0200\n"
"Last-Translator: Federico Zenith \n"
"Language-Team: Italian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ja/libkomparediff2.po new/libkomparediff2-18.12.0/po/ja/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ja/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ja/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2009-07-20 23:29+0900\n"
"Last-Translator: Yukiko Bando \n"
"Language-Team: Japanese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/kk/libkomparediff2.po new/libkomparediff2-18.12.0/po/kk/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/kk/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/kk/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-06-27 04:14+0600\n"
"Last-Translator: Sairan Kikkarin \n"
"Language-Team: Kazakh \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/km/libkomparediff2.po new/libkomparediff2-18.12.0/po/km/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/km/libkomparediff2.po 2018-11-06 01:17:26.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/km/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2008-12-19 10:22+0700\n"
"Last-Translator: Khoem Sokhem \n"
"Language-Team: Khmer \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ko/libkomparediff2.po new/libkomparediff2-18.12.0/po/ko/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ko/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ko/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2014-03-01 01:56+0900\n"
"Last-Translator: Shinjo Park \n"
"Language-Team: Korean \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/lt/libkomparediff2.po new/libkomparediff2-18.12.0/po/lt/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/lt/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/lt/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-05-03 19:16+0300\n"
"Last-Translator: Liudas Ališauskas \n"
"Language-Team: Lithuanian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/lv/libkomparediff2.po new/libkomparediff2-18.12.0/po/lv/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/lv/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/lv/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2009-06-04 12:04+0300\n"
"Last-Translator: Viesturs Zariņš \n"
"Language-Team: Latvian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/mr/libkomparediff2.po new/libkomparediff2-18.12.0/po/mr/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/mr/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/mr/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-03-28 14:37+0530\n"
"Last-Translator: Chetan Khona \n"
"Language-Team: Marathi \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/nb/libkomparediff2.po new/libkomparediff2-18.12.0/po/nb/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/nb/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/nb/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-04-08 21:44+0200\n"
"Last-Translator: Bjørn Steensrud \n"
"Language-Team: Norwegian Bokmål \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/nds/libkomparediff2.po new/libkomparediff2-18.12.0/po/nds/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/nds/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/nds/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2011-09-05 22:49+0200\n"
"Last-Translator: Manfred Wiese \n"
"Language-Team: Low Saxon \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/nl/libkomparediff2.po new/libkomparediff2-18.12.0/po/nl/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/nl/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/nl/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-27 09:00+0200\n"
"Last-Translator: Freek de Kruijf \n"
"Language-Team: Dutch \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/nn/libkomparediff2.po new/libkomparediff2-18.12.0/po/nn/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/nn/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/nn/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2018-07-17 14:11+0100\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/pa/libkomparediff2.po new/libkomparediff2-18.12.0/po/pa/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/pa/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/pa/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2012-07-05 07:33+0530\n"
"Last-Translator: A S Alam \n"
"Language-Team: Punjabi/Panjabi \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/pl/libkomparediff2.po new/libkomparediff2-18.12.0/po/pl/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/pl/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/pl/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2016-04-23 07:31+0100\n"
"Last-Translator: Łukasz Wojniłowicz \n"
"Language-Team: Polish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/pt/libkomparediff2.po new/libkomparediff2-18.12.0/po/pt/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/pt/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/pt/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-27 13:14+0000\n"
"Last-Translator: José Nuno Coelho Pires \n"
"Language-Team: Portuguese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/pt_BR/libkomparediff2.po new/libkomparediff2-18.12.0/po/pt_BR/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/pt_BR/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/pt_BR/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-27 00:59-0300\n"
"Last-Translator: André Marcelo Alvarenga \n"
"Language-Team: Brazilian Portuguese \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ro/libkomparediff2.po new/libkomparediff2-18.12.0/po/ro/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ro/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ro/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2012-12-22 11:55+0200\n"
"Last-Translator: Sergiu Bivol \n"
"Language-Team: Romanian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ru/libkomparediff2.po new/libkomparediff2-18.12.0/po/ru/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ru/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ru/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-03-28 19:55+0400\n"
"Last-Translator: Yuri Efremov \n"
"Language-Team: Russian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/sk/libkomparediff2.po new/libkomparediff2-18.12.0/po/sk/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/sk/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/sk/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-02-24 12:58+0100\n"
"Last-Translator: Roman Paholik \n"
"Language-Team: Slovak \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/sl/libkomparediff2.po new/libkomparediff2-18.12.0/po/sl/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/sl/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/sl/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-11-17 10:51+0100\n"
"Last-Translator: Andrej Mernik \n"
"Language-Team: Slovenian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/sr/libkomparediff2.po new/libkomparediff2-18.12.0/po/sr/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/sr/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/sr/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2017-09-28 18:00+0200\n"
"Last-Translator: Chusslove Illich \n"
"Language-Team: Serbian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/sv/libkomparediff2.po new/libkomparediff2-18.12.0/po/sv/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/sv/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/sv/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-27 08:52+0200\n"
"Last-Translator: Stefan Asserhäll \n"
"Language-Team: Swedish \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/tr/libkomparediff2.po new/libkomparediff2-18.12.0/po/tr/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/tr/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/tr/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kdesdk-kde4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2014-06-08 14:01+0000\n"
"Last-Translator: Volkan Gezer \n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/kdesdk-k-tr/"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/ug/libkomparediff2.po new/libkomparediff2-18.12.0/po/ug/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/ug/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/ug/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-09-08 07:05+0900\n"
"Last-Translator: Gheyret Kenji \n"
"Language-Team: Uyghur Computer Science Association \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/uk/libkomparediff2.po new/libkomparediff2-18.12.0/po/uk/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/uk/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/uk/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: libkomparediff2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
"PO-Revision-Date: 2013-07-28 22:28+0300\n"
"Last-Translator: Yuri Chornoivan \n"
"Language-Team: Ukrainian \n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/zh_CN/libkomparediff2.po new/libkomparediff2-18.12.0/po/zh_CN/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/zh_CN/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/zh_CN/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -12,8 +12,8 @@
msgstr ""
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
-"PO-Revision-Date: 2018-11-01 23:26\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\n"
+"PO-Revision-Date: 2018-11-12 09:28\n"
"Last-Translator: guoyunhe \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkomparediff2-18.08.3/po/zh_TW/libkomparediff2.po new/libkomparediff2-18.12.0/po/zh_TW/libkomparediff2.po
--- old/libkomparediff2-18.08.3/po/zh_TW/libkomparediff2.po 2018-11-06 01:17:27.000000000 +0100
+++ new/libkomparediff2-18.12.0/po/zh_TW/libkomparediff2.po 2018-12-07 01:36:53.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kompare\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-10-17 03:39+0200\n"
+"POT-Creation-Date: 2018-11-12 06:55+0100\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 \n"