Added abandoned KDE3 version of kdiff3

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

22 files changed, 2216 insertions, 0 deletions

diff --git a/kdiff3plugin/Makefile.am b/kdiff3plugin/Makefile.am
new file mode 100644
index 0000000..2a4e129
--- /dev/null
+++ b/kdiff3plugin/Makefile.am
@@ -0,0 +1,20 @@
+INCLUDES    = $(all_includes)
+METASOURCES = AUTO
+
+# Install this plugin in the KDE modules directory
+kde_module_LTLIBRARIES = libkdiff3plugin.la
+
+libkdiff3plugin_la_SOURCES = kdiff3plugin.cpp
+libkdiff3plugin_la_LIBADD = -lkonq
+libkdiff3plugin_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN)
+
+#KDE_ICON = KDiff3
+
+pluginsdir   = $(kde_servicesdir)
+plugins_DATA = kdiff3_plugin.desktop
+
+appsdir = $(kde_appsdir)/.hidden
+apps_DATA = kdiff3plugin.desktop
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot
diff --git a/kdiff3plugin/kdiff3_plugin.desktop b/kdiff3plugin/kdiff3_plugin.desktop
new file mode 100644
index 0000000..ec8e730
--- /dev/null
+++ b/kdiff3plugin/kdiff3_plugin.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+Name=Compare/Merge Files/Directories
+X-KDE-Library=libkdiff3plugin
+ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/kdiff3plugin/kdiff3plugin.cpp b/kdiff3plugin/kdiff3plugin.cpp
new file mode 100755
index 0000000..293f899
--- /dev/null
+++ b/kdiff3plugin/kdiff3plugin.cpp
@@ -0,0 +1,263 @@
+/* This file is part of the KDiff3 project
+
+   Copyright (C) 2006 Joachim Eibl <joachim dot eibl at gmx dot de>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; version 2
+   of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "kdiff3plugin.h"
+
+#include <kapplication.h>
+#include <kstandarddirs.h>
+#include <kaction.h>
+#include <klocale.h>
+#include <kgenericfactory.h>
+#include <kurl.h>
+#include <ksimpleconfig.h>
+#include <kmessagebox.h>
+
+//#include <iostream>
+
+static QStringList* s_pHistory=0;
+
+class KDiff3PluginFactory : public KGenericFactory < KDiff3Plugin, KonqPopupMenu >
+{
+   KSimpleConfig* m_pConfig;
+public:
+   KDiff3PluginFactory( const char* instanceName  = 0 )
+   : KGenericFactory< KDiff3Plugin, KonqPopupMenu >( instanceName )
+   {
+      m_pConfig = 0;
+      if (s_pHistory==0)
+      {
+         //std::cout << "New History: " << instanceName << std::endl;
+         s_pHistory = new QStringList;
+         m_pConfig = new KSimpleConfig( "kdiff3pluginrc", false );
+         *s_pHistory = m_pConfig->readListEntry("HistoryStack");
+      }
+   }
+
+   ~KDiff3PluginFactory()
+   {
+      //std::cout << "Delete History" << std::endl;
+      if ( s_pHistory && m_pConfig )
+         m_pConfig->writeEntry("HistoryStack",*s_pHistory);
+      delete s_pHistory;
+      delete m_pConfig;
+      s_pHistory = 0;
+      m_pConfig = 0;
+   }
+};
+
+K_EXPORT_COMPONENT_FACTORY (libkdiff3plugin, KDiff3PluginFactory ("kdiff3plugin"))
+
+KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const QStringList & /* list */ )
+:KonqPopupMenuPlugin (pPopupmenu, name)
+{
+   if (KStandardDirs::findExe ("kdiff3").isNull ())
+      return;
+
+   m_pParentWidget = pPopupmenu->parentWidget();
+
+   KGlobal::locale()->insertCatalogue("kdiff3_plugin");
+
+   // remember currently selected files (copy to a QStringList)
+   KFileItemList itemList = pPopupmenu->fileItemList();
+   for ( KFileItem *item = itemList.first(); item; item = itemList.next() )
+   {
+      //m_urlList.append( item->url() );
+      m_list.append( item->url().url() );
+   }
+
+
+   /* Menu structure:
+      KDiff3 -> (1 File selected):  Save 'selection' for later comparison (push onto history stack)
+                                    Compare 'selection' with first file on history stack.
+                                    Compare 'selection' with -> choice from history stack
+                                    Merge 'selection' with first file on history stack.
+                                    Merge 'selection' with last two files on history stack.
+                (2 Files selected): Compare 's1' with 's2'
+                                    Merge 's1' with 's2'
+                (3 Files selected): Compare 's1', 's2' and 's3'
+   */
+
+   KActionMenu* pActionMenu = new KActionMenu (i18n ("KDiff3"), "kdiff3", actionCollection (), "kdiff3_menu" );
+   KAction* pAction = 0;
+   QString s;
+
+   if(m_list.count() == 1)
+   {
+      int historyCount = s_pHistory ? s_pHistory->count() : 0;
+      s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : QString() );
+      pAction = new KAction ( s,0, this, SLOT(slotCompareWith()), actionCollection());
+      pAction->setEnabled( m_list.count()>0 && historyCount>0 );
+      pActionMenu->insert (pAction);
+
+      s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : QString() );
+      pAction = new KAction( s, 0, this, SLOT(slotMergeWith()), actionCollection());
+      pAction->setEnabled( m_list.count()>0 && historyCount>0 );
+      pActionMenu->insert (pAction);
+
+      s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
+      pAction = new KAction ( s, 0, this, SLOT(slotSaveForLater()), actionCollection());
+      pAction->setEnabled( m_list.count()>0 );
+      pActionMenu->insert(pAction);
+
+      pAction = new KAction (i18n("3-way merge with base"), 0, this, SLOT(slotMergeThreeWay()), actionCollection());
+      pAction->setEnabled( m_list.count()>0 && historyCount>=2 );
+      pActionMenu->insert (pAction);
+
+      if ( s_pHistory && !s_pHistory->empty() )
+      {
+         KActionMenu* pHistoryMenu = new KActionMenu( i18n("Compare with ..."), "CompareWith", actionCollection (), "kdiff3_history_menu");
+         pHistoryMenu->setEnabled( m_list.count()>0 && historyCount>0 );
+         pActionMenu->insert(pHistoryMenu);
+         for (QStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i)
+         {
+            pAction = new KAction( *i, "History", 0, this, SLOT(slotCompareWithHistoryItem()), actionCollection());
+            pHistoryMenu->insert (pAction);
+         }
+
+         pAction = new KAction (i18n("Clear list"), 0, this, SLOT(slotClearList()), actionCollection());
+         pActionMenu->insert (pAction);
+         pAction->setEnabled( historyCount>0 );
+      }
+   }
+   else if(m_list.count() == 2)
+   {
+      pAction = new KAction (i18n("Compare"), 0, this, SLOT(slotCompareTwoFiles()), actionCollection());
+      pActionMenu->insert (pAction);
+   }
+   else if ( m_list.count() == 3 )
+   {
+      pAction = new KAction (i18n("3 way comparison"), 0, this, SLOT(slotCompareThreeFiles()), actionCollection());
+      pActionMenu->insert (pAction);
+   }
+   pAction = new KAction (i18n("About KDiff3 menu plugin ..."), 0, this, SLOT(slotAbout()), actionCollection());
+   pActionMenu->insert (pAction);
+
+   addSeparator();
+   addAction( pActionMenu );
+   addSeparator();
+}
+
+KDiff3Plugin::~KDiff3Plugin ()
+{
+}
+
+void KDiff3Plugin::slotCompareWith()
+{
+   if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() )
+   {
+      QStringList args;
+      args << s_pHistory->front();
+      args << m_list.front();
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotCompareWithHistoryItem()
+{
+   const KAction* pAction = dynamic_cast<const KAction*>( sender() );
+   if ( m_list.count() > 0 && pAction )
+   {
+      QStringList args;
+      args << pAction->text();
+      args << m_list.front();
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotCompareTwoFiles()
+{
+   if ( m_list.count() == 2 )
+   {
+      QStringList args;
+      args << m_list.front();
+      args << m_list.back();
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotCompareThreeFiles()
+{
+   if ( m_list.count() == 3 )
+   {
+      QStringList args;
+      args << m_list[0];
+      args << m_list[1];
+      args << m_list[2];
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotMergeWith()
+{
+   if ( m_list.count() > 0 && s_pHistory && ! s_pHistory->empty() )
+   {
+      QStringList args;
+      args << s_pHistory->front();
+      args << m_list.front();
+      args << ( "-o" + m_list.front() );
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotMergeThreeWay()
+{
+   if ( m_list.count() > 0 && s_pHistory &&  s_pHistory->count()>=2 )
+   {
+      QStringList args;
+      args << (*s_pHistory)[1];
+      args << (*s_pHistory)[0];
+      args << m_list.front();
+      args << ("-o" + m_list.front());
+      kapp->kdeinitExec ("kdiff3", args);
+   }
+}
+
+void KDiff3Plugin::slotSaveForLater()
+{
+   if ( !m_list.isEmpty() && s_pHistory )
+   {
+      while ( s_pHistory->count()>=10 )
+         s_pHistory->pop_back();
+      s_pHistory->push_front( m_list.front() );
+   }
+}
+
+void KDiff3Plugin::slotClearList()
+{
+   if ( s_pHistory )
+      s_pHistory->clear();
+}
+
+void KDiff3Plugin::slotAbout()
+{
+   QString s = i18n("KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+                    "KDiff3 homepage: http://kdiff3.sourceforge.net\n\n");
+   s += i18n("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.");
+   KMessageBox::information(m_pParentWidget, s, tr("About KDiff3 Menu Plugin") );
+}
+
+#include "kdiff3plugin.moc"
diff --git a/kdiff3plugin/kdiff3plugin.desktop b/kdiff3plugin/kdiff3plugin.desktop
new file mode 100644
index 0000000..ce3e9b8
--- /dev/null
+++ b/kdiff3plugin/kdiff3plugin.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Service
+Name=Compare/Merge Files/Directories with KDiff3
+Icon=kdiff3
+X-KDE-ParentApp=konqueror
+#DocPath=konq-plugins/kdiff3plugin/index.html
\ No newline at end of file
diff --git a/kdiff3plugin/kdiff3plugin.h b/kdiff3plugin/kdiff3plugin.h
new file mode 100755
index 0000000..14ebf60
--- /dev/null
+++ b/kdiff3plugin/kdiff3plugin.h
@@ -0,0 +1,50 @@
+/* This file is part of the KDiff3 project
+
+   Copyright (C) 2006 Joachim Eibl <Joachim dot Eibl at gmx dot de>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; version 2
+   of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef _KDIFF3PLUGIN_H_
+#define _KDIFF3PLUGIN_H_
+
+#include <konq_popupmenu.h>
+
+class QStringList;
+
+class KDiff3Plugin : public KonqPopupMenuPlugin
+{
+   Q_OBJECT 
+public:
+  KDiff3Plugin (KonqPopupMenu *, const char *name, const QStringList & list);
+  virtual ~KDiff3Plugin();
+
+private slots:
+   void slotCompareWith();
+   void slotCompareTwoFiles();
+   void slotCompareThreeFiles();
+   void slotMergeWith();
+   void slotMergeThreeWay();
+   void slotSaveForLater();
+   void slotClearList();
+   void slotCompareWithHistoryItem();
+   void slotAbout();
+
+private:
+   QStringList m_list;
+   QWidget* m_pParentWidget;
+};
+#endif
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
new file mode 100644
index 0000000..934149d
--- /dev/null
+++ b/kdiff3plugin/po/Makefile
@@ -0,0 +1,661 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# KDE tags expanded automatically by am_edit - $Revision: 483858 $ 
+# kdiff3plugin/po/Makefile.  Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+srcdir = .
+top_srcdir = ../..
+
+pkgdatadir = $(datadir)/kdiff3
+pkglibdir = $(libdir)/kdiff3
+pkgincludedir = $(includedir)/kdiff3
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c -p
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
+subdir = kdiff3plugin/po
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 1
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+#>+ 1
+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ACLOCAL = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run aclocal-1.9
+AMDEP_FALSE = #
+AMDEP_TRUE = 
+AMTAR = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run tar
+AR = ar
+ARTSCCONFIG = /usr/bin/artsc-config
+AUTOCONF = $(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure
+AUTODIRS = 
+AUTOHEADER = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run automake-1.9
+AWK = gawk
+CC = i486-linux-gnu-gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -O2  -Wall -g -O2 -Wformat-security -Wmissing-format-attribute
+CONF_FILES =  $(top_srcdir)/./admin/configure.in.min $(top_srcdir)/configure.in.in
+CPP = i486-linux-gnu-gcc -E
+CPPFLAGS =  -DQT_THREAD_SUPPORT  -D_REENTRANT
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common
+CYGPATH_W = echo
+DCOPIDL = /usr/bin/dcopidl
+DCOPIDL2CPP = /usr/bin/dcopidl2cpp
+DCOPIDLNG = /usr/bin/dcopidlng
+DCOP_DEPENDENCIES = $(DCOPIDL) $(DCOPIDLNG)
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO = echo
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = /bin/grep -E
+ENABLE_PERMISSIVE_FLAG = -fpermissive
+EXEEXT = 
+F77 = 
+FFLAGS = 
+FRAMEWORK_COREAUDIO = 
+GMSGFMT = /usr/bin/msgfmt
+GREP = /bin/grep
+HAVE_GCC_VISIBILITY = 0
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
+KCONFIG_COMPILER = /usr/bin/kconfig_compiler
+KDECONFIG = /usr/bin/kde-config
+KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
+KDE_EXTRA_RPATH = 
+KDE_INCLUDES = -I/usr/include/kde
+KDE_LDFLAGS = -L/usr/lib
+KDE_MT_LDFLAGS = 
+KDE_MT_LIBS = -lpthread
+KDE_NO_UNDEFINED = -Wl,--no-undefined -Wl,--allow-shlib-undefined
+KDE_PLUGIN = -avoid-version -module -no-undefined $(KDE_NO_UNDEFINED) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+KDE_RPATH = 
+KDE_USE_CLOSURE_FALSE = 
+KDE_USE_CLOSURE_TRUE = #
+KDE_USE_FINAL_FALSE = 
+KDE_USE_FINAL_TRUE = #
+KDE_USE_FPIE = -fPIE
+KDE_USE_NMCHECK_FALSE = 
+KDE_USE_NMCHECK_TRUE = #
+KDE_USE_PIE = -pie
+KDE_XSL_STYLESHEET = /usr/share/apps/ksgmltools2/customization/kde-chunk.xsl
+LDFLAGS = 
+LDFLAGS_AS_NEEDED = 
+LDFLAGS_NEW_DTAGS = 
+LIBCOMPAT = 
+LIBCRYPT = -lcrypt
+LIBDL = -ldl
+LIBJPEG = -ljpeg
+LIBOBJS = 
+LIBPNG = -lpng -lz -lm
+LIBPTHREAD = -lpthread
+LIBRESOLV = -lresolv
+LIBS = 
+LIBSM = -lSM -lICE
+LIBSOCKET = 
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LIBUCB = 
+LIBUTIL = -lutil
+LIBZ = -lz
+LIB_KAB = -lkab
+LIB_KABC = -lkabc
+LIB_KDECORE = -lkdecore
+LIB_KDED = 
+LIB_KDEPIM = -lkdepim
+LIB_KDEPRINT = -lkdeprint
+LIB_KDEUI = -lkdeui
+LIB_KDNSSD = -lkdnssd
+LIB_KFILE = -lkio
+LIB_KFM = 
+LIB_KHTML = -lkhtml
+LIB_KIMPROXY = -lkimproxy
+LIB_KIO = -lkio
+LIB_KJS = -lkjs
+LIB_KNEWSTUFF = -lknewstuff
+LIB_KPARTS = -lkparts
+LIB_KSPELL = -lkspell
+LIB_KSYCOCA = -lkio
+LIB_KUNITTEST = -lkunittest
+LIB_KUTILS = -lkutils
+LIB_POLL = 
+LIB_QPE = 
+LIB_QT = -lqt-mt  $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread
+LIB_SMB = -lsmb
+LIB_X11 = -lX11 $(LIBSOCKET)
+LIB_XEXT = -lXext
+LIB_XRENDER = 
+LN_S = ln -s
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/missing --run makeinfo
+MAKEKDEWIDGETS = 
+MCOPIDL = /usr/bin/mcopidl
+MEINPROC = /usr/bin/meinproc
+MOC = /usr/share/qt3/bin/moc
+MSGFMT = /usr/bin/msgfmt
+NOOPT_CFLAGS = -O0
+NOOPT_CXXFLAGS = -O0
+OBJEXT = o
+PACKAGE = kdiff3_plugin
+PACKAGE_BUGREPORT = 
+PACKAGE_NAME = 
+PACKAGE_STRING = 
+PACKAGE_TARNAME = 
+PACKAGE_VERSION = 
+PATH_SEPARATOR = :
+PERL = /usr/bin/perl
+QTE_NORTTI = 
+QT_INCLUDES = -I/usr/include/qt3
+QT_LDFLAGS = -L/usr/share/qt3/lib
+RANLIB = ranlib
+SET_MAKE = 
+SHELL = /bin/sh
+STRIP = strip
+TOPSUBDIRS =  doc kdiff3plugin po src
+UIC = /usr/share/qt3/bin/uic -L $(kde_widgetdir) -nounload
+UIC_TR = tr2i18n
+USER_INCLUDES = 
+USER_LDFLAGS = 
+USE_EXCEPTIONS = -fexceptions
+USE_RTTI = 
+USE_THREADS = 
+VERSION = 0.9.92
+WOVERLOADED_VIRTUAL = 
+XGETTEXT = /usr/bin/xgettext
+XMKMF = 
+XMLLINT = /usr/bin/xmllint
+X_EXTRA_LIBS = 
+X_INCLUDES = -I.
+X_LDFLAGS = -L/usr/lib
+X_PRE_LIBS = 
+X_RPATH = 
+ac_ct_CC = 
+ac_ct_CXX = 
+ac_ct_F77 = 
+all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. 
+all_libraries = -L/usr/share/qt3/lib -L/usr/lib   
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
+build_os = linux-gnu
+build_vendor = pc
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+include_ARTS_FALSE = #
+include_ARTS_TRUE = 
+include_libkonq_FALSE = #
+include_libkonq_TRUE = 
+include_x11_FALSE = #
+include_x11_TRUE = 
+includedir = ${prefix}/include
+infodir = ${prefix}/share/info
+install_sh = /home/eike/devel/debian/kdiff3/kdiff3-0.9.92/admin/install-sh
+kde_appsdir = ${datadir}/applnk
+kde_bindir = ${exec_prefix}/bin
+kde_confdir = ${datadir}/config
+kde_datadir = ${datadir}/apps
+kde_htmldir = ${datadir}/doc/HTML
+kde_icondir = ${datadir}/icons
+kde_includes = /usr/include/kde
+kde_kcfgdir = ${datadir}/config.kcfg
+kde_libraries = /usr/lib
+kde_libs_htmldir = /usr/share/doc/kde/HTML
+kde_libs_prefix = /usr
+kde_locale = ${datadir}/locale
+kde_mimedir = ${datadir}/mimelnk
+kde_moduledir = ${libdir}/kde3
+kde_qtver = 3
+kde_servicesdir = ${datadir}/services
+kde_servicetypesdir = ${datadir}/servicetypes
+kde_sounddir = ${datadir}/sounds
+kde_styledir = ${libdir}/kde3/plugins/styles
+kde_templatesdir = ${datadir}/templates
+kde_wallpaperdir = ${datadir}/wallpapers
+kde_widgetdir = /usr/lib/kde3/plugins/designer
+kdeinitdir = $(kde_moduledir)
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${prefix}/share/man
+mkdir_p = mkdir -p --
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr
+program_transform_name = s,x,x,
+psdir = ${docdir}
+qt_includes = /usr/include/qt3
+qt_libraries = /usr/share/qt3/lib
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = ${prefix}/etc
+target = i486-pc-linux-gnu
+target_alias = 
+target_cpu = i486
+target_os = linux-gnu
+target_vendor = pc
+unsermake_enable_pch_FALSE = 
+unsermake_enable_pch_TRUE = #
+x_includes = .
+x_libraries = /usr/lib
+xdg_appsdir = ${datadir}/applications/kde
+xdg_directorydir = ${datadir}/desktop-directories
+xdg_menudir = ${sysconfdir}/xdg/menus
+#>- POFILES = AUTO
+#>+ 2
+POFILES = pt.po it.po br.po cs.po sv.po pt_BR.po tr.po et.po bg.po sk.po da.po de.po ga.po nl.po el.po
+GMOFILES = pt.gmo it.gmo br.gmo cs.gmo sv.gmo pt_BR.gmo tr.gmo et.gmo bg.gmo sk.gmo da.gmo de.gmo ga.gmo nl.gmo el.gmo
+#>- all: all-am
+#>+ 1
+all: all-nls docs-am  all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+#>- 	@for dep in $?; do \
+#>- 	  case '$(am__configure_deps)' in \
+#>- 	    *$$dep*) \
+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+#>- 		&& exit 0; \
+#>- 	      exit 1;; \
+#>- 	  esac; \
+#>- 	done; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile'; \
+#>- 	cd $(top_srcdir) && \
+#>- 	  $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile
+#>+ 12
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile
+	cd $(top_srcdir) && perl admin/am_edit kdiff3plugin/po/Makefile.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+#>- distdir: $(DISTFILES)
+#>+ 1
+distdir: distdir-nls  $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+#>- uninstall: uninstall-am
+#>+ 1
+uninstall: uninstall-nls  uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+#>- clean: clean-am
+#>+ 1
+clean: kde-rpo-clean  clean-am
+
+#>- clean-am: clean-generic clean-libtool mostlyclean-am
+#>+ 1
+clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+#>- install-data-am:
+#>+ 1
+install-data-am: install-nls 
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+#>- maintainer-clean: maintainer-clean-am
+#>+ 1
+maintainer-clean: clean-nls  maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+
+#>+ 2
+KDE_DIST=nl.po pt.po da.po de.po et.po el.po cs.po tr.po Makefile.in bg.po pt_BR.po sv.po br.po sk.po it.po ga.po Makefile.am 
+
+#>+ 46
+pt.gmo: pt.po
+	rm -f pt.gmo; $(GMSGFMT) -o pt.gmo $(srcdir)/pt.po
+	test ! -f pt.gmo || touch pt.gmo
+it.gmo: it.po
+	rm -f it.gmo; $(GMSGFMT) -o it.gmo $(srcdir)/it.po
+	test ! -f it.gmo || touch it.gmo
+br.gmo: br.po
+	rm -f br.gmo; $(GMSGFMT) -o br.gmo $(srcdir)/br.po
+	test ! -f br.gmo || touch br.gmo
+cs.gmo: cs.po
+	rm -f cs.gmo; $(GMSGFMT) -o cs.gmo $(srcdir)/cs.po
+	test ! -f cs.gmo || touch cs.gmo
+sv.gmo: sv.po
+	rm -f sv.gmo; $(GMSGFMT) -o sv.gmo $(srcdir)/sv.po
+	test ! -f sv.gmo || touch sv.gmo
+pt_BR.gmo: pt_BR.po
+	rm -f pt_BR.gmo; $(GMSGFMT) -o pt_BR.gmo $(srcdir)/pt_BR.po
+	test ! -f pt_BR.gmo || touch pt_BR.gmo
+tr.gmo: tr.po
+	rm -f tr.gmo; $(GMSGFMT) -o tr.gmo $(srcdir)/tr.po
+	test ! -f tr.gmo || touch tr.gmo
+et.gmo: et.po
+	rm -f et.gmo; $(GMSGFMT) -o et.gmo $(srcdir)/et.po
+	test ! -f et.gmo || touch et.gmo
+bg.gmo: bg.po
+	rm -f bg.gmo; $(GMSGFMT) -o bg.gmo $(srcdir)/bg.po
+	test ! -f bg.gmo || touch bg.gmo
+sk.gmo: sk.po
+	rm -f sk.gmo; $(GMSGFMT) -o sk.gmo $(srcdir)/sk.po
+	test ! -f sk.gmo || touch sk.gmo
+da.gmo: da.po
+	rm -f da.gmo; $(GMSGFMT) -o da.gmo $(srcdir)/da.po
+	test ! -f da.gmo || touch da.gmo
+de.gmo: de.po
+	rm -f de.gmo; $(GMSGFMT) -o de.gmo $(srcdir)/de.po
+	test ! -f de.gmo || touch de.gmo
+ga.gmo: ga.po
+	rm -f ga.gmo; $(GMSGFMT) -o ga.gmo $(srcdir)/ga.po
+	test ! -f ga.gmo || touch ga.gmo
+nl.gmo: nl.po
+	rm -f nl.gmo; $(GMSGFMT) -o nl.gmo $(srcdir)/nl.po
+	test ! -f nl.gmo || touch nl.gmo
+el.gmo: el.po
+	rm -f el.gmo; $(GMSGFMT) -o el.gmo $(srcdir)/el.po
+	test ! -f el.gmo || touch el.gmo
+
+#>+ 3
+clean-nls:
+	-rm -f  pt.gmo it.gmo br.gmo cs.gmo sv.gmo pt_BR.gmo tr.gmo et.gmo bg.gmo sk.gmo da.gmo de.gmo ga.gmo nl.gmo el.gmo
+
+#>+ 10
+install-nls:
+	@for base in pt it br cs sv pt_BR tr et bg sk da de ga nl el ; do \
+	  echo $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
+	  $(mkinstalldirs) $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES ; \
+	  if test -f $$base.gmo; then $(INSTALL_DATA) $$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
+	  elif test -f $(srcdir)/$$base.gmo; then $(INSTALL_DATA) $(srcdir)/$$base.gmo $(DESTDIR)$(kde_locale)/$$base/LC_MESSAGES/$(PACKAGE).mo ;\
+	  fi ;\
+	done
+
+
+#>+ 17
+uninstall-nls:
+	rm -f $(DESTDIR)$(kde_locale)/pt/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/it/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/br/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/cs/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/sv/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/pt_BR/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/tr/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/et/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/bg/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/sk/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/da/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/de/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/ga/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/nl/LC_MESSAGES/$(PACKAGE).mo
+	rm -f $(DESTDIR)$(kde_locale)/el/LC_MESSAGES/$(PACKAGE).mo
+
+#>+ 2
+all-nls: $(GMOFILES)
+
+#>+ 8
+distdir-nls:$(GMOFILES)
+	for file in $(POFILES); do \
+	  cp $(srcdir)/$$file $(distdir); \
+	done
+	for file in $(GMOFILES); do \
+	  cp $(srcdir)/$$file $(distdir); \
+	done
+
+#>+ 4
+merge:
+	$(MAKE) -f $(top_srcdir)/admin/Makefile.common package-merge POFILES="${POFILES}" PACKAGE=${PACKAGE}
+
+
+#>+ 2
+docs-am:
+
+#>+ 15
+force-reedit:
+		@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  kdiff3plugin/po/Makefile
+	cd $(top_srcdir) && perl admin/am_edit kdiff3plugin/po/Makefile.in
+
+
+#>+ 21
+clean-bcheck: 
+	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
+
+bcheck: bcheck-am
+
+bcheck-am:
+	@for i in ; do \
+	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
+	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
+	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
+	        echo "$$i"; \
+	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+	            rm -f $$i.bchecktest.cc; exit 1; \
+	        fi ; \
+	        echo "" >> $$i.bchecktest.cc.class; \
+	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
+	        rm -f a.out; \
+	    fi ; \
+	done
+
+
+#>+ 3
+final:
+	$(MAKE) all-am
+
+#>+ 3
+final-install:
+	$(MAKE) install-am
+
+#>+ 3
+no-final:
+	$(MAKE) all-am
+
+#>+ 3
+no-final-install:
+	$(MAKE) install-am
+
+#>+ 3
+kde-rpo-clean:
+	-rm -f *.rpo
+
+#>+ 3
+nmcheck: 
+nmcheck-am: nmcheck
diff --git a/kdiff3plugin/po/Makefile.am b/kdiff3plugin/po/Makefile.am
new file mode 100644
index 0000000..5bd5973
--- /dev/null
+++ b/kdiff3plugin/po/Makefile.am
@@ -0,0 +1,2 @@
+PACKAGE=kdiff3_plugin
+POFILES = AUTO
diff --git a/kdiff3plugin/po/bg.po b/kdiff3plugin/po/bg.po
new file mode 100644
index 0000000..cefa5e3
--- /dev/null
+++ b/kdiff3plugin/po/bg.po
@@ -0,0 +1,83 @@
+# translation of kdiff3_plugin.po to Bulgarian
+#
+# Zlatko Popov <zlatkopopov@fsa-bg.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Сравняване с %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Сливане с %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Запазване на \"%1\" за по-късно"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Тройно сливане с основата"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Сравняване с ..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Сравняване"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Тройно сравняване"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Относно приставката за KDiff3 ..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"Приставка за KDiff3: Copyright (C) 2006 Joachim Eibl\n"
+"Страница в Интернет: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"Използване на разширението на контекстното меню:\n"
+"За нормално сравняване на два файла, натиснете \"Сравняване\".\n"
+"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи в "
+"подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за втория "
+"файл.\n"
+"За тройно сливане първо запишете основния файл, после това, което трябва да се "
+"слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
+"Същото важи и за сливането и сравняването на директории."
diff --git a/kdiff3plugin/po/br.po b/kdiff3plugin/po/br.po
new file mode 100644
index 0000000..4d488e5
--- /dev/null
+++ b/kdiff3plugin/po/br.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: all2.po\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: 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:137
+msgid "Compare"
+msgstr ""
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr ""
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: kdiff3plugin.cpp:242
+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 ""
diff --git a/kdiff3plugin/po/cs.po b/kdiff3plugin/po/cs.po
new file mode 100644
index 0000000..8d0d74b
--- /dev/null
+++ b/kdiff3plugin/po/cs.po
@@ -0,0 +1,73 @@
+# translation of kdiff3_plugin.po to Czech
+#
+# Klára Cihlářová <koty@seznam.cz>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Porovnat s %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Sloučit s %1"
+
+#: 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 "Porovnat s..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Porovnat"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr ""
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: kdiff3plugin.cpp:242
+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 ""
diff --git a/kdiff3plugin/po/da.po b/kdiff3plugin/po/da.po
new file mode 100644
index 0000000..1cba3cb
--- /dev/null
+++ b/kdiff3plugin/po/da.po
@@ -0,0 +1,84 @@
+# Danish translation of kdiff3_plugin
+#
+# Erik Kjær Pedersen <erik@binghamton.edu>, 2006.
+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:31-0500\n"
+"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
+"Language-Team: Danish <dansk@klid.dk>\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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Sammenlign med %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Flet sammen med %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Gem '%1' til senere"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Trevejs sammenfletning med basis"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Sammenlign med..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Sammenlign"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Trevejs sammenligning"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Om Kdiff3-menuplugin..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"Kdiff3 menuplugin: Ophavsret © 2006 Joachim Eibl\n"
+"Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"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"
+"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"
+"Det samme gælder også for mappesammenligning og sammenfletning."
diff --git a/kdiff3plugin/po/de.po b/kdiff3plugin/po/de.po
new file mode 100644
index 0000000..6c398ed
--- /dev/null
+++ b/kdiff3plugin/po/de.po
@@ -0,0 +1,91 @@
+# translation of kdiff3_plugin.po to German
+# translation of kdiff3_plugin.po to
+#
+# Mark Volkert <mark.volkert@rakekniven.de>, 2006.
+# Thomas Reitelbach <tr@erdfunkstelle.de>, 2007.
+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Mit %1 vergleichen"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Mit %1 zusammenführen"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "'%1' für später speichern"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "3-Wege-Vergleich mit Base"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Vergleichen mit ..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Vergleich"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "3-Wege-Vergleich"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Über das KDiff3 Menü-Modul ..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"KDiff3 Menü-Modul: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 Internetseite: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"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 ...\" "
+"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 "
+"Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n"
+"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen von "
+"Ordnern."
diff --git a/kdiff3plugin/po/el.po b/kdiff3plugin/po/el.po
new file mode 100644
index 0000000..651160e
--- /dev/null
+++ b/kdiff3plugin/po/el.po
@@ -0,0 +1,84 @@
+# translation of kdiff3_plugin.po to Greek
+#
+# Spiros Georgaras <sngeorgaras@otenet.gr>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Σύγκριση με το %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Συγχώνευση με το %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Αποθήκευση του %1 για αργότερα"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Τριπλή συγχώνευση με βάση"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Σύγκριση με..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Σύγκριση"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "τριπλή σύγκριση"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"Πρόσθετο μενού του KDiff3: Copyright (C) 2006 Joachim Eibl\n"
+"Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"Χρήση της επέκτασης μενού:\n"
+"Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n"
+"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο για "
+"αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
+"χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n"
+"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον προς "
+"συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο κλάδο, ο "
+"οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
+"Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."
diff --git a/kdiff3plugin/po/et.po b/kdiff3plugin/po/et.po
new file mode 100644
index 0000000..fd799a8
--- /dev/null
+++ b/kdiff3plugin/po/et.po
@@ -0,0 +1,83 @@
+# translation of kdiff3_plugin.po to Estonian
+#
+# Marek Laane <bald@starman.ee>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Võrdle failiga %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Ühenda failiga %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Salvesta '%1' hilisemaks"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Kolme faili ühendamine baasiga"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Võrdle failiga..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Võrdle"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Kolme faili võrdlemine"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "KDiff3 menüüplugina info..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n"
+"KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"Kontekstimenüü laienduse kasutamine:\n"
+"Kahe valitud faili lihtsaks võrldemiseks vali \"Võrdle\".\n"
+"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"
+"Sama käib kataloogide võrdlemise ja ühendamise kohta."
diff --git a/kdiff3plugin/po/ga.po b/kdiff3plugin/po/ga.po
new file mode 100644
index 0000000..e7860a9
--- /dev/null
+++ b/kdiff3plugin/po/ga.po
@@ -0,0 +1,71 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: extragear-utils/kdiff3_plugin.po\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Cuir i gcomparáid le %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Cumaisc le %1"
+
+#: 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 "Cuir i gcomparáid le ..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Cuir i gComparáid"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Comparáid trí bhealach"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"Breiseán Roghchláir KDiff3: Copyright © 2006 Joachim Eibl\n"
+"Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
diff --git a/kdiff3plugin/po/it.po b/kdiff3plugin/po/it.po
new file mode 100644
index 0000000..dd98c15
--- /dev/null
+++ b/kdiff3plugin/po/it.po
@@ -0,0 +1,84 @@
+# translation of kdiff3_plugin.po to Italian
+#
+# Federico Zenith <zenith@chemeng.ntnu.no>, 2006.
+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Confronta con %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Fondi con %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Memorizza '%1'"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Fusione a tre con base"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Confronta con..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Confronta"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Confronto a tre"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Informazioni sul plugin KDiff3 per menu..."
+
+#: kdiff3plugin.cpp:240
+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"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"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"
+"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."
diff --git a/kdiff3plugin/po/nl.po b/kdiff3plugin/po/nl.po
new file mode 100644
index 0000000..1c8291c
--- /dev/null
+++ b/kdiff3plugin/po/nl.po
@@ -0,0 +1,87 @@
+# translation of kdiff3_plugin.po to Dutch
+#
+# Rinse de Vries <rinsedevries@kde.nl>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Vergelijken met %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Samenvoegen met %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "'%1' voor later gebruik opslaan"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "3-weg samenvoeging met basis"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Vergelijken met..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Vergelijken"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "3-weg vergelijking"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Info over KDiff3-menuplugin..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"KDif3-menuplugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3-website: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"De contextmenu-extensie gebruiken:\n"
+"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"
+"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"
+"Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
+"directories."
diff --git a/kdiff3plugin/po/pt.po b/kdiff3plugin/po/pt.po
new file mode 100644
index 0000000..ec8364d
--- /dev/null
+++ b/kdiff3plugin/po/pt.po
@@ -0,0 +1,82 @@
+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POFile-SpellExtra: Eibl Joachim KDiff\n"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Comparar com o %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Juntar com o %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Gravar o '%1' para mais tarde"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Junção de 3-vias com a base"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Comparar com ..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Comparar"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Comparação de 3 vias"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Acerca do 'plugin' do menu do KDiff3 ..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"'Plugin' do Menu do KDiff3: Copyright (C) 2006 Joachim Eibl\n"
+"Página Web do KDiff3: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"Usar a extensão do menu de contexto:\n"
+"Para uma comparação simples de dois ficheiros seleccionados, escolha "
+"\"Comparar\".\n"
+"Se o outro ficheiro estiver noutro local, opte por \"Gravar\" o primeiro "
+"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"
+"O mesmo se aplica também à comparação e junção de pastas."
diff --git a/kdiff3plugin/po/pt_BR.po b/kdiff3plugin/po/pt_BR.po
new file mode 100644
index 0000000..808af36
--- /dev/null
+++ b/kdiff3plugin/po/pt_BR.po
@@ -0,0 +1,85 @@
+# translation of kdiff3_plugin.po to Brazilian Portuguese
+#
+# Diniz Bortolotto <diniz.bb@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Comparar com %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Mesclar com %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Salvar '%1' para mais tarde"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Mesclagem de 3-vias com a base"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Comparar com ..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Comparar"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Comparação de 3 vias"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Sobre KDiff3 menu plugin ..."
+
+#: kdiff3plugin.cpp:240
+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 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"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"
+"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."
diff --git a/kdiff3plugin/po/sk.po b/kdiff3plugin/po/sk.po
new file mode 100644
index 0000000..ce2e51e
--- /dev/null
+++ b/kdiff3plugin/po/sk.po
@@ -0,0 +1,73 @@
+# translation of kdiff3_plugin.po to Slovak
+#
+# Richard Fric <Richard.Fric@kdemail.net>, 2006.
+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: 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:137
+msgid "Compare"
+msgstr ""
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr ""
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr ""
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+
+#: kdiff3plugin.cpp:242
+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 ""
diff --git a/kdiff3plugin/po/sv.po b/kdiff3plugin/po/sv.po
new file mode 100644
index 0000000..d62d6ae
--- /dev/null
+++ b/kdiff3plugin/po/sv.po
@@ -0,0 +1,84 @@
+# translation of kdiff3_plugin.po to Swedish
+#
+# Stefan Asserhäll <stefan.asserhall@comhem.se>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "Kdiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "Jämför med %1"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "Sammanfoga med %1"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr "Spara '%1' till senare"
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Trevägs sammanfogning med bas"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Jämför med..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Jämför"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "Trevägs jämförelse"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "Om Kdiff3-menyinsticksprogram..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"Kdiff3 menyinsticksprogram: Copyright © 2006 Joachim Eibl\n"
+"Kdiff3 hemsida: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""
+"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"
+"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"
+"Detsamma gäller också för katalogjämförelse och sammanfogning."
diff --git a/kdiff3plugin/po/tr.po b/kdiff3plugin/po/tr.po
new file mode 100644
index 0000000..a02241a
--- /dev/null
+++ b/kdiff3plugin/po/tr.po
@@ -0,0 +1,75 @@
+# translation of kdiff3_plugin.po to Türkçe
+#
+# Engin Çağatay <engincagatay@yahoo.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdiff3_plugin\n"
+"POT-Creation-Date: 2006-11-19 08:46+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"
+"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"
+
+#: kdiff3plugin.cpp:97
+msgid "KDiff3"
+msgstr "KDiff3"
+
+#: kdiff3plugin.cpp:104
+#, c-format
+msgid "Compare with %1"
+msgstr "%1 ile karşılaştır"
+
+#: kdiff3plugin.cpp:109
+#, c-format
+msgid "Merge with %1"
+msgstr "%1 ile birleştir"
+
+#: kdiff3plugin.cpp:114
+msgid "Save '%1' for later"
+msgstr ""
+
+#: kdiff3plugin.cpp:119
+msgid "3-way merge with base"
+msgstr "Temel ile 3-yollu birleştirme"
+
+#: kdiff3plugin.cpp:125
+msgid "Compare with ..."
+msgstr "Karşılaştır..."
+
+#: kdiff3plugin.cpp:137
+msgid "Compare"
+msgstr "Karşılaştır"
+
+#: kdiff3plugin.cpp:142
+msgid "3 way comparison"
+msgstr "3 yollu karşılaştırma"
+
+#: kdiff3plugin.cpp:145
+msgid "About KDiff3 menu plugin ..."
+msgstr "KDiff3 menü eklentisi hakkında ..."
+
+#: kdiff3plugin.cpp:240
+msgid ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
+"\n"
+msgstr ""
+"KDiff3 Menü Eklentisi: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n"
+"\n"
+
+#: kdiff3plugin.cpp:242
+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 ""