Update version number for R14.0.8 final release.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Reset submodule main/applications/kdiff3/cmake to latest HEAD
191 changed files with 25992 additions and 23605 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
 [submodule "admin"]
 	path = admin
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
 [submodule "cmake"]
 	path = cmake
-	url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
--- a/CMakeL10n.txt
+++ b/CMakeL10n.txt
@ -0,0 +1,23 @@
+#################################################
+#
+#  (C) 2018 Slávek Banko
+#  slavek.banko (AT) axis.cz
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+##### include our cmake modules #################
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEL10n )
+
+
+##### create translation templates ##############
+
+tde_l10n_auto_add_subdirectories( )
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -0,0 +1,82 @@
+############################################
+#                                          #
+#  Improvements and feedbacks are welcome  #
+#                                          #
+#  This file is released under GPL >= 3    #
+#                                          #
+############################################
+
+
+cmake_minimum_required( VERSION 2.8 )
+
+
+#### general package setup
+
+project( kdiff3 )
+set( VERSION R14.0.8 )
+
+
+#### include essential cmake modules
+
+include( FindPkgConfig          )
+include( CheckFunctionExists    )
+include( CheckSymbolExists      )
+include( CheckIncludeFile       )
+include( CheckLibraryExists     )
+include( CheckCSourceCompiles   )
+include( CheckCXXSourceCompiles )
+
+
+#### include our cmake modules
+
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
+include( TDEMacros )
+
+
+##### setup install paths
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
+##### optional stuff
+
+option( WITH_ALL_OPTIONS "Enable all optional support" OFF                                          )
+option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
+
+
+##### user requested modules
+
+option( BUILD_ALL "Build all" ON                             )
+option( BUILD_DOC "Build documentation" ${BUILD_ALL}         )
+option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
+
+
+##### configure checks
+
+include( ConfigureChecks.cmake )
+
+
+###### global compiler settings
+
+add_definitions( -DHAVE_CONFIG_H )
+
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
+
+
+##### directories
+
+add_subdirectory( src )
+add_subdirectory( kdiff3plugin )
+tde_conditional_add_subdirectory( BUILD_DOC man      )
+tde_conditional_add_subdirectory( BUILD_DOC doc      )
+tde_conditional_add_subdirectory( BUILD_DOC data/doc )
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po              ) 
+tde_conditional_add_subdirectory( BUILD_TRANSLATIONS kdiff3plugin/po )
+
+
+##### write configure files
+
+configure_file( config.h.cmake config.h @ONLY )
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@ -0,0 +1,25 @@
+###########################################
+#                                         #
+#  Improvements and feedback are welcome  #
+#                                         #
+#  This file is released under GPL >= 3   #
+#                                         #
+###########################################
+
+# required stuff
+find_package( TQt )
+find_package( TDE )
+
+tde_setup_architecture_flags( )
+
+include(TestBigEndian)
+test_big_endian(WORDS_BIGENDIAN)
+
+tde_setup_largefiles( )
+
+
+##### check for gcc visibility support
+
+if( WITH_GCC_VISIBILITY )
+  tde_setup_gcc_visibility( )
+endif( WITH_GCC_VISIBILITY )
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit f9148018b2f8a11fd830712c1b508046cc34ff22
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit ca47fa83300e843f1e469e3f455e58aa299e1e9d
--- a/config.h.cmake
+++ b/config.h.cmake
@ -0,0 +1,8 @@
+#define VERSION "@VERSION@"
+
+// Defined if you have fvisibility and fvisibility-inlines-hidden support.
+#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
--- a/data/doc/CMakeLists.txt
+++ b/data/doc/CMakeLists.txt
@ -0,0 +1,6 @@
+file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
+
+install(
+    FILES ${_htmls}
+    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}/html
+)
--- a/diff_ext_for_kdiff3/.depend
+++ b/diff_ext_for_kdiff3/.depend
--- a/diff_ext_for_kdiff3/CMakeL10n.txt
+++ b/diff_ext_for_kdiff3/CMakeL10n.txt
@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "diff_ext"
+    DESTINATION "."
+)
--- a/diff_ext_for_kdiff3/diff_ext.cpp
+++ b/diff_ext_for_kdiff3/diff_ext.cpp
--- a/diff_ext_for_kdiff3/diff_ext.h
+++ b/diff_ext_for_kdiff3/diff_ext.h
--- a/diff_ext_for_kdiff3/diff_ext.pot
+++ b/diff_ext_for_kdiff3/diff_ext.pot
@ -1,96 +1,116 @@
-# Diff-ext-for-KDiff3
-# Copyright (C) 2006 Joachim Eibl
-# This file is distributed under the same license as the diff-ext-for-KDiff3 package.
-# PO-Template created by Joachim Eibl <Joachim dot Eibl at gmx dot de>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-03 06:05+0200\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: diff_ext.cpp:368 diff_ext.cpp:402
-msgid "Compare with"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""

 #: diff_ext.cpp:369
-msgid "Merge with"
+#, c-format
+msgid "Compare with %1"
+msgstr ""
+
+#: diff_ext.cpp:370
+#, c-format
+msgid "Merge with %1"
 msgstr ""

-#: diff_ext.cpp:384
+#: diff_ext.cpp:386
 msgid "3-way merge with base"
 msgstr ""

-#: diff_ext.cpp:387
-msgid "Save '%1' for later comparison or merge"
+#: diff_ext.cpp:389
+msgid "Save '%1' for later"
 msgstr ""

-#: diff_ext.cpp:408
-msgid "Compare"
+#: diff_ext.cpp:404
+msgid "Compare with ..."
+msgstr ""
+
+#: diff_ext.cpp:407
+msgid "Clear list"
 msgstr ""

 #: diff_ext.cpp:412
+msgid "Compare"
+msgstr ""
+
+#: diff_ext.cpp:416
 msgid "3 way comparison"
 msgstr ""

-#: diff_ext.cpp:418
+#: diff_ext.cpp:422
 msgid "About Diff-Ext ..."
 msgstr ""

-#: diff_ext.cpp:482
+#: diff_ext.cpp:491
 msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
 msgstr ""

-#: diff_ext.cpp:483
+#: diff_ext.cpp:492
 msgid "This software is distributable under the BSD license.\n"
 msgstr ""

-#: diff_ext.cpp:484
+#: diff_ext.cpp:493
 msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
 msgstr ""

-#: diff_ext.cpp:485
+#: diff_ext.cpp:494
 msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
 msgstr ""

-#: diff_ext.cpp:486
+#: diff_ext.cpp:495
 msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
 msgstr ""

-#: diff_ext.cpp:487
+#: diff_ext.cpp:496
 msgid "About Diff-Ext for KDiff3"
 msgstr ""

-#: diff_ext.cpp:512
+#: diff_ext.cpp:521
 msgid "Compare selected files"
 msgstr ""

-#: diff_ext.cpp:518 diff_ext.cpp:538
+#: diff_ext.cpp:527 diff_ext.cpp:547
 msgid "Compare '%1' with '%2'"
 msgstr ""

-#: diff_ext.cpp:524
+#: diff_ext.cpp:533
 msgid "Save '%1' for later operation"
 msgstr ""

-#: diff_ext.cpp:576
+#: diff_ext.cpp:585
 msgid "Could not start KDiff3. Please rerun KDiff3 installation."
 msgstr ""

-#: diff_ext.cpp:577
+#: diff_ext.cpp:586
 msgid "Command"
 msgstr ""

-#: diff_ext.cpp:578
+#: diff_ext.cpp:587
 msgid "CommandLine"
 msgstr ""

-#: diff_ext.cpp:579
+#: diff_ext.cpp:588
 msgid "Diff-Ext For KDiff3"
 msgstr ""
--- a/diff_ext_for_kdiff3/diff_ext_de.po
+++ b/diff_ext_for_kdiff3/diff_ext_de.po
@ -1,34 +1,50 @@
-# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-04 15:35+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: 2019-08-28 23:45+0000\n"
+"Last-Translator: Chris <xchrisx@uber.space>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-diff_ext/de/>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.8\n"

-#: diff_ext.cpp:363
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Chris (TDE)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "(Keine Email)"
+
+#: diff_ext.cpp:369
+#, c-format
 msgid "Compare with %1"
 msgstr "Vergleichen mit %1"

-#: diff_ext.cpp:364
+#: diff_ext.cpp:370
+#, c-format
 msgid "Merge with %1"
 msgstr "Zusammenführen mit %1"

-#: diff_ext.cpp:379
+#: diff_ext.cpp:386
 msgid "3-way merge with base"
 msgstr "3-Wege Zusammenführung mit Basis"

-#: diff_ext.cpp:382
+#: diff_ext.cpp:389
 msgid "Save '%1' for later"
 msgstr "Speichere '%1' für später"

@ -36,67 +52,74 @@ msgstr "Speichere '%1' für später"
 msgid "Compare with ..."
 msgstr "Vergleichen mit ..."

-#: diff_ext.cpp:403
-msgid "Compare"
-msgstr "Vergleichen"
-
-#: diff_ext.cpp:403
+#: diff_ext.cpp:407
 msgid "Clear list"
 msgstr "Liste löschen"

+#: diff_ext.cpp:412
+msgid "Compare"
+msgstr "Vergleichen"

-#: diff_ext.cpp:407
+#: diff_ext.cpp:416
 msgid "3 way comparison"
 msgstr "Vergleiche 3 Dateien"

-#: diff_ext.cpp:413
+#: diff_ext.cpp:422
 msgid "About Diff-Ext ..."
 msgstr "Über Diff-Ext ..."

-#: diff_ext.cpp:474
+#: diff_ext.cpp:491
 msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
-msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\n"
+msgstr ""
+"Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\n"

-#: diff_ext.cpp:475
+#: diff_ext.cpp:492
 msgid "This software is distributable under the BSD license.\n"
 msgstr "Weitergabe dieses Programms unter den Bedingungen der BSD Lizenz.\n"

-#: diff_ext.cpp:476
+#: diff_ext.cpp:493
 msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
 msgstr "Einige Erweiterungen für KDiff3 von Joachim Eibl.\n"

-#: diff_ext.cpp:477
-msgid "See the homepage http://diff-ext.sourceforge.net"
-msgstr "Siehe die Homepage http://diff-ext.sourceforge.net"
+#: diff_ext.cpp:494
+msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
+msgstr "Siehe die Homepage für Diff-Ext: http://diff-ext.sourceforge.net\n"

-#: diff_ext.cpp:478
+#: diff_ext.cpp:495
+msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
+msgstr ""
+"Siehe die Homepage für KDiff3: https://mirror.git.trinitydesktop.org/gitea/"
+"TDE/kdiff3"
+
+#: diff_ext.cpp:496
 msgid "About Diff-Ext for KDiff3"
 msgstr "Über Diff-Ext für KDiff3"

-#: diff_ext.cpp:503
+#: diff_ext.cpp:521
 msgid "Compare selected files"
 msgstr "Vergleiche markierte Dateien"

-#: diff_ext.cpp:509 diff_ext.cpp:529
+#: diff_ext.cpp:527 diff_ext.cpp:547
 msgid "Compare '%1' with '%2'"
 msgstr "Vergleiche '%1' mit '%2'"

-#: diff_ext.cpp:515
-msgid "Merke '%1' für spätere Aktion"
-msgstr ""
+#: diff_ext.cpp:533
+msgid "Save '%1' for later operation"
+msgstr "'%1' für spätere Operation speichern"

-#: diff_ext.cpp:567
+#: diff_ext.cpp:585
 msgid "Could not start KDiff3. Please rerun KDiff3 installation."
-msgstr "Konnte KDiff3 nicht starten. Bitte wiederholen Sie die KDiff3 Installation."
+msgstr ""
+"Konnte KDiff3 nicht starten. Bitte wiederholen Sie die KDiff3 Installation."

-#: diff_ext.cpp:568
+#: diff_ext.cpp:586
 msgid "Command"
 msgstr "Kommando"

-#: diff_ext.cpp:569
+#: diff_ext.cpp:587
 msgid "CommandLine"
 msgstr "Kommandozeile"

-#: diff_ext.cpp:570
+#: diff_ext.cpp:588
 msgid "Diff-Ext For KDiff3"
 msgstr "Diff-Ext für KDiff3"
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -0,0 +1 @@
+tde_auto_add_subdirectories( )
--- a/doc/da/CMakeLists.txt
+++ b/doc/da/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG da )
--- a/doc/da/dirbrowser.png
+++ b/doc/da/dirbrowser.png
--- a/doc/da/dirmergebig.png
+++ b/doc/da/dirmergebig.png
--- a/doc/da/merge_current.png
+++ b/doc/da/merge_current.png
--- a/doc/da/new.png
+++ b/doc/da/new.png
--- a/doc/da/open_dialog.png
+++ b/doc/da/open_dialog.png
--- a/doc/da/screenshot_diff.png
+++ b/doc/da/screenshot_diff.png
--- a/doc/da/screenshot_merge.png
+++ b/doc/da/screenshot_merge.png
--- a/doc/da/white_space.png
+++ b/doc/da/white_space.png
--- a/doc/de/CMakeLists.txt
+++ b/doc/de/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de )
--- a/doc/de/dirbrowser.png
+++ b/doc/de/dirbrowser.png
--- a/doc/de/dirmergebig.png
+++ b/doc/de/dirmergebig.png
--- a/doc/de/merge_current.png
+++ b/doc/de/merge_current.png
--- a/doc/de/new.png
+++ b/doc/de/new.png
--- a/doc/de/open_dialog.png
+++ b/doc/de/open_dialog.png
--- a/doc/de/screenshot_diff.png
+++ b/doc/de/screenshot_diff.png
--- a/doc/de/screenshot_merge.png
+++ b/doc/de/screenshot_merge.png
--- a/doc/de/white_space.png
+++ b/doc/de/white_space.png
--- a/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
@ -0,0 +1,8 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} )
+
+file( GLOB _pngs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.png )
+
+install(
+    FILES ${_pngs}
+    DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}/html
+)
--- a/doc/en/common/bottom-left.png
+++ b/doc/en/common/bottom-left.png
--- a/doc/en/common/bottom-middle.png
+++ b/doc/en/common/bottom-middle.png
--- a/doc/en/common/bottom-right.png
+++ b/doc/en/common/bottom-right.png
--- a/doc/en/common/headerbg.png
+++ b/doc/en/common/headerbg.png
--- a/doc/en/common/kde_gear_64.png
+++ b/doc/en/common/kde_gear_64.png
--- a/doc/en/common/kde_logo_bg.png
+++ b/doc/en/common/kde_logo_bg.png
--- a/doc/en/common/top-left.png
+++ b/doc/en/common/top-left.png
--- a/doc/en/common/top-middle.png
+++ b/doc/en/common/top-middle.png
--- a/doc/en/common/top-right-konqueror.png
+++ b/doc/en/common/top-right-konqueror.png
--- a/doc/en/dirbrowser.png
+++ b/doc/en/dirbrowser.png
--- a/doc/en/dirmergebig.png
+++ b/doc/en/dirmergebig.png
--- a/doc/en/merge_current.png
+++ b/doc/en/merge_current.png
--- a/doc/en/new.png
+++ b/doc/en/new.png
--- a/doc/en/open_dialog.png
+++ b/doc/en/open_dialog.png
--- a/doc/en/screenshot_diff.png
+++ b/doc/en/screenshot_diff.png
--- a/doc/en/screenshot_merge.png
+++ b/doc/en/screenshot_merge.png
--- a/doc/en/white_space.png
+++ b/doc/en/white_space.png
--- a/doc/es/CMakeLists.txt
+++ b/doc/es/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG es )
--- a/doc/es/dirbrowser.png
+++ b/doc/es/dirbrowser.png
--- a/doc/es/dirmergebig.png
+++ b/doc/es/dirmergebig.png
--- a/doc/es/merge_current.png
+++ b/doc/es/merge_current.png
--- a/doc/es/new.png
+++ b/doc/es/new.png
--- a/doc/es/open_dialog.png
+++ b/doc/es/open_dialog.png
--- a/doc/es/screenshot_diff.png
+++ b/doc/es/screenshot_diff.png
--- a/doc/es/screenshot_merge.png
+++ b/doc/es/screenshot_merge.png
--- a/doc/es/white_space.png
+++ b/doc/es/white_space.png
--- a/doc/et/CMakeLists.txt
+++ b/doc/et/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG et )
--- a/doc/et/dirbrowser.png
+++ b/doc/et/dirbrowser.png
--- a/doc/et/dirmergebig.png
+++ b/doc/et/dirmergebig.png
--- a/doc/et/merge_current.png
+++ b/doc/et/merge_current.png
--- a/doc/et/new.png
+++ b/doc/et/new.png
--- a/doc/et/open_dialog.png
+++ b/doc/et/open_dialog.png
--- a/doc/et/screenshot_diff.png
+++ b/doc/et/screenshot_diff.png
--- a/doc/et/screenshot_merge.png
+++ b/doc/et/screenshot_merge.png
--- a/doc/et/white_space.png
+++ b/doc/et/white_space.png
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr )
--- a/doc/fr/dirbrowser.png
+++ b/doc/fr/dirbrowser.png
--- a/doc/fr/dirmergebig.png
+++ b/doc/fr/dirmergebig.png
--- a/doc/fr/merge_current.png
+++ b/doc/fr/merge_current.png
--- a/doc/fr/new.png
+++ b/doc/fr/new.png
--- a/doc/fr/open_dialog.png
+++ b/doc/fr/open_dialog.png
--- a/doc/fr/screenshot_diff.png
+++ b/doc/fr/screenshot_diff.png
--- a/doc/fr/screenshot_merge.png
+++ b/doc/fr/screenshot_merge.png
--- a/doc/fr/white_space.png
+++ b/doc/fr/white_space.png
--- a/doc/it/CMakeLists.txt
+++ b/doc/it/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG it )
--- a/doc/it/dirbrowser.png
+++ b/doc/it/dirbrowser.png
--- a/doc/it/dirmergebig.png
+++ b/doc/it/dirmergebig.png
--- a/doc/it/merge_current.png
+++ b/doc/it/merge_current.png
--- a/doc/it/new.png
+++ b/doc/it/new.png
--- a/doc/it/open_dialog.png
+++ b/doc/it/open_dialog.png
--- a/doc/it/screenshot_diff.png
+++ b/doc/it/screenshot_diff.png
--- a/doc/it/screenshot_merge.png
+++ b/doc/it/screenshot_merge.png
--- a/doc/it/white_space.png
+++ b/doc/it/white_space.png
--- a/doc/nl/CMakeLists.txt
+++ b/doc/nl/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG nl )
--- a/doc/nl/dirbrowser.png
+++ b/doc/nl/dirbrowser.png
--- a/doc/nl/dirmergebig.png
+++ b/doc/nl/dirmergebig.png
--- a/doc/nl/merge_current.png
+++ b/doc/nl/merge_current.png
--- a/doc/nl/new.png
+++ b/doc/nl/new.png
--- a/doc/nl/open_dialog.png
+++ b/doc/nl/open_dialog.png
--- a/doc/nl/screenshot_diff.png
+++ b/doc/nl/screenshot_diff.png
--- a/doc/nl/screenshot_merge.png
+++ b/doc/nl/screenshot_merge.png
--- a/doc/nl/white_space.png
+++ b/doc/nl/white_space.png
--- a/doc/pt/CMakeLists.txt
+++ b/doc/pt/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG pt )
--- a/doc/pt/dirbrowser.png
+++ b/doc/pt/dirbrowser.png
--- a/doc/pt/dirmergebig.png
+++ b/doc/pt/dirmergebig.png
--- a/doc/pt/merge_current.png
+++ b/doc/pt/merge_current.png
--- a/doc/pt/new.png
+++ b/doc/pt/new.png
--- a/doc/pt/open_dialog.png
+++ b/doc/pt/open_dialog.png
--- a/doc/pt/screenshot_diff.png
+++ b/doc/pt/screenshot_diff.png
--- a/doc/pt/screenshot_merge.png
+++ b/doc/pt/screenshot_merge.png
--- a/doc/pt/white_space.png
+++ b/doc/pt/white_space.png
--- a/doc/sv/CMakeLists.txt
+++ b/doc/sv/CMakeLists.txt
@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv )
--- a/doc/sv/dirbrowser.png
+++ b/doc/sv/dirbrowser.png
--- a/doc/sv/dirmergebig.png
+++ b/doc/sv/dirmergebig.png
--- a/doc/sv/merge_current.png
+++ b/doc/sv/merge_current.png
--- a/doc/sv/new.png
+++ b/doc/sv/new.png
--- a/doc/sv/open_dialog.png
+++ b/doc/sv/open_dialog.png
--- a/doc/sv/screenshot_diff.png
+++ b/doc/sv/screenshot_diff.png
--- a/doc/sv/screenshot_merge.png
+++ b/doc/sv/screenshot_merge.png
--- a/doc/sv/white_space.png
+++ b/doc/sv/white_space.png
--- a/kdiff3plugin/CMakeL10n.txt
+++ b/kdiff3plugin/CMakeL10n.txt
@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "kdiff3_plugin"
+    DESTINATION "po"
+)
--- a/kdiff3plugin/CMakeLists.txt
+++ b/kdiff3plugin/CMakeLists.txt
@ -0,0 +1,40 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkdiff3plugin (kpart)
+
+tde_add_kpart( libkdiff3plugin AUTOMOC
+
+  SOURCES
+        kdiff3plugin.cpp
+  LINK
+     konq
+     tdecore-shared
+     tdeui-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES kdiff3_plugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES kdiff3plugin.desktop
+    DESTINATION ${APPS_INSTALL_DIR}/.hidden
+)
--- a/kdiff3plugin/kdiff3plugin.cpp
+++ b/kdiff3plugin/kdiff3plugin.cpp
--- a/kdiff3plugin/kdiff3plugin.desktop
+++ b/kdiff3plugin/kdiff3plugin.desktop
@ -4,4 +4,4 @@ Type=Application
 Name=Compare/Merge Files/Directories with KDiff3
 Icon=kdiff3
 X-TDE-ParentApp=konqueror
-#DocPath=konq-plugins/kdiff3plugin/index.html
+#X-DocPath=konq-plugins/kdiff3plugin/index.html
--- a/kdiff3plugin/kdiff3plugin.h
+++ b/kdiff3plugin/kdiff3plugin.h
--- a/kdiff3plugin/po/CMakeLists.txt
+++ b/kdiff3plugin/po/CMakeLists.txt
@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+    tde_create_translation( LANG auto OUTPUT_NAME kdiff3_plugin )
+endif( )
--- a/kdiff3plugin/po/bg.po
+++ b/kdiff3plugin/po/bg.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2007-01-17 11:52+0200\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Тройно сливане с основата"
 msgid "Compare with ..."
 msgstr "Сравняване с ..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Сравняване"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Тройно сравняване"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Относно приставката за KDiff3 ..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
 "Страница в Интернет: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -75,9 +92,9 @@ msgid ""
 msgstr ""
 "Използване на разширението на контекстното меню:\n"
 "За нормално сравняване на два файла, натиснете \"Сравняване\".\n"
-"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи в "
-"подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за втория "
-"файл.\n"
-"За тройно сливане първо запишете основния файл, после това, което трябва да се "
-"слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
+"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи "
+"в подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за "
+"втория файл.\n"
+"За тройно сливане първо запишете основния файл, после това, което трябва да "
+"се слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
 "Същото важи и за сливането и сравняването на директории."
--- a/kdiff3plugin/po/br.po
+++ b/kdiff3plugin/po/br.po
@ -1,14 +1,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: br <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -35,32 +48,36 @@ msgstr ""
 msgid "Compare with ..."
 msgstr ""

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr ""

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr ""

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr ""

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"
 msgstr ""

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
--- a/kdiff3plugin/po/cs.po
+++ b/kdiff3plugin/po/cs.po
@ -4,16 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2007-01-25 19:57+0100\n"
 "Last-Translator: Klára Cihlářová <koty@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -40,32 +53,36 @@ msgstr ""
 msgid "Compare with ..."
 msgstr "Porovnat s..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Porovnat"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr ""

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr ""

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"
 msgstr ""

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
--- a/kdiff3plugin/po/da.po
+++ b/kdiff3plugin/po/da.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-19 16:31-0500\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Trevejs sammenfletning med basis"
 msgid "Compare with ..."
 msgstr "Sammenlign med..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Sammenlign"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Trevejs sammenligning"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Om Kdiff3-menuplugin..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
 "Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -75,10 +92,10 @@ msgid ""
 msgstr ""
 "Brug af udvidelsen med sammenhængsafhængig menu:\n"
 "For nem sammenligning af to markerede filer, vælg \"Sammenlign\".\n"
-"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. Den "
-"ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med\" for "
-"den anden fil.\n"
+"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. "
+"Den ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med"
+"\" for den anden fil.\n"
 "For en trevejs sammenfletning, \"Gem\" først basisfilen, derefter grenen at "
-"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden gren "
-"som bruges som mål.\n"
+"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden "
+"gren som bruges som mål.\n"
 "Det samme gælder også for mappesammenligning og sammenfletning."
--- a/kdiff3plugin/po/de.po
+++ b/kdiff3plugin/po/de.po
@ -6,15 +6,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
-"PO-Revision-Date: 2007-01-29 22:54+0100\n"
-"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: 2019-11-23 12:55+0000\n"
+"Last-Translator: Chris <xchrisx@uber.space>\n"
+"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-plugin/de/>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.9.1\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Chris (TDE)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "(Keine Email)"

 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
@ -42,19 +56,23 @@ msgstr "3-Wege-Vergleich mit Base"
 msgid "Compare with ..."
 msgstr "Vergleichen mit ..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr "Liste löschen"
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Vergleich"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "3-Wege-Vergleich"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Über das KDiff3 Menü-Modul ..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -64,13 +82,13 @@ msgstr ""
 "KDiff3 Internetseite: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -79,13 +97,13 @@ msgstr ""
 "Verwendung der Kontextmenü-Erweiterung:\n"
 "Für einen einfachen Vergleich zweier ausgewählter Dateien wählen Sie "
 "\"Vergleichen\".\n"
-"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste Datei "
-"zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
+"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste "
+"Datei zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
 "erscheinen. Anschließend verwenden Sie mit der zweiten Datei die Funktion "
 "\"Vergleichen mit\".\n"
-"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die "
-"Basis-Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit "
-"der zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
+"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die Basis-"
+"Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit der "
+"zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
 "Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n"
-"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen von "
-"Ordnern."
+"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen "
+"von Ordnern."
--- a/kdiff3plugin/po/el.po
+++ b/kdiff3plugin/po/el.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-19 17:37+0200\n"
 "Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Τριπλή συγχώνευση με βάση"
 msgid "Compare with ..."
 msgstr "Σύγκριση με..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Σύγκριση"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "τριπλή σύγκριση"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
 "Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -75,10 +92,10 @@ msgid ""
 msgstr ""
 "Χρήση της επέκτασης μενού:\n"
 "Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n"
-"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο για "
-"αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
+"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο "
+"για αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
 "χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n"
-"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον προς "
-"συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο κλάδο, ο "
-"οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
+"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον "
+"προς συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο "
+"κλάδο, ο οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
 "Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."
--- a/kdiff3plugin/po/et.po
+++ b/kdiff3plugin/po/et.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-12-07 02:19+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Kolme faili ühendamine baasiga"
 msgid "Compare with ..."
 msgstr "Võrdle failiga..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Võrdle"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Kolme faili võrdlemine"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "KDiff3 menüüplugina info..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -60,13 +77,13 @@ msgstr ""
 "KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n"
 "KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -77,7 +94,7 @@ msgstr ""
 "Kui teine fail asub kuskil mujal, \"salvesta\" esimene fail hilisemaks "
 "kasutamiseks. See ilmub alammenüüsse \"Võrdle failiga...\" Seejärel kasuta "
 "teise faili jaoks käsku \"Võrdle failiga\".\n"
-"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel ühendatav "
-"variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, mida kasutatakse "
-"sihtfailina.\n"
+"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel "
+"ühendatav variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, "
+"mida kasutatakse sihtfailina.\n"
 "Sama käib kataloogide võrdlemise ja ühendamise kohta."
--- a/kdiff3plugin/po/ga.po
+++ b/kdiff3plugin/po/ga.po
@ -1,14 +1,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: extragear-utils/kdiff3_plugin.po\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-19 07:45-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -35,19 +48,23 @@ msgstr ""
 msgid "Compare with ..."
 msgstr "Cuir i gcomparáid le ..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Cuir i gComparáid"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Comparáid trí bhealach"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr ""

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -57,13 +74,13 @@ msgstr ""
 "Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
--- a/kdiff3plugin/po/it.po
+++ b/kdiff3plugin/po/it.po
@ -4,19 +4,33 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
-"PO-Revision-Date: 2006-11-22 07:28+0100\n"
-"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
-"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: 2019-05-30 18:15+0000\n"
+"Last-Translator: stefano <ifx@lazytux.it>\n"
+"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-plugin/it/>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.6.1\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "idefix"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ifx@lazytux.it"

 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
-msgstr "KDiff3"
+msgstr "Kdiff3"

 #: kdiff3plugin.cpp:104
 #, c-format
@ -40,36 +54,40 @@ msgstr "Fusione a tre con base"
 msgid "Compare with ..."
 msgstr "Confronta con..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr "pulisci lista"
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Confronta"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Confronto a tre"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Informazioni sul plugin KDiff3 per menu..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"
 msgstr ""
 "Plugin KDiff3 per menu: Copyright 2006 Joachim Eibl\n"
-"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">"
-"kdiff3.sourceforge.net</a>\n"
+"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">kdiff3."
+"sourceforge.net</a>\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -77,8 +95,9 @@ msgid ""
 msgstr ""
 "Usare l'estensione del menu contestuale:\n"
 "Per un semplice confronto di due file selezionati scegli \"Confronta\".\n"
-"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà nel "
-"sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo file.\n"
+"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà "
+"nel sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo "
+"file.\n"
 "Per una fusione a tre, prima \"Memorizza\" il file di base, poi il ramo da "
 "fondere, e scegli \"Fusione a tre con base\" sul ramo di destinazione.\n"
 "Lo stesso vale per il confronto e la fusione tra cartelle."
--- a/kdiff3plugin/po/kdiff3_plugin.pot
+++ b/kdiff3plugin/po/kdiff3_plugin.pot
@ -0,0 +1,88 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr ""
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr ""
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr ""
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr ""
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr ""
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
+msgid "Compare"
+msgstr ""
+
+#: kdiff3plugin.cpp:146
+msgid "3 way comparison"
+msgstr ""
+
+#: kdiff3plugin.cpp:149
+msgid "About KDiff3 menu plugin ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:250
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: kdiff3plugin.cpp:252
+msgid ""
+"Using the contextmenu extension:\n"
+"For simple comparison of two selected 2 files choose \"Compare\".\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
+"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
+"choose \"3-way merge with base\" on the other branch which will be used as "
+"destination.\n"
+"Same also applies to directory comparison and merge."
+msgstr ""
--- a/kdiff3plugin/po/nl.po
+++ b/kdiff3plugin/po/nl.po
@ -4,16 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-27 00:11+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -40,19 +53,23 @@ msgstr "3-weg samenvoeging met basis"
 msgid "Compare with ..."
 msgstr "Vergelijken met..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Vergelijken"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "3-weg vergelijking"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Info over KDiff3-menuplugin..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -62,13 +79,13 @@ msgstr ""
 "KDiff3-website: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -78,10 +95,10 @@ msgstr ""
 "Voor eenvoudige vergelijking van 2 geselecteerde bestanden, kies "
 "\"Vergelijken\".\n"
 "Als het bestand ergens anders staat, sla dan het eerste bestand voor later "
-"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". Gebruik "
-"daarna \"Vergelijken met\" voor het tweede bestand.\n"
+"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". "
+"Gebruik daarna \"Vergelijken met\" voor het tweede bestand.\n"
 "Voor een 3-weg samenvoeging, sla eerst het basisbestand op, daarna de tak om "
-"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de tak "
-"die gebruikt zal worden als bestemming.\n"
+"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de "
+"tak die gebruikt zal worden als bestemming.\n"
 "Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
 "directories."
--- a/kdiff3plugin/po/pt.po
+++ b/kdiff3plugin/po/pt.po
@ -1,15 +1,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
-"PO-Revision-Date: 2006-11-19 14:49+0000\n"
-"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
-"Language-Team: pt <kde-i18n-pt@kde.org>\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: 2020-01-05 23:45+0000\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
+"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-plugin/pt/>\n"
+"Language: pt\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: Weblate 3.10\n"
 "X-POFile-SpellExtra: Eibl Joachim KDiff\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Hugo Carvalho"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "hugokarvalho@hotmail.com"
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -36,19 +52,23 @@ msgstr "Junção de 3-vias com a base"
 msgid "Compare with ..."
 msgstr "Comparar com ..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr "Limpar lista"
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Comparar"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Comparação de 3 vias"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Acerca do 'plugin' do menu do KDiff3 ..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -58,13 +78,13 @@ msgstr ""
 "Página Web do KDiff3: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -77,6 +97,6 @@ msgstr ""
 "ficheiro para mais tarde. Este irá aparecer no submenu \"Comparar Com ...\". "
 "Depois, use o \"Comparar Com\" no segundo ficheiro.\n"
 "Para uma junção de 3 vias, primeiro escolha \"Gravar\" o ficheiro de base, "
-"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" na "
-"outra ramificação que será usada como destino.\n"
+"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" "
+"na outra ramificação que será usada como destino.\n"
 "O mesmo se aplica também à comparação e junção de pastas."
--- a/kdiff3plugin/po/pt_BR.po
+++ b/kdiff3plugin/po/pt_BR.po
@ -4,16 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-26 22:39-0200\n"
 "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -40,19 +53,23 @@ msgstr "Mesclagem de 3-vias com a base"
 msgid "Compare with ..."
 msgstr "Comparar com ..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Comparar"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Comparação de 3 vias"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Sobre KDiff3 menu plugin ..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -62,13 +79,13 @@ msgstr ""
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -76,9 +93,9 @@ msgid ""
 msgstr ""
 "Usando a extensão menu de contexto:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
--- a/kdiff3plugin/po/sk.po
+++ b/kdiff3plugin/po/sk.po
@ -4,15 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
-"PO-Revision-Date: 2006-11-19 16:30+0100\n"
-"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
+"PO-Revision-Date: 2019-12-04 23:59+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-plugin/sk/>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 3.9.1\n"
+
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marek Mlynár"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "marek.inq.mlynar@gmail.com"

 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
@ -21,53 +35,68 @@ msgstr "KDiff3"
 #: kdiff3plugin.cpp:104
 #, c-format
 msgid "Compare with %1"
-msgstr ""
+msgstr "Porovnaj s %1"

 #: kdiff3plugin.cpp:109
 #, c-format
 msgid "Merge with %1"
-msgstr ""
+msgstr "Zlúč s %1"

 #: kdiff3plugin.cpp:114
 msgid "Save '%1' for later"
-msgstr ""
+msgstr "Ulož '%1' na neskôr"

 #: kdiff3plugin.cpp:119
 msgid "3-way merge with base"
-msgstr ""
+msgstr "3-cestné zlúčenie so základom"

 #: kdiff3plugin.cpp:125
 msgid "Compare with ..."
-msgstr ""
+msgstr "Porovnaj s..."
+
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr "Vyčisti zoznam"

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:141
 msgid "Compare"
-msgstr ""
+msgstr "Porovnaj"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
-msgstr ""
+msgstr "3 cestné porovnanie"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
-msgstr ""
+msgstr "O KDiff3 menu plugine..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"
 msgstr ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 domáca stránka: http://kdiff3.sourceforge.net\n"
+"\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
 "Same also applies to directory comparison and merge."
 msgstr ""
+"Používanie rozšírenia kontextového menu:\n"
+"Pre jednoduché porovnanie 2 súborov vyberte \"Porovnaj\".\n"
+"Ak sa nachádza ďalší súbor niekde inde, vyberte \"Uložiť\" prvý súbor na "
+"neskôr. potom sa objaví v submenu \"Porovnaj s...\". potom použite "
+"\"Porovnaj s...\" na druhý súbor.\n"
+"Pre 3-cestné zlúčenie najskôr použite \"Uložiť\" na prvý súbor, tiež na "
+"druhý súbor a nakoniec zvoľte \"3-cestné zlúčenie so základom\" na tretí  "
+"ktorý poslúži ako cieľový."
--- a/kdiff3plugin/po/sv.po
+++ b/kdiff3plugin/po/sv.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2006-11-19 20:10+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "Kdiff3"
@ -39,19 +52,23 @@ msgstr "Trevägs sammanfogning med bas"
 msgid "Compare with ..."
 msgstr "Jämför med..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Jämför"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "Trevägs jämförelse"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "Om Kdiff3-menyinsticksprogram..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
 "Kdiff3 hemsida: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
@ -76,9 +93,9 @@ msgstr ""
 "Användning av utökningen med sammanhangsberoende meny:\n"
 "För enkel jämförelse av två markerade filer, välj \"Jämför\".\n"
 "Om den andra filen finns någon annanstans, \"Spara\" den först filen till "
-"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med\" "
-"för den andra filen.\n"
+"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med"
+"\" för den andra filen.\n"
 "För en trevägs sammanfogning, \"Spara\" först basfilen, därefter grenen att "
-"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen som "
-"används som mål.\n"
+"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen "
+"som används som mål.\n"
 "Detsamma gäller också för katalogjämförelse och sammanfogning."
--- a/kdiff3plugin/po/tr.po
+++ b/kdiff3plugin/po/tr.po
@ -4,15 +4,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
-"POT-Creation-Date: 2006-11-19 08:46+0100\n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
 "PO-Revision-Date: 2007-01-21 21:58+0200\n"
 "Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
 "Language-Team: Türkçe <yerellestirme@kde.org.tr>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"

+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
 msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Temel ile 3-yollu birleştirme"
 msgid "Compare with ..."
 msgstr "Karşılaştır..."

-#: kdiff3plugin.cpp:137
+#: kdiff3plugin.cpp:134
+msgid "Clear list"
+msgstr ""
+
+#: kdiff3plugin.cpp:141
 msgid "Compare"
 msgstr "Karşılaştır"

-#: kdiff3plugin.cpp:142
+#: kdiff3plugin.cpp:146
 msgid "3 way comparison"
 msgstr "3 yollu karşılaştırma"

-#: kdiff3plugin.cpp:145
+#: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
 msgstr "KDiff3 menü eklentisi hakkında ..."

-#: kdiff3plugin.cpp:240
+#: kdiff3plugin.cpp:250
 msgid ""
 "KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
 "KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n"
 "\n"

-#: kdiff3plugin.cpp:242
+#: kdiff3plugin.cpp:252
 msgid ""
 "Using the contextmenu extension:\n"
 "For simple comparison of two selected 2 files choose \"Compare\".\n"
-"If the other file is somewhere else \"Save\" the first file for later. It will "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
-"file.\n"
+"If the other file is somewhere else \"Save\" the first file for later. It "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
+"on second file.\n"
 "For a 3-way merge first \"Save\" the base file, then the branch to merge and "
 "choose \"3-way merge with base\" on the other branch which will be used as "
 "destination.\n"
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@ -0,0 +1,5 @@
+file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
+
+if( _srcs )
+    tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} )
+endif( )
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/az.po
+++ b/po/az.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/br.po
+++ b/po/br.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/cy.po
+++ b/po/cy.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/is.po
+++ b/po/is.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/ka.po
+++ b/po/ka.po
--- a/po/kdiff3.pot
+++ b/po/kdiff3.pot
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/rw.po
+++ b/po/rw.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/src/CMakeL10n.txt
+++ b/src/CMakeL10n.txt
@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "kdiff3"
+    EXCLUDES "^kreplacements/"
+)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -0,0 +1,88 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kdiff3 (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        main.cpp
+        kdiff3_shell.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeparts-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### libkdiff3part (kpart)
+
+tde_add_kpart( libkdiff3part AUTOMOC
+
+  SOURCES
+        kdiff3_part.cpp
+        kdiff3.cpp
+        directorymergewindow.cpp
+        merger.cpp
+        pdiff.cpp
+        difftextwindow.cpp
+        diff.cpp
+        optiondialog.cpp
+        mergeresultwindow.cpp
+        fileaccess.cpp
+        gnudiff_analyze.cpp
+        gnudiff_io.cpp
+        gnudiff_xmalloc.cpp
+        common.cpp
+        smalldialogs.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeprint-shared
+     tdeparts-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
+
+
+##### other data
+
+install(
+    FILES kdiff3_shell.rc
+    DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
+)
+
+install(
+    FILES kdiff3part.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES kdiff3_part.rc
+    DESTINATION ${DATA_INSTALL_DIR}/kdiff3part
+)
+
+install(
+    FILES ${PROJECT_NAME}.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
--- a/src/diff.h
+++ b/src/diff.h
@ -118,7 +118,7 @@ struct Diff3Line
      pFineAB=0; pFineBC=0; pFineCA=0;
   }

-   bool operator==( const Diff3Line& d3l )
+   bool operator==( const Diff3Line& d3l ) const
   {
      return lineA == d3l.lineA  &&  lineB == d3l.lineB  &&  lineC == d3l.lineC  
         && bAEqB == d3l.bAEqB  && bAEqC == d3l.bAEqC  && bBEqC == d3l.bBEqC;
--- a/src/gnudiff_analyze.cpp
+++ b/src/gnudiff_analyze.cpp
@ -469,7 +469,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
  for (f = 0; f < 2; f++)
    {
      lin end = filevec[f].buffered_lines;
-      register char *discards = discarded[f];
+      char *discards = discarded[f];

      for (i = 0; i < end; i++)
 	{
@ -479,7 +479,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
 	  else if (discards[i] != 0)
 	    {
 	      /* We have found a nonprovisional discard.  */
-	      register lin j;
+	      lin j;
 	      lin length;
 	      lin provisional = 0;

@ -511,7 +511,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
 		}
 	      else
 		{
-		  register lin consec;
+		  lin consec;
 		  lin minimum = 1;
 		  lin tem = length >> 2;

--- a/src/hi16-app-kdiff3.png
+++ b/src/hi16-app-kdiff3.png
--- a/src/hi32-app-kdiff3.png
+++ b/src/hi32-app-kdiff3.png
--- a/src/kdiff3.lsm
+++ b/src/kdiff3.lsm
@ -1,14 +0,0 @@
-Begin4
-Title:          kdiff3
-Version:        R14.0.0
-Entered-date:   2010-05-10
-Description:    Tool for comparing and merging files or directories
-Keywords:       TDE Qt
-Author:         Joachim Eibl <joachim at gmx.de>
-Maintained-by:  The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
-Primary-site:   http://git.trinitydesktop.org/cgit/
-Alternate-site:
-Original-site:  http://kdiff3.sourceforge.net
-Platforms:      Linux and other Unices running TDE
-Copying-policy: GPL
-End
--- a/src/kdiff3_part.cpp
+++ b/src/kdiff3_part.cpp
@ -296,7 +296,7 @@ TDEInstance* KDiff3PartFactory::instance()
 }

 extern "C"
-{
+{ KDE_EXPORT
    void* init_libkdiff3part()
    {
        return new KDiff3PartFactory;
--- a/src/kreplacements/ShellContextMenu.cpp
+++ b/src/kreplacements/ShellContextMenu.cpp
--- a/src/lo16-app-kdiff3.png
+++ b/src/lo16-app-kdiff3.png
--- a/src/lo32-app-kdiff3.png
+++ b/src/lo32-app-kdiff3.png
--- a/src/smalldialogs.cpp
+++ b/src/smalldialogs.cpp
@ -557,7 +557,7 @@ void RegExpTester::slotRecalc()
   if ( ! bSuccess )
   {
      m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses don't match in regular expression.") );
-      m_pHistorySortKeyResult->setText( i18n("") );
+      m_pHistorySortKeyResult->setText( "" );
      return;
   }
   TQRegExp historyEntryStartRegExp = m_pHistoryEntryStartRegExpEdit->text();
@ -572,7 +572,7 @@ void RegExpTester::slotRecalc()
   else
   {
      m_pHistoryEntryStartMatchResult->setText( i18n("Match failed.") );
-      m_pHistorySortKeyResult->setText( i18n("") );
+      m_pHistorySortKeyResult->setText( "" );
   }
 }
Author	SHA1	Message	Date
Slávek Banko	7aa81c64d3	Update version number for R14.0.8 final release. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	6 years ago
TDE Gitea	b9e0650186	Reset submodule main/applications/kdiff3/cmake to latest HEAD	6 years ago
TDE Gitea	e8f76bb938	Reset submodule main/applications/kdiff3/cmake to latest HEAD	6 years ago
TDE Gitea	472f7a052f	Reset submodule main/applications/kdiff3/cmake to latest HEAD	6 years ago
Slávek Banko	145f8af2f0	Fix FTBFS with clang. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit `0cc35839ad`)	6 years ago
Michele Calgaro	ccf0a4a8c7	Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit `0d584916ac`)	6 years ago
Slávek Banko	3f275edec4	Merge translation files from master branch.	6 years ago
Slávek Banko	55db6faefe	Merge translation files from master branch.	6 years ago
Slávek Banko	e475a1c7c8	Update version number for R14.0.7 final release. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	6 years ago
Slávek Banko	1493e9c4ea	Merge translation files from master branch.	6 years ago
TDE Gitea	c982125649	Reset submodule main/applications/kdiff3/cmake to latest HEAD	6 years ago
Slávek Banko	7a90957068	Switch all submodules to https. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	6 years ago
Slávek Banko	a09ae58928	Merge translation files from master branch.	6 years ago
Slávek Banko	cbeccbd716	Merge translation files from master branch.	6 years ago
gregory guy	f0d1542166	conversion to the cmake building system Signed-off-by: gregory guy <g-gregory@gmx.fr> (cherry picked from commit `ac4ae19235`)	6 years ago
Michele Calgaro	9a760d51f6	Removed .lsm files. lsm database is outdated and unmaintained. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	6 years ago
Slávek Banko	33e38eda3d	Merge translation files from master branch.	6 years ago
TDE Gitea	e90553564e	Reset submodule main/applications/kdiff3/cmake to latest HEAD	6 years ago
Slávek Banko	cb7d816f3b	Merge translation files from master branch.	6 years ago
TDE Gitea	b876b50ab7	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	656f8b6ee2	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
Michele Calgaro	74ea4343a9	Updated date and version to R14.0.6 in .lsm files. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	7 years ago
TDE Gitea	c0d34b748d	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	ee0af1a0f7	Reset submodule main/applications/kdiff3/admin to latest HEAD	7 years ago
TDE Gitea	eae5bc4b59	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	b85d03f35d	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Weblate	dc30eb73ab	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ (cherry picked from commit `e98834131e`)	7 years ago
Slávek Banko	e60af22420	Update translation template. (cherry picked from commit `1ee2d43781`)	7 years ago
TDE Gitea	03f2c0da20	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	3bb6dc4db1	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Weblate	4ac10974a3	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 - plugin Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/ (cherry picked from commit `938564a538`)	7 years ago
TDE Weblate	ae9fc8a562	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 - diff_ext Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/ (cherry picked from commit `7aaa41bf65`)	7 years ago
TDE Weblate	864c4269a4	Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: applications/kdiff3 Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ (cherry picked from commit `7637a92a1d`)	7 years ago
Slávek Banko	f3d0b3161a	Add CMakeL10n rules. Update translation templates. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit `0ee39c1ce9`)	7 years ago
TDE Gitea	4199c8efda	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	4f985efbdc	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	da154809a6	Reset submodule main/applications/kdiff3/admin to latest HEAD	7 years ago
TDE Gitea	fdbb497091	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
TDE Gitea	b982540dd2	Reset submodule main/applications/kdiff3/cmake to latest HEAD	7 years ago
Slávek Banko	8787ef3eec	Remove incorrect header lines from PO files Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit `995b421d1b`)	7 years ago
TDE Gitea	bd0b9d618b	Reset submodule main/applications/kdiff3/admin to latest HEAD	7 years ago
Michele Calgaro	dd4c68e9fe	Removed unnecessary executable flag. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit `9d3be1c6ea`)	7 years ago
Slávek Banko	442ad853c9	Update version numbers and date for R14.0.5 final release	7 years ago
Slávek Banko	8db7f6f7a9	Reset submodule main/applications/kdiff3/admin to latest HEAD	7 years ago
Slávek Banko	f33bb98497	Reset submodule main/applications/kdiff3/admin to latest HEAD	7 years ago
Slávek Banko	56d9580702	Reset submodule main/applications/kdiff3/admin to latest HEAD	8 years ago
Slávek Banko	ac93282c19	Reset submodule main/applications/kdiff3/cmake to latest HEAD	9 years ago
Slávek Banko	f2f4184ace	Reset submodule main/applications/kdiff3/cmake to latest HEAD	9 years ago
Slávek Banko	29849c36a2	Reset submodule main/applications/kdiff3/cmake to latest HEAD	9 years ago
Slávek Banko	c1ad1d97b3	Reset submodule main/applications/kdiff3/cmake to latest HEAD	9 years ago
Slávek Banko	655d2e7635	Reset submodule main/applications/kdiff3/admin to latest HEAD	9 years ago
Slávek Banko	4aeb3fc135	cmake: add tde_add_check_executable macro	9 years ago
Slávek Banko	dc8e83ff6c	Update version number for new target R14.0.5	9 years ago
Slávek Banko	d85cf15ed3	Update date in lsm files	9 years ago
Slávek Banko	ca4e31fbf0	Reset submodule main/applications/kdiff3/admin to latest HEAD	9 years ago
Timothy Pearson	7d0941ce81	Fix invalid headers in PNG files and optimize for size (cherry picked from commit `7f392bb439`)	9 years ago
Slávek Banko	f909f523f7	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	727e2f3f6d	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	4b9b1cda35	Update version number for new target R14.0.4	10 years ago
Slávek Banko	fc3447242d	Update date in lsm files	10 years ago
Slávek Banko	7c759e6dde	Update version number for new target R14.0.3	10 years ago
Slávek Banko	59acfef91e	Update date in lsm files	10 years ago
Slávek Banko	d654d1f725	Update version number for new target R14.0.2	10 years ago
Slávek Banko	fc851c9203	Update date in lsm files	10 years ago
Slávek Banko	31ad8579e3	Update version in lsm files	10 years ago
Slávek Banko	74f8700c53	Reset submodule main/applications/kdiff3/cmake to latest HEAD	10 years ago
Slávek Banko	82c00ad239	Reset submodule main/applications/kdiff3/cmake to latest HEAD	11 years ago
Slávek Banko	b2e84ea9a6	Reset submodule main/applications/kdiff3/admin to latest HEAD	11 years ago
Michele Calgaro	db127cd70c	Fixed wrong DocPath strings. This relates to bug 2319. (cherry picked from commit `23ca514701`) Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	11 years ago
				`@ -0,0 +1 @@`
				`tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG da )`