Update version number for R14.0.8 final release.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.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

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( )

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 )

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 )

admin

@@ -1 +1 @@
-Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
+Subproject commit f9148018b2f8a11fd830712c1b508046cc34ff22

cmake

@@ -1 +1 @@
-Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
+Subproject commit ca47fa83300e843f1e469e3f455e58aa299e1e9d

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@

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
+)

diff_ext_for_kdiff3/CMakeL10n.txt

@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "diff_ext"
+    DESTINATION "."
+)

diff_ext_for_kdiff3/diff_ext.pot

@@ -1,96 +1,116 @@
-# Diff-ext-for-KDiff3
+# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2006 Joachim Eibl
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 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.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"POT-Creation-Date: 2006-10-03 06:05+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"
 "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
+#: _translatorinfo:1
-msgid "Compare with"
+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
+#: diff_ext.cpp:389
-msgid "Save '%1' for later comparison or merge"
+msgid "Save '%1' for later"
 msgstr ""
 
-#: diff_ext.cpp:408
+#: diff_ext.cpp:404
-msgid "Compare"
+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 ""

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"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2019-08-28 23:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Chris <xchrisx@uber.space>\n"
-"Language-Team: LANGUAGE <LL@li.org>\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
+#: diff_ext.cpp:407
-msgid "Compare"
-msgstr "Vergleichen"
-
-#: diff_ext.cpp:403
 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
+#: diff_ext.cpp:494
-msgid "See the homepage http://diff-ext.sourceforge.net"
+msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
-msgstr "Siehe die Homepage http://diff-ext.sourceforge.net"
+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
+#: diff_ext.cpp:533
-msgid "Merke '%1' für spätere Aktion"
+msgid "Save '%1' for later operation"
-msgstr ""
+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"

doc/CMakeLists.txt

@@ -0,0 +1 @@
+tde_auto_add_subdirectories( )

doc/da/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG da )

doc/de/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de )

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
+)

doc/es/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG es )

doc/et/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG et )

doc/fr/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr )

doc/it/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG it )

doc/nl/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG nl )

doc/pt/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG pt )

doc/sv/CMakeLists.txt

@@ -0,0 +1 @@
+tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG sv )

kdiff3plugin/CMakeL10n.txt

@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "kdiff3_plugin"
+    DESTINATION "po"
+)

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
+)

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

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( )

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"
 "Същото важи и за сливането и сравняването на директории."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. "
-"ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med\" for "
+"Den ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med"
-"den anden fil.\n"
+"\" 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 "
+"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden "
-"som bruges som mål.\n"
+"gren som bruges som mål.\n"
 "Det samme gælder også for mappesammenligning og sammenfletning."

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"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: 2007-01-29 22:54+0100\n"
+"PO-Revision-Date: 2019-11-23 12:55+0000\n"
-"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
+"Last-Translator: Chris <xchrisx@uber.space>\n"
-"Language-Team: German <kde-i18n-de@kde.org>\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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste "
-"zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
+"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 "
+"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die Basis-"
-"Basis-Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit "
+"Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit der "
-"der zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
+"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 "
+"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen "
-"Ordnern."
+"von Ordnern."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"
 "Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel "
-"variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, mida kasutatakse "
+"ühendatav variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, "
-"sihtfailina.\n"
+"mida kasutatakse sihtfailina.\n"
 "Sama käib kataloogide võrdlemise ja ühendamise kohta."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"

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"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: 2006-11-22 07:28+0100\n"
+"PO-Revision-Date: 2019-05-30 18:15+0000\n"
-"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
+"Last-Translator: stefano <ifx@lazytux.it>\n"
-"Language-Team: Italian <kde-i18n-it@kde.org>\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\">"
+"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">kdiff3."
-"kdiff3.sourceforge.net</a>\n"
+"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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà "
-"sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo file.\n"
+"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."

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 ""

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". "
-"daarna \"Vergelijken met\" voor het tweede bestand.\n"
+"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 "
+"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de "
-"die gebruikt zal worden als bestemming.\n"
+"tak die gebruikt zal worden als bestemming.\n"
 "Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
 "directories."

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"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: 2006-11-19 14:49+0000\n"
+"PO-Revision-Date: 2020-01-05 23:45+0000\n"
-"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
+"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
-"Language-Team: pt <kde-i18n-pt@kde.org>\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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" "
-"outra ramificação que será usada como destino.\n"
+"na outra ramificação que será usada como destino.\n"
 "O mesmo se aplica também à comparação e junção de pastas."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"

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"
+"POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: 2006-11-19 16:30+0100\n"
+"PO-Revision-Date: 2019-12-04 23:59+0000\n"
-"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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ý."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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\" "
+"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 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 "
+"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen "
-"används som mål.\n"
+"som används som mål.\n"
 "Detsamma gäller också för katalogjämförelse och sammanfogning."

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 "
+"If the other file is somewhere else \"Save\" the first file for later. It "
-"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
+"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
-"file.\n"
+"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"

man/CMakeLists.txt

@@ -0,0 +1,5 @@
+INSTALL(
+    FILES ${PROJECT_NAME}.1
+    DESTINATION ${MAN_INSTALL_DIR}/man1
+    COMPONENT doc
+)

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( )

src/CMakeL10n.txt

@@ -0,0 +1,6 @@
+##### create translation templates ##############
+
+tde_l10n_create_template(
+    CATALOG "kdiff3"
+    EXCLUDES "^kreplacements/"
+)

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}
+)

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;

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;
 

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

src/kdiff3_part.cpp

@@ -296,7 +296,7 @@ TDEInstance* KDiff3PartFactory::instance()
 }
 
 extern "C"
-{
+{ KDE_EXPORT
     void* init_libkdiff3part()
     {
         return new KDiff3PartFactory;

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( "" );
    }
 }