From: Eike Sauer Date: Sat, 7 May 2016 15:42:00 +0000 (+0100) Subject: kdiff3 (0.9.98-3) unstable; urgency=low X-Git-Tag: archive/raspbian/1.10.0-1+rpi1~1^2^2^2^2~8 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0143c2eb03a599ff3472dcfc75c13272ab0858b6;p=kdiff3.git kdiff3 (0.9.98-3) unstable; urgency=low * Removed usage of MAX_PATH which doesn't exist on hurd (closes: #823042) * Fixed lintian waring dep5-copyright-license-name-not-unique * Use UTF-8 for documentation generation, no matter the system's locale. Improvement in reproducible builds. * Updated standard version to 3.9.8. No changes needed. [dgit import unpatched kdiff3 0.9.98-3] --- 0143c2eb03a599ff3472dcfc75c13272ab0858b6 diff --cc debian/TODO index 0000000,0000000..3639bbb new file mode 100644 --- /dev/null +++ b/debian/TODO @@@ -1,0 -1,0 +1,1 @@@ ++* solve link problems resulting in dpkg-shlibdeps warnings like "package could avoid a useless dependency" diff --cc debian/changelog index 0000000,0000000..4187faf new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,350 @@@ ++kdiff3 (0.9.98-3) unstable; urgency=low ++ ++ * Removed usage of MAX_PATH which doesn't exist on hurd (closes: #823042) ++ * Fixed lintian waring dep5-copyright-license-name-not-unique ++ * Use UTF-8 for documentation generation, no matter the system's locale. ++ Improvement in reproducible builds. ++ * Updated standard version to 3.9.8. No changes needed. ++ ++ -- Eike Sauer Sat, 07 May 2016 17:42:00 +0200 ++ ++kdiff3 (0.9.98-2) unstable; urgency=low ++ ++ * Workaround for differences not showing in status bar after ++ start (closes: #757206). ++ * Fixed crash I was getting by comparing two completely different files ++ * Finally got rid of the lintian hardening warning for kdiff3-qt ++ * Updated standard version to 3.9.6. No changes needed. ++ ++ -- Eike Sauer Sun, 26 Jul 2015 12:31:00 +0200 ++ ++kdiff3 (0.9.98-1) unstable; urgency=low ++ ++ * New upstream release ++ * Got rid of many unnecessary depends thanks to patch from ++ Pino Toscano (closes: #749460). ++ * Included patch from Pino Toscano to enable parallel build ++ (closes: #749459). ++ * We need to build or html doc files on our own now. ++ ++ -- Eike Sauer Sun, 03 Aug 2014 17:37:00 +0200 ++ ++kdiff3 (0.9.97-3) unstable; urgency=low ++ ++ * Included upstream fix for merge saving bug (closes: #703174). ++ * No more using docbook-to-man, which has been orphaned years ago. ++ ++ -- Eike Sauer Sun, 16 Jun 2013 13:05:00 +0200 ++ ++kdiff3 (0.9.97-2) unstable; urgency=low ++ ++ * Path to help file in kdiff3-qt fixed (closes: #700424) ++ (doesn't look beautiful, but at least there's some text...) ++ * Updated standard version to 3.9.4. No changes needed. ++ ++ -- Eike Sauer Sun, 01 Mar 2013 11:42:00 +0100 ++ ++kdiff3 (0.9.97-1) unstable; urgency=low ++ ++ * New upstream release ++ * Upstream has accepted and improved my find dialog patch ++ ++ -- Eike Sauer Sat, 26 Jan 2013 11:54:44 +0100 ++ ++kdiff3 (0.9.96-4) unstable; urgency=low ++ ++ * Fixed lintian sutff: ++ - lintian override about versioned dependency for debhelper ++ - build dependency for dpkg-dev ++ - additional (redundant) licence paragraph ++ * Preset text selected when reentering find dialog ++ ++ -- Eike Sauer Sat, 28 May 2012 20:00:00 +0200 ++ ++kdiff3 (0.9.96-3) unstable; urgency=low ++ ++ * Dropped dependency on qt3-dev-tools-compat (closes: #673455) ++ * Standards version now 3.9.3 ++ * Machine readable debian/copyright file ++ * Hardening flags (AFAICT, the lintian warnings on this are wrong) ++ ++ -- Eike Sauer Sat, 19 May 2012 15:00:00 +0200 ++ ++kdiff3 (0.9.96-2) unstable; urgency=low ++ ++ * Renamed "debian" patch (closes: #643175) ++ * Standards version now 3.9.2 (no changes) ++ * My old mail address is gone (after 17 years *sigh*), ++ replaced it where appropriate ++ ++ -- Eike Sauer Tue, 27 Sep 2011 20:00:00 +0200 ++ ++kdiff3 (0.9.96-1) unstable; urgency=low ++ ++ * New upstream release (closes: #620050, #614834) ++ Several patches have been taken by upstream ++ ++ -- Eike Sauer Mon, 05 Sep 2011 20:07:54 +0200 ++ ++kdiff3 (0.9.95-7) unstable; urgency=low ++ ++ * I officially do declare that Filipus Klutiero and Filipus Klutiero ++ are _not_ different people (see last changelog entry). ++ * Made compilable for KDE 4.5, thanks to Adrian von Bidder (closes: #599806) ++ * Standards version now 3.9.1 (no changes) ++ * Doc package Replaces/Breaks old kdiff3 version instead of "Conflicts". ++ ++ -- Eike Sauer Tue, 12 Oct 2010 00:05:00 +0200 ++ ++kdiff3 (0.9.95-6) unstable; urgency=low ++ ++ * Documentation was automatically compressed and therefore unusably ++ (what a strange default...), thanks to Filipus Klutiero for pointing ++ out and svuorela for his fixing help. (closes: #585949) ++ * "Qt" instead of "QT" in short description, thanks to Filipus Klutiero. ++ Two consecutive bug numbers by different people - cool. :o) ++ (closes: #585948) ++ * Added categories to .desktop file (thanks to svuorela for pointing out) ++ * Standards version now 3.8.4 (no changes) ++ ++ -- Eike Sauer Tue, 15 Jun 2010 22:00:00 +0200 ++ ++kdiff3 (0.9.95-5) unstable; urgency=low ++ ++ * KDE changed its doc path, so I had to do the same (closes: #584155) ++ ++ -- Eike Sauer Tue, 03 Jun 2010 20:15:00 +0200 ++ ++kdiff3 (0.9.95-4) unstable; urgency=low ++ ++ * New year's edition, now really incorporating Jordi Pujol's ++ bug fix for the konqueror context menu ++ ++ -- Eike Sauer Tue, 01 Jan 2010 18:00:00 +0100 ++ ++kdiff3 (0.9.95-3) unstable; urgency=low ++ ++ * Call dh_icons for our gnome users (thanks to Ori Avtalion for the hint) ++ * Let's make lintian at least as happy as Ubuntu. ;o) ++ Fixed Source section, misc:depends, typos. ++ * Context menu call to kdiff3 doesn't block konqueror anymore, ++ thanks to Jordi Pujol (closes: #562185) ++ * Standards version now 3.8.3 (no changes) ++ ++ -- Eike Sauer Tue, 29 Dec 2009 14:00:00 +0100 ++ ++kdiff3 (0.9.95-2) unstable; urgency=low ++ ++ * KDE 4 goes to unstable - KDiff3 goes along ++ * Standards version now 3.8.1 (no changes) ++ ++ -- Eike Sauer Mon, 06 Apr 2009 20:00:00 +0200 ++ ++kdiff3 (0.9.95-1) experimental; urgency=low ++ ++ * New upstream release ++ - Upstream included my changes for the QT version ++ and provided a script to generate QT language packs. ++ ++ -- Eike Sauer Sat, 07 Mar 2009 14:16:09 +0100 ++ ++kdiff3 (0.9.94-3) experimental; urgency=low ++ ++ * Improved package descriptions ++ ++ -- Eike Sauer Tue, 28 Feb 2009 22:00:00 +0100 ++ ++kdiff3 (0.9.94-2) experimental; urgency=low ++ ++ * Build QT version as well, resulting in an alternative package ++ not depending on KDE ++ ++ -- Eike Sauer Tue, 21 Feb 2009 20:00:00 +0100 ++ ++kdiff3 (0.9.94-1) experimental; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Tue, 20 Jan 2009 23:26:09 +0100 ++ ++kdiff3 (0.9.93-3-1) experimental; urgency=low ++ ++ * New upstream release ++ - Initial release for KDE 4. (Closes: #479316) ++ - Thanks to Fathi Boudra for providing a first functional version ++ and calling my attention to cdbs! ++ * Changed build from pure debhelper to cdbs, ++ resulting in a much cleaner debian/rules file. ++ * Debhelper compatibility level changed from 4 to 7, ++ but just to make it find my files automatically. ++ ++ -- Eike Sauer Tue, 14 Jan 2009 20:00:00 +0100 ++ ++kdiff3 (0.9.92-3) unstable; urgency=low ++ ++ * Standards version now 3.8.0 ++ * Fixed kdiff3-doc section ++ * Removed empty directory /usr/share/applnk ++ * Removed extra leading whitespace from doc-base ++ * Fixed doc-base section ++ ++ -- Eike Sauer Tue, 18 Dec 2008 20:00:00 +0100 ++ ++kdiff3 (0.9.92-2) unstable; urgency=low ++ ++ * Include konqueror plugin in package (closes Ubuntu bug no. 145026) ++ * Split package into kdiff3 and kdiff3-doc ++ ++ -- Eike Sauer Tue, 11 Nov 2007 20:00:00 +0100 ++ ++kdiff3 (0.9.92-1) unstable; urgency=low ++ ++ * New upstream release ++ - now distinguishes between empty and non-existent files in "full analysis" ++ mode (closes: #417086) ++ - fixed includes for gcc 4.3, thanks to Martin Michlmayr (closes: #417312) ++ Thanks to upstream for the Debian bug handling! :o) ++ ++ -- Eike Sauer Tue, 17 Apr 2007 16:18:32 +0200 ++ ++kdiff3 (0.9.91-1) unstable; urgency=low ++ ++ * New upstream release ++ * The I'm-a-DD-release...! ++ ++ -- Eike Sauer Sun, 18 Mar 2007 23:33:56 +0100 ++ ++kdiff3 (0.9.90-5) unstable; urgency=low ++ ++ * Changed, moved and registered .desktop file (closes: #396790) ++ ++ -- Eike Sauer Tue, 30 Nov 2006 20:15:00 +0200 ++ ++kdiff3 (0.9.90-4) unstable; urgency=low ++ ++ * Added AM_MAINTAINER_MODE ++ ++ -- Eike Sauer Tue, 12 Oct 2006 14:00:00 +0200 ++ ++kdiff3 (0.9.90-3) unstable; urgency=low ++ ++ * More autotooling stuff... ++ ++ -- Eike Sauer Tue, 02 Oct 2006 16:30:00 +0200 ++ ++kdiff3 (0.9.90-2) unstable; urgency=low ++ ++ * Really reduced dependencies (as promised in 0.9.89-1) this time... ++ * manpage updated ++ ++ -- Eike Sauer Tue, 27 Sep 2006 17:40:00 +0200 ++ ++kdiff3 (0.9.90-1) unstable; urgency=low ++ ++ * New upstream release ++ * Standards version now 3.7.2 ++ ++ -- Eike Sauer Tue, 30 May 2006 10:16:35 +0200 ++ ++kdiff3 (0.9.89-1) unstable; urgency=low ++ ++ * New upstream release ++ * Reduced dependencies from 27 to 5 packages... ++ (see http://lists.debian.org/debian-devel-announce/2005/11/msg00016.html) ++ ++ -- Eike Sauer Wed, 12 Apr 2006 00:28:33 +0200 ++ ++kdiff3 (0.9.88-5) unstable; urgency=low ++ ++ * corrections to German po file, thanks to Jens Seidel (closes: #314016) ++ * mention GNU diff in copyright file (hint by Florian Ernst) ++ * making manual known to doc-base, so obeying to Debian Policy 3.6.2 ++ * ABI transition to GCC 4.0 (closes #327048) ++ ++ -- Eike Sauer Fri, 7 Sep 2005 15:15:00 +0100 ++ ++kdiff3 (0.9.88-4) unstable; urgency=low ++ ++ * HTML help goes to /usr/share/doc/kdiff3/html ++ ++ -- Eike Sauer Fri, 15 Apr 2005 00:15:00 +0100 ++ ++kdiff3 (0.9.88-3) unstable; urgency=low ++ ++ * symlinked all those documentation images between the different ++ languages (they where the same anyway) - which halves the size ++ of the package... ++ ++ -- Eike Sauer Sun, 10 Apr 2005 22:14:00 +0100 ++ ++kdiff3 (0.9.88-2) unstable; urgency=low ++ ++ * Don't use makefile in clean rule when it doesn't yet exist ++ ++ -- Eike Sauer Sun, 10 Apr 2005 22:14:00 +0100 ++ ++kdiff3 (0.9.88-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Sat, 26 Feb 2005 18:07:03 +0100 ++ ++kdiff3 (0.9.87-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Sun, 30 Jan 2005 19:08:52 +0100 ++ ++kdiff3 (0.9.86-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Tue, 15 Jun 2004 11:28:59 +0200 ++ ++kdiff3 (0.9.84-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Mon, 31 May 2004 22:43:32 +0200 ++ ++kdiff3 (0.9.83-2) unstable; urgency=medium ++ ++ * First upload of 0.9.83 (closes: #250486) ++ * Casual crashes due to race condition (hopefully) fixed ++ ++ -- Eike Sauer Wed, 4 Feb 2004 15:09:12 +0100 ++ ++kdiff3 (0.9.83-1) unstable; urgency=low ++ ++ * New upstream release ++ - now builds on 64 bit architectures (closes: #238221) ++ * We don't need docbook-to-man in Build-Depends anymore ++ * Cleaned up debian/rules. ++ ++ -- Eike Sauer Sun, 7 Mar 2004 00:00:32 +0100 ++ ++kdiff3 (0.9.81-2) unstable; urgency=medium ++ ++ * Possible data loss situation fixed by upstream ++ ++ -- Eike Sauer Wed, 4 Feb 2004 15:09:12 +0100 ++ ++kdiff3 (0.9.81-1) unstable; urgency=low ++ ++ * New upstream release ++ * Debian manpage accepted by upstream ++ ++ -- Eike Sauer Mon, 12 Jan 2004 02:11:51 +0100 ++ ++kdiff3 (0.9.80-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ -- Eike Sauer Mon, 8 Dec 2003 22:45:16 +0100 ++ ++kdiff3 (0.9.71-1) unstable; urgency=low ++ ++ * Initial Release. ++ * Wrote a short man page to satisfy Debian Policy. ++ ++ -- Eike Sauer Wed, 5 Nov 2003 00:25:06 +0100 diff --cc debian/compat index 0000000,0000000..ec63514 new file mode 100644 --- /dev/null +++ b/debian/compat @@@ -1,0 -1,0 +1,1 @@@ ++9 diff --cc debian/control index 0000000,0000000..b9cbc88 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,56 @@@ ++Source: kdiff3 ++Priority: optional ++Section: kde ++Maintainer: Eike Sauer ++Build-Depends: cdbs, debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.2), cmake, kdelibs5-dev (>= 4:4.4.4), libkonq5-dev, qt4-dev-tools, libicu-dev ++Standards-Version: 3.9.8 ++Homepage: http://kdiff3.sourceforge.net ++Vcs-Svn: https://kdiff3.svn.sourceforge.net/svnroot/kdiff3/trunk/ ++Vcs-Browser: http://kdiff3.svn.sourceforge.net/viewvc/kdiff3/trunk/ ++ ++Package: kdiff3 ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Recommends: kdiff3-doc ++Conflicts: kdiff3-qt ++Description: compares and merges 2 or 3 files or directories ++ KDiff3 compares two or three input files and shows the differences ++ line by line and character by character. It provides an automatic ++ merge facility and an integrated editor for comfortable solving of ++ merge conflicts. KDiff3 allows recursive directory comparison and ++ merging as well. ++ . ++ This is the standard version of KDiff3, highly integrated into KDE. ++ It has got KIO support (allowing for remote access of files and ++ direct access to files in compressed archives) and integration into ++ konqueror's context menu. There's also a stripped-down version called ++ kdiff3-qt not depending on the KDE libraries. ++ ++Package: kdiff3-qt ++Architecture: any ++Section: devel ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Recommends: kdiff3-doc ++Conflicts: kdiff3 ++Description: compares and merges 2 or 3 files or directories - Qt version ++ KDiff3 compares two or three input files and shows the differences ++ line by line and character by character. It provides an automatic ++ merge facility and an integrated editor for comfortable solving of ++ merge conflicts. KDiff3 allows recursive directory comparison and ++ merging as well. ++ . ++ This version of KDiff3 is stripped-down so that it doesn't depend ++ on the KDE libraries. The package "kdiff3" contains the full-featured ++ version of the program. ++ ++Package: kdiff3-doc ++Architecture: all ++Section: doc ++Depends: ${misc:Depends} ++Recommends: kdiff3 | kdiff3-qt ++Replaces: kdiff3 (<= 0.9.92-1) ++Breaks: kdiff3 (<= 0.9.92-1) ++Description: documentation for kdiff3 ++ KDiff3 compares two or three input files and shows the differences ++ line by line and character by character. This package contains the ++ HTML documentation. diff --cc debian/copyright index 0000000,0000000..06452eb new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,29 @@@ ++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: kdiff3 ++Upstream-Contact: Joachim Eibl ++Source: http://kdiff3.sourceforge.net ++ ++Files: * ++Copyright: 2002-2014 by Joachim Eibl ++License: GPL-2+ ++ Parts of this software are derived from GNU diffutils ++ by Haertel, Hayes, Stallman, Tower, Eggert et al. ++ . ++ 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; either version 2 of the License, or ++ (at your option) any later version. ++ . ++ 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 with ++ the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; ++ if not, write to the Free Software Foundation, Inc., 51 Franklin St, ++ Fifth Floor, Boston, MA 02110-1301, USA. ++ ++Files: debian/* ++Copyright: 2003-2015 Eike Sauer ++License: GPL-2+ diff --cc debian/docs index 0000000,0000000..5502ed8 new file mode 100644 --- /dev/null +++ b/debian/docs @@@ -1,0 -1,0 +1,3 @@@ ++NEWS ++README ++TODO diff --cc debian/kdiff3-doc.doc-base index 0000000,0000000..73d3cdc new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.doc-base @@@ -1,0 -1,0 +1,13 @@@ ++Document: kdiff3 ++Title: KDiff3 Handbook ++Author: Joachim Eibl ++Abstract: The manual for KDiff3. KDiff3 compares two or three input files ++ and shows the differences line by line and character by character. ++ It provides an automatic merge facility and an integrated editor for ++ comfortable solving of merge conflicts. KDiff3 allows recursive directory ++ comparison and merging as well. ++Section: Programming ++ ++Format: HTML ++Index: /usr/share/doc/kdiff3-doc/html/index.html ++Files: /usr/share/doc/kdiff3-doc/html/*.html diff --cc debian/kdiff3-doc.install index 0000000,0000000..0d49539 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.install @@@ -1,0 -1,0 +1,2 @@@ ++usr/share/doc/kde ++usr/share/doc/kdiff3-doc/html diff --cc debian/kdiff3-doc.links index 0000000,0000000..36f18e4 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-doc.links @@@ -1,0 -1,0 +1,12 @@@ ++usr/share/doc/kde/HTML/en/common usr/share/doc/kdiff3-doc/html/common ++usr/share/doc/kde/HTML/en/kdiff3/dirbrowser.png usr/share/doc/kdiff3-doc/html/dirbrowser.png ++usr/share/doc/kde/HTML/en/kdiff3/dirmergebig.png usr/share/doc/kdiff3-doc/html/dirmergebig.png ++usr/share/doc/kde/HTML/en/kdiff3/iteminfo.png usr/share/doc/kdiff3-doc/html/iteminfo.png ++usr/share/doc/kde/HTML/en/kdiff3/letter_by_letter.png usr/share/doc/kdiff3-doc/html/letter_by_letter.png ++usr/share/doc/kde/HTML/en/kdiff3/merge_current.png usr/share/doc/kdiff3-doc/html/merge_current.png ++usr/share/doc/kde/HTML/en/kdiff3/new.png usr/share/doc/kdiff3-doc/html/new.png ++usr/share/doc/kde/HTML/en/kdiff3/open_dialog.png usr/share/doc/kdiff3-doc/html/open_dialog.png ++usr/share/doc/kde/HTML/en/kdiff3/screenshot_diff.png usr/share/doc/kdiff3-doc/html/screenshot_diff.png ++usr/share/doc/kde/HTML/en/kdiff3/screenshot_merge.png usr/share/doc/kdiff3-doc/html/screenshot_merge.png ++usr/share/doc/kde/HTML/en/kdiff3/triple_diff.png usr/share/doc/kdiff3-doc/html/triple_diff.png ++usr/share/doc/kde/HTML/en/kdiff3/white_space.png usr/share/doc/kdiff3-doc/html/white_space.png diff --cc debian/kdiff3-qt.install index 0000000,0000000..358dd80 new file mode 100644 --- /dev/null +++ b/debian/kdiff3-qt.install @@@ -1,0 -1,0 +1,2 @@@ ++usr/share/icons ++usr/share/man diff --cc debian/kdiff3.install index 0000000,0000000..7804e42 new file mode 100644 --- /dev/null +++ b/debian/kdiff3.install @@@ -1,0 -1,0 +1,8 @@@ ++usr/bin ++usr/lib ++usr/share/icons ++usr/share/locale ++usr/share/applications ++usr/share/man ++usr/share/kde4/apps ++usr/share/kde4/services diff --cc debian/kdiff3.sgml index 0000000,0000000..4a3a81e new file mode 100644 --- /dev/null +++ b/debian/kdiff3.sgml @@@ -1,0 -1,0 +1,258 @@@ ++ manpage.1'. You may view ++ the manual page with: `docbook-to-man kdiff3.sgml | nroff -man | less'. ++ A typical entry in a Makefile or Makefile.am is: ++ ++manpage.1: manpage.sgml ++ docbook-to-man $< > $@ ++ ++ ++ The docbook-to-man binary is found in the docbook-to-man package. ++ Please remember that if you create the nroff version in one of the ++ debian/rules file targets (such as build), you will need to include ++ docbook-to-man in your Build-Depends control field. ++ ++ --> ++ ++ ++ EIKE"> ++ SAUER"> ++ ++ Oktober 2, 2006"> ++ ++ 1"> ++ eike@debian.org>"> ++ ++ KDIFF3"> ++ ++ ++ Debian"> ++ GNU"> ++ GPL"> ++]> ++ ++ ++ ++
++ &dhemail; ++
++ ++ &dhfirstname; ++ &dhsurname; ++ ++ ++ 2003, 2006 ++ &dhusername; ++ ++ &dhdate; ++ ++ ++ &dhucpackage; ++ ++ &dhsection; ++ ++ ++ &dhpackage; ++ ++ compares two or three input files or directories ++ ++ ++ ++ &dhpackage; ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ DESCRIPTION ++ ++ This manual page documents briefly the ++ &dhpackage; tool. ++ ++ This manual page was written for the &debian; distribution ++ because the original program does not have a manual page. ++ For comprehensive help, please see khelpcenter help:/kdiff3. ++ ++ ++ &dhpackage; is a program that ++ ++ compares or merges two or three text input files or directories ++ shows the differences line by line and character by character ++ provides an automatic merge-facility and ++ an integrated editor for comfortable solving of merge-conflicts ++ supports Unicode, UTF-8 and other codecs ++ supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) ++ Printing of differences ++ Manual alignment of lines ++ Automatic merging of version control history ($Log$) ++ ++ ++ ++ ++ ++ OPTIONS ++ ++ This program follows the usual &gnu; command line syntax, ++ with long options starting with two dashes (`-'). A summary of ++ options is included below. For a full summary of options, run ++ &dhpackage; --help. ++ ++ ++ ++ ++ ++ ++ ++ Merge the input. ++ ++ ++ ++ ++ ++ ++ Explicit base file. For compatibility with certain tools. ++ ++ ++ ++ ++ ++ ++ Output file. Implies -m. E.g.: -o newfile.txt ++ ++ ++ ++ ++ ++ ++ Output file, again. (For compatibility with certain tools.) ++ ++ ++ ++ ++ ++ ++ No GUI if all conflicts are auto-solvable. (Needs -o file) ++ ++ ++ ++ ++ ++ ++ Don't solve conflicts automatically. (For compatibility...) ++ ++ ++ ++ ++ ++ ++ Visible name replacement for first file/base file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement for second file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement for third file. ++ ++ ++ ++ ++ ++ ++ Visible name replacement. May by supplied for each input. ++ ++ ++ ++ ++ ++ ++ Change a setting, e. g. --cs "AutoAdvance=1". ++ ++ ++ ++ ++ ++ ++ Show a list of all settings and their values. ++ ++ ++ ++ ++ ++ ++ Use a different settings file. ++ ++ ++ ++ ++ ++ ++ Show author of program. ++ ++ ++ ++ ++ ++ ++ Show version of program. ++ ++ ++ ++ ++ ++ ++ Show license of program. ++ ++ ++ ++ ++ ++ AUTHOR ++ ++ This manual page was written by &dhusername; &dhemail; for ++ the &debian; system (but may be used by others). Permission is ++ granted to copy, distribute and/or modify this document under ++ the terms of the &gnu; General Public License, Version 2 ++ (or, at your option, any later version published by the Free ++ Software Foundation). ++ ++ ++ On Debian systems, the complete text of the GNU General Public ++ License can be found in /usr/share/common-licenses/GPL. ++ ++ ++ ++ ++ ++ diff --cc debian/patches/crash-and-status-line.patch index 0000000,0000000..3ec63e6 new file mode 100644 --- /dev/null +++ b/debian/patches/crash-and-status-line.patch @@@ -1,0 -1,0 +1,55 @@@ ++Description: Workaround for differences not showing in status bar (#757206) and fixes crash I had when testing this ++Origin: eike@debian.org ++ ++--- kdiff3-0.9.98-debian-orig/src-QT4/mergeresultwindow.h 2015-07-11 18:57:03.684903892 +0200 +++++ kdiff3-0.9.98/src-QT4/mergeresultwindow.h 2015-07-11 18:42:48.543305303 +0200 ++@@ -119,6 +119,7 @@ public: ++ int getNrOfUnsolvedConflicts(int* pNrOfWhiteSpaceConflicts=0); ++ void choose(int selector); ++ void chooseGlobal(int selector, bool bConflictsOnly, bool bWhiteSpaceOnly ); +++ void updateStatusBar(); ++ ++ int getMaxTextWidth(); // width of longest text line ++ int getNofLines(); ++--- kdiff3-0.9.98-debian-orig/src-QT4/mergeresultwindow.cpp 2015-07-11 18:57:03.680903904 +0200 +++++ kdiff3-0.9.98/src-QT4/mergeresultwindow.cpp 2015-07-11 18:43:31.000000000 +0200 ++@@ -145,14 +145,18 @@ void MergeResultWindow::init( ++ g_bAutoSolve = true; ++ update(); ++ updateSourceMask(); +++ updateStatusBar(); +++} ++ +++void MergeResultWindow::updateStatusBar() +++{ ++ int wsc; ++ int nofUnsolved = getNrOfUnsolvedConflicts(&wsc); ++ if (m_pStatusBar) ++ m_pStatusBar->showMessage( i18n("Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" ++ ,nofUnsolved,wsc) ); ++ } ++- +++ ++ void MergeResultWindow::reset() ++ { ++ m_pDiff3LineList = 0; ++--- kdiff3-0.9.98-debian-orig/src-QT4/pdiff.cpp 2015-07-11 18:57:03.680903904 +0200 +++++ kdiff3-0.9.98/src-QT4/pdiff.cpp 2015-07-11 18:53:04.845613274 +0200 ++@@ -1732,7 +1732,7 @@ void KDiff3App::slotFinishRecalcWordWrap ++ m_pOverview->slotRedraw(); ++ if (m_pDiffVScrollBar) ++ m_pDiffVScrollBar->setRange(0, max2(0, m_neededLines + 1 - m_DTWHeight)); ++- if (m_pDiffTextWindow1) +++ if (m_pDiffTextWindow1 && m_firstD3LIdx >= 0) ++ { ++ m_pDiffVScrollBar->setValue(m_pDiffTextWindow1->convertDiff3LineIdxToLine(m_firstD3LIdx)); ++ ++@@ -1749,6 +1749,8 @@ void KDiff3App::slotFinishRecalcWordWrap ++ } ++ if (m_pEventLoopForPrinting) ++ m_pEventLoopForPrinting->quit(); +++ +++ m_pMergeResultWindow->updateStatusBar(); ++ } ++ ++ void KDiff3App::slotShowWhiteSpaceToggled() diff --cc debian/patches/create_qm_files.patch index 0000000,0000000..6c19827 new file mode 100644 --- /dev/null +++ b/debian/patches/create_qm_files.patch @@@ -1,0 -1,0 +1,26 @@@ ++Description: Need to create directories in package building process ++Origin: eike@debian.org ++ ++--- a/po/create_qm_files +++++ b/po/create_qm_files ++@@ -33,14 +33,18 @@ if [ "$1" = "local" ]; then ++ for i in `ls ` ; do ++ if [ -s $i/kdiff3.po ]; then ++ echo Creating ./kdiff3_$i.qm ++- lconvert -if po -of qm -o $path/kdiff3_$i.qm $i/kdiff3.po +++ # lconvert -if po -of qm -o $path/kdiff3_$i.qm $i/kdiff3.po +++ mkdir --parents $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/ +++ lconvert -if po -of qm -o $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/kdiff3.qm $i/kdiff3.po ++ fi ++ done ++ elif [ "$1" = "install" ]; then ++ for i in `ls` ; do ++ if [ -s $i/kdiff3.po ]; then ++ echo Installing /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm ++- sudo lconvert -if po -of qm -o /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm $i/kdiff3.po +++ # sudo lconvert -if po -of qm -o /usr/share/locale/$i/LC_MESSAGES/kdiff3.qm $i/kdiff3.po +++ mkdir --parents $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/ +++ lconvert -if po -of qm -o $INSTALL_ROOT/usr/share/locale/$i/LC_MESSAGES/kdiff3.qm $i/kdiff3.po ++ fi ++ done ++ else diff --cc debian/patches/kdiff3-qt-doc-placement.diff index 0000000,0000000..cb09ad7 new file mode 100644 --- /dev/null +++ b/debian/patches/kdiff3-qt-doc-placement.diff @@@ -1,0 -1,0 +1,12 @@@ ++Description: Fixed path to help file ++--- a/src-QT4/kreplacements/kreplacements.cpp +++++ b/src-QT4/kreplacements/kreplacements.cpp ++@@ -111,7 +111,7 @@ static void showHelp() ++ pBrowser = new QTextBrowser( 0 ); ++ pBrowser->setMinimumSize( 600, 400 ); ++ } ++- pBrowser->setSource(QUrl("file://usr/local/share/doc/kdiff3/en/index.html")); +++ pBrowser->setSource(QUrl("file:///usr/share/doc/kdiff3-doc/html/index.html")); ++ pBrowser->show(); ++ #endif ++ } diff --cc debian/patches/kdiff3-qt-hardening.patch index 0000000,0000000..5c0d450 new file mode 100644 --- /dev/null +++ b/debian/patches/kdiff3-qt-hardening.patch @@@ -1,0 -1,0 +1,16 @@@ ++Description: Hardening flags for kdiff3-qt ++Author: eike@debian.org ++--- a/src-QT4/kdiff3.pro +++++ b/src-QT4/kdiff3.pro ++@@ -66,6 +66,11 @@ os2 { ++ } ++ ++ unix { +++ QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) +++ QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) +++ QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) +++ QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) +++ ++ documentation.path = /usr/share/doc/kdiff3 ++ # documentation.files = ../doc/* ++ diff --cc debian/patches/kdiff3.pro.patch index 0000000,0000000..7071dab new file mode 100644 --- /dev/null +++ b/debian/patches/kdiff3.pro.patch @@@ -1,0 -1,0 +1,21 @@@ ++Description: Change needed due to different package installation paths. ++Origin: eike@debian.org ++ ++--- a/src-QT4/kdiff3.pro +++++ b/src-QT4/kdiff3.pro ++@@ -66,12 +66,12 @@ os2 { ++ } ++ ++ unix { ++- documentation.path = /usr/local/share/doc/kdiff3 ++- documentation.files = ../doc/* +++ documentation.path = /usr/share/doc/kdiff3 +++# documentation.files = ../doc/* ++ ++ INSTALLS += documentation ++ ++- target.path = /usr/local/bin +++ target.path = /usr/bin ++ INSTALLS += target ++ } ++ diff --cc debian/patches/mail-address.patch index 0000000,0000000..56385d0 new file mode 100644 --- /dev/null +++ b/debian/patches/mail-address.patch @@@ -1,0 -1,0 +1,14 @@@ ++Description: Lost my first mail address (after 17 years *sigh*), changed it. ++Origin: eike@debian.org ++ ++--- a/doc/en/kdiff3.1 +++++ b/doc/en/kdiff3.1 ++@@ -107,7 +107,7 @@ Visible name replacement. Supply this on ++ Show version of program. ++ .SH "AUTHOR" ++ .PP ++-This manual page was written by Eike Sauer for +++This manual page was written by Eike Sauer for ++ the \fBDebian\fP system (but may be used by others). Permission is ++ granted to copy, distribute and/or modify this document under ++ the terms of the GNU General Public License, Version 2 diff --cc debian/patches/no-MAX_PATH.diff index 0000000,0000000..130aeef new file mode 100644 --- /dev/null +++ b/debian/patches/no-MAX_PATH.diff @@@ -1,0 -1,0 +1,39 @@@ ++Description: remove MAX_PATH as it doesn't build on hurd ++Author: eike@debian.org ++--- ++This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ++Index: kdiff3-0.9.98/src-QT4/fileaccess.cpp ++=================================================================== ++--- kdiff3-0.9.98.orig/src-QT4/fileaccess.cpp +++++ kdiff3-0.9.98/src-QT4/fileaccess.cpp ++@@ -235,16 +235,24 @@ void FileAccess::setFile( const QFileInf ++ d()->m_linkTarget = fi.readLink(); ++ #else ++ // Unfortunately Qt4 readLink always returns an absolute path, even if the link is relative ++- char s[PATH_MAX+1]; ++- int len = readlink(QFile::encodeName(fi.absoluteFilePath()).constData(), s, PATH_MAX); ++- if ( len>0 ) +++ struct stat sb; +++ if (lstat(QFile::encodeName(fi.absoluteFilePath()).constData(), &sb) == -1) ++ { ++- s[len] = '\0'; ++- d()->m_linkTarget = QFile::decodeName(s); +++ d()->m_linkTarget = fi.readLink(); ++ } ++ else ++ { ++- d()->m_linkTarget = fi.readLink(); +++ char* s = (char*)malloc(sb.st_size + 1); +++ int len = readlink(QFile::encodeName(fi.absoluteFilePath()).constData(), s, PATH_MAX); +++ if ( len>0 ) +++ { +++ s[len] = '\0'; +++ d()->m_linkTarget = QFile::decodeName(s); +++ } +++ else +++ { +++ d()->m_linkTarget = fi.readLink(); +++ } ++ } ++ #endif ++ } diff --cc debian/patches/series index 0000000,0000000..2b8b262 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,8 @@@ ++kdiff3.pro.patch ++create_qm_files.patch ++typos.patch ++mail-address.patch ++kdiff3-qt-doc-placement.diff ++kdiff3-qt-hardening.patch ++crash-and-status-line.patch ++no-MAX_PATH.diff diff --cc debian/patches/typos.patch index 0000000,0000000..46d66f3 new file mode 100644 --- /dev/null +++ b/debian/patches/typos.patch @@@ -1,0 -1,0 +1,1089 @@@ ++Description: Changed language problems reported by lintian, "explicitely" and "allows to". ++Origin: eike@debian.org ++ ++--- a/ChangeLog +++++ b/ChangeLog ++@@ -101,7 +101,7 @@ Version 0.9.93 - 2009/01/06 ++ ++ Version 0.9.92 - 2007/04/15 ++ =========================== ++-- Windows installer now allows to install KDiff3 as Clearcase Diff and Merge Tool +++- Windows installer now allows you to install KDiff3 as Clearcase Diff and Merge Tool ++ - Windows installer "SVN Merge tool" corrected: Not creating $AppData\Subversion\config subdir anymore. ++ - KDE-Konqueror plugin: Launch KDiff3 from Konqueror. (Similar to Diff-Ext on Windows.) ++ - Qt4-version ++@@ -112,7 +112,7 @@ Version 0.9.92 - 2007/04/15 ++ - Temp file names use the process id in file name to allow several instances. ++ - Suppress flicker during startup. (Don't show status info window on creation.) ++ - New File comparison mode: Trust the size and date, but use binary comparison if date doesn't match (unsafe) ++-- After explicitely selecting files any file of the selected may be right clicked for context menu. +++- After explicitly selecting files any file of the selected may be right clicked for context menu. ++ - Open dialog also shows current directories in directory comparison mode. ++ - Writing a file via --auto option didn't work for relative files. (Reported by Guilhem Bichot) ++ - New option for history merge: Max number of history entries ++@@ -234,7 +234,7 @@ Version 0.9.84 - 2004/05/29 ++ ============================ ++ New Features: ++ - Word Wrap for DiffTextWindow ++-- Directory-Comparison: Option "Full Analysis" allows to show the number of solved vs. unsolved +++- Directory-Comparison: Option "Full Analysis" allows you to show the number of solved vs. unsolved ++ conflicts or deltas vs. whitespace-changes in the directory tree. ++ - Diff-Menu for Diff-view specific entries ++ - Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor. ++@@ -245,7 +245,7 @@ New Features: ++ - In the Qt-only-version the user-interface-language can be set via the regional-settings ++ (only effective after a restart). ++ - ProgressDialog redesign for recursive use. ++-- Overview now allows to show the delta between two other files in triplediff-mode. +++- Overview now allows you to show the delta between two other files in triplediff-mode. ++ - Option to ignore case which treats case-changes like white space (instead of conversion to upcase). ++ Bugfixes: ++ - Dir-Comp: When one file exists, but the other doesn't then instead the latest used other file was displayed. ++--- a/doc/en/index.docbook +++++ b/doc/en/index.docbook ++@@ -341,8 +341,8 @@ They will appear in the usage help like ++ ++ ++ ++- The open dialog allows to edit the filenames by hand, selecting a file ++- via the file-browser ("File...") or allows to choose recent files from +++ The open dialog allows you to edit the filenames by hand, selecting a file +++ via the file-browser ("File...") or allows you to choose recent files from ++ the drop-down lists. If you open the dialog again, then the current names ++ still remain there. The third input file is not required. If the ++ entry for "C" remains empty, then only a two file diff analysis will be ++@@ -722,7 +722,7 @@ For more information also see ++ To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert). ++ But there exists an option "Auto Copy Selection". If this is enabled, ++- then whatever you select is copied immediately and you don't need to explicitely +++ then whatever you select is copied immediately and you don't need to explicitly ++ copy. But pay attention when using this because the contents of the clipboard ++ might then be destroyed accidentally. ++ ++@@ -857,7 +857,7 @@ For more information also see Auto indentation: When pressing Enter or Return the indentation ++ of the previous line is used for the new line. ++ Auto copy selection: Every selection is immediately copied ++- to the clipboard when active and you needn't explicitely copy it. +++ to the clipboard when active and you needn't explicitly copy it. ++ Line end style: When saving you can select what line ++ end style you prefer. The default setting is the common choice for the used operating system. ++ ++@@ -1596,7 +1596,7 @@ So this is what this program can do for ++ When you have made all your operation choices (in all subdirectories too) ++ then you can start the merge. ++ ++- Be aware that if you didn't specify a destination directory explicitely, +++ Be aware that if you didn't specify a destination directory explicitly, ++ then the destination will be "C" in three directory mode, "B" in two directory ++ merge mode, and in sync-mode it will be "A" or/and "B". ++ ++--- a/src-QT4/optiondialog.cpp +++++ b/src-QT4/optiondialog.cpp ++@@ -780,7 +780,7 @@ void OptionDialog::setupEditPage( void ) ++ gbox->addWidget( pAutoCopySelection, line, 0, 1, 2 ); ++ pAutoCopySelection->setToolTip( i18n( ++ "On: Any selection is immediately written to the clipboard.\n" ++- "Off: You must explicitely copy e.g. via Ctrl-C." +++ "Off: You must explicitly copy e.g. via Ctrl-C." ++ )); ++ ++line; ++ ++@@ -1509,7 +1509,7 @@ static const char* countryMap[]={ ++ m_pSameEncoding = new OptionCheckBox( i18n("Use the same encoding for everything:"), true, "SameEncoding", &m_options.m_bSameEncoding, page, this ); ++ gbox->addWidget( m_pSameEncoding, line, 0, 1, 2 ); ++ m_pSameEncoding->setToolTip( i18n( ++- "Enable this allows to change all encodings by changing the first only.\n" +++ "Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ ) ); ++ ++line; ++--- a/po/kdiff3.pot +++++ b/po/kdiff3.pot ++@@ -894,7 +894,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:762 ++@@ -1355,7 +1355,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1482 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/sv/kdiff3.po +++++ b/po/sv/kdiff3.po ++@@ -2284,7 +2284,7 @@ msgstr "Kopiera automatiskt markering" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "PÃ¥: Alla markeringar skrivs omedelbart till klippbordet.\n" ++ "Av: Du mÃ¥ste kopiera explicit, t.ex. via Ctrl-C." ++@@ -2848,7 +2848,7 @@ msgstr "Använd samma kodning för allt: ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Att aktivera det här lÃ¥ter dig ändra alla kodningar genom att bara ändra den " ++--- a/po/eo/kdiff3.po +++++ b/po/eo/kdiff3.po ++@@ -2145,7 +2145,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2613,7 +2613,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/bs/kdiff3.po +++++ b/po/bs/kdiff3.po ++@@ -2298,7 +2298,7 @@ msgstr "Automatsko kopiranje izbora" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Uključeno: Svaki izbor se odmah upisuje u clipboard.\n" ++ "Isključeno: Morate eksplicitno kopirati, nrp. preko Ctrl+C." ++@@ -2868,7 +2868,7 @@ msgstr "Koristi isto kodiranje za sve:" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Uključivanjem ovog možete promijeniti sva kodiranja promjenom samo prvog.\n" ++--- a/po/ja/kdiff3.po +++++ b/po/ja/kdiff3.po ++@@ -2274,7 +2274,7 @@ msgstr "選択を自動的にコピーだ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "オン: すべての選択は直ちにクリップボードに格納されます。\n" ++ "オフ: Ctrl+C などで明示的にコピーする必要があります。" ++@@ -2820,7 +2820,7 @@ msgstr "すべてに同じエンコーム++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "このオプションを有効にすると、最初を変更するだけですべてのエンコーディングを" ++--- a/po/nl/kdiff3.po +++++ b/po/nl/kdiff3.po ++@@ -2314,7 +2314,7 @@ msgstr "Automatische kopieerselectie" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Aan: elke selectie zal onmiddellijk op het klembord geplaatst worden.\n" ++ "Uit: kopiëren gebeurt expliciet, bijvoorbeeld via Ctrl-C." ++@@ -2894,7 +2894,7 @@ msgstr "Dezelfde codering gebruiken voor ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Schakel dit in dit om alle coderingen te wijzigen door alleen de eerste aan " ++--- a/po/mai/kdiff3.po +++++ b/po/mai/kdiff3.po ++@@ -2144,7 +2144,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2614,7 +2614,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/ru/kdiff3.po +++++ b/po/ru/kdiff3.po ++@@ -2289,7 +2289,7 @@ msgstr "Копировать выделР++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Вкл: любое выделение сразу же записывается в буфер обмена.\n" ++ "Выкл: вы должны явно скопировать, например, с помощью Ctrl-C." ++@@ -2864,7 +2864,7 @@ msgstr "Использовать ту ж ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Включая эту опцию позволяет изменить все кодировки изменяя только первую.\n" ++--- a/po/nds/kdiff3.po +++++ b/po/nds/kdiff3.po ++@@ -2295,7 +2295,7 @@ msgstr "Köör autom. koperen" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "An: All Kören warrt fuurts na de Twischenaflaag kopeert.\n" ++ "Ut: Du muttst dat Koperen sülven maken, a.B. mit Strg+C." ++@@ -2873,7 +2873,7 @@ msgstr "De sülve Koderen för allens br ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Is dit anmaakt, kannst Du all Koderen över de eerste ännern.\n" ++--- a/po/br/kdiff3.po +++++ b/po/br/kdiff3.po ++@@ -2203,7 +2203,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2680,7 +2680,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/hr/kdiff3.po +++++ b/po/hr/kdiff3.po ++@@ -2145,7 +2145,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2611,7 +2611,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/tg/kdiff3.po +++++ b/po/tg/kdiff3.po ++@@ -2304,7 +2304,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2782,7 +2782,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/ta/kdiff3.po +++++ b/po/ta/kdiff3.po ++@@ -2354,7 +2354,7 @@ msgstr "தானாகவே தேரà ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "எந்த ஒரு தேர்வையும் உடனடியாக கிளிப் போர்டுக்கு எழுதவும்.\n" ++ "நீங்கள் வெளிப்படையாக படிவு செய்" ++@@ -2890,7 +2890,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/bg/kdiff3.po +++++ b/po/bg/kdiff3.po ++@@ -2302,7 +2302,7 @@ msgstr "Автоматично ÐºÐ¾Ð¿Ð¸Ñ ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Включено: Всичко избрано се записва веднага в системния буфер.\n" ++ "Изключено: Трябва изрично да копирате, например с Ctrl-C." ++@@ -2870,7 +2870,7 @@ msgstr "Използване на едн ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Включвайки това, можете да промените всички кодировки с промяната само на " ++--- a/po/de/kdiff3.po +++++ b/po/de/kdiff3.po ++@@ -2310,7 +2310,7 @@ msgstr "Auswahl automatisch kopieren" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Falls aktiv, wird die Auswahl automatisch sofort in die Zwischenablage " ++ "kopiert.\n" ++@@ -2896,7 +2896,7 @@ msgstr "Überall die gleiche Kodierung v ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Durch Aktivierung dieser Option können alle Kodierungen durch Setzen der " ++--- a/po/en_GB/kdiff3.po +++++ b/po/en_GB/kdiff3.po ++@@ -2278,10 +2278,10 @@ msgstr "Auto copy selection" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ ++ #: optiondialog.cpp:768 ++ #, fuzzy ++@@ -2843,10 +2843,10 @@ msgstr "Use the same encoding for everyt ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ ++ #: optiondialog.cpp:1471 ++--- a/po/ar/kdiff3.po +++++ b/po/ar/kdiff3.po ++@@ -2177,7 +2177,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2646,7 +2646,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/tr/kdiff3.po +++++ b/po/tr/kdiff3.po ++@@ -2245,7 +2245,7 @@ msgstr "Seçimi otomatik olarak kopyala" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2727,7 +2727,7 @@ msgstr "Herşey için aynı kodlamayı k ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/ka/kdiff3.po +++++ b/po/ka/kdiff3.po ++@@ -2340,7 +2340,7 @@ msgstr "მონიშვნის აá ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "ჩართულია: ნებისმიერი მონიშვნა ჯდება გაცვლის ბუფერში.\n" ++ "გამორთულია: თქვენ ასლი უნდა გააკეთოთ მაგ. Ctrl-C." ++@@ -2871,7 +2871,7 @@ msgstr "ყველასთვის á ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "ამის ჩართვა სასუალებას გაძლევთ ყველა კოდირება შეცვალოთ მხოლოდ პირველის " ++--- a/po/rw/kdiff3.po +++++ b/po/rw/kdiff3.po ++@@ -2513,7 +2513,7 @@ msgstr "Gukoporora Ihitamo " ++ #, fuzzy ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "G." ++ ++ #: optiondialog.cpp:768 ++@@ -3094,7 +3094,7 @@ msgstr "i Imisobekere: ya: : " ++ #: optiondialog.cpp:1466 ++ #, fuzzy ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "iyi Kuri Guhindura... Byose ku i Itangira . \n" ++--- a/po/pt/kdiff3.po +++++ b/po/pt/kdiff3.po ++@@ -2304,7 +2304,7 @@ msgstr "Copiar automaticamente a selecç ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Ligado: Qualquer selecção é posta automaticamente na área de transferência.\n" ++ "Desligado: Você tem de copiar explicitamente, p.ex., com o Ctrl-C." ++@@ -2879,7 +2879,7 @@ msgstr "Utilizar a mesma codificação p ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Active isto para permitir modificar todas as codificações alterando apenas a " ++--- a/po/es/kdiff3.po +++++ b/po/es/kdiff3.po ++@@ -2318,7 +2318,7 @@ msgstr "Auto-copiar selección" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "On: Se copiará inmediátamente cualquier selección al portapapeles.\n" ++ "Off: Debe copiar explícitamente p.e. vía Ctrl-C." ++@@ -2906,7 +2906,7 @@ msgstr "Usar la misma codificación para ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Activar esto permite cambiar todas las codificaciónes cambiando solo la " ++--- a/po/it/kdiff3.po +++++ b/po/it/kdiff3.po ++@@ -2300,7 +2300,7 @@ msgstr "Copia automaticamente la selezio ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Attivo: ogni selezione è immediatamente copiata negli appunti.\n" ++ "Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C." ++@@ -2877,7 +2877,7 @@ msgstr "Usa la stessa codifica per tutto ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Permette di cambiare tutte le codifiche cambiando solo la prima.\n" ++--- a/po/ca@valencia/kdiff3.po +++++ b/po/ca@valencia/kdiff3.po ++@@ -2307,7 +2307,7 @@ msgstr "Copia la selecció automàticame ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Activat: totes les seleccions s'alçaran al porta-retalls.\n" ++ "Desactivat: haureu de copiar explícitament, p. ex. mitjançant Ctrl-C." ++@@ -2888,7 +2888,7 @@ msgstr "Usa la mateixa configuració a t ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Habilitar això permet canviar totes les codificacions canviant només la " ++--- a/po/ro/kdiff3.po +++++ b/po/ro/kdiff3.po ++@@ -2212,7 +2212,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2683,7 +2683,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/pt_BR/kdiff3.po +++++ b/po/pt_BR/kdiff3.po ++@@ -2306,7 +2306,7 @@ msgstr "Auto copiar seleção" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Ligado: Qualquer seleção é imediatamente enviada para a Área de " ++ "Transferência.\n" ++@@ -2881,7 +2881,7 @@ msgstr "Utilizar a mesma codificação p ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Ative isto para permitir modificar todas as codificações alterando apenas a " ++--- a/po/ml/kdiff3.po +++++ b/po/ml/kdiff3.po ++@@ -2216,7 +2216,7 @@ msgstr "യാന്ത്രിക à´ªà ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "ഓണ്‍: തെരഞ്ഞെടുത്തതെന്തും ഉടനടി ഓര്‍മ്മച്ചെപ്പില്‍ എഴുതപ്പെടും.\n" ++ "ഓഫ്: നിങ്ങള്‍ നിസ്സംശയം പകര്‍പ്പെടുക്കണം. ഉദാഹരണമായി Ctrl+C വഴി." ++@@ -2726,7 +2726,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/hu/kdiff3.po +++++ b/po/hu/kdiff3.po ++@@ -2369,7 +2369,7 @@ msgstr "A kijelölt adatok automatikus k ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Ha be van jelölve: a kijelölt adatok másolata mindig automatikusan a " ++ "vágólapra kerül.\n" ++@@ -2919,7 +2919,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/lt/kdiff3.po +++++ b/po/lt/kdiff3.po ++@@ -2246,7 +2246,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2715,7 +2715,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/is/kdiff3.po +++++ b/po/is/kdiff3.po ++@@ -2234,7 +2234,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2706,7 +2706,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/ga/kdiff3.po +++++ b/po/ga/kdiff3.po ++@@ -2148,7 +2148,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2619,7 +2619,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/zh_TW/kdiff3.po +++++ b/po/zh_TW/kdiff3.po ++@@ -2167,7 +2167,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2635,7 +2635,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/gl/kdiff3.po +++++ b/po/gl/kdiff3.po ++@@ -2307,7 +2307,7 @@ msgstr "Copiar automaticamente a selecci ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Sinalado: calquera selección é posta automaticamente no portarretallos.\n" ++ "Non sinalado: Terá que copiar explicitamente, p.ex., con Ctrl+C." ++@@ -2926,7 +2926,7 @@ msgstr "Utilizar a mesma codificación p ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Sinale isto para permitir modificar todas as codificacións trocando só a " ++--- a/po/da/kdiff3.po +++++ b/po/da/kdiff3.po ++@@ -2284,7 +2284,7 @@ msgstr "Autokopi udvalg" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Til: Enhver markering bliver umiddelbart skrevet til udklipsholderen.\n" ++ "Fra: Du skal eksplicit kopiere f.eks. via Ctrl-C." ++@@ -2850,7 +2850,7 @@ msgstr "Brug samme tegnsæt til alt:" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "At aktivere dette lader dig ændre alle tegnsæt ved at kun ændre den første.\n" ++--- a/po/nb/kdiff3.po +++++ b/po/nb/kdiff3.po ++@@ -2267,7 +2267,7 @@ msgstr "Autokopier utvalg" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "PÃ¥: Alt som markeres skrives straks til utklippstavla.\n" ++ "Av: Du mÃ¥ uttrykkelig kopiere, f.eks. med Ctrl-C." ++@@ -2823,7 +2823,7 @@ msgstr "Bruk samme koding for alt:" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Hvis dette er slÃ¥tt pÃ¥ kan alle kodinger endres ved bare Ã¥ endre den første." ++--- a/po/hi/kdiff3.po +++++ b/po/hi/kdiff3.po ++@@ -2218,7 +2218,7 @@ msgstr "स्वचालित नकà ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2699,7 +2699,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/zh_CN/kdiff3.po +++++ b/po/zh_CN/kdiff3.po ++@@ -2240,7 +2240,7 @@ msgstr "自动复制选择" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "打开：任何选择将被自动写入剪贴板。\n" ++ "关闭：您必须明确复制内容，如通过 Ctrl-C。" ++@@ -2772,7 +2772,7 @@ msgstr "æ‰€æœ‰æ–‡ä»¶ä½¿ç”¨åŒä¸€ç¼–ç ï¼ ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "启用此选项将使得只更改第一个编码设置即可更改全部文件的编码。\n" ++--- a/po/el/kdiff3.po +++++ b/po/el/kdiff3.po ++@@ -2315,7 +2315,7 @@ msgstr "Αυτόματη Î±Î½Ï„Î¹Î³ÏÎ±Ï ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Ενεργοποιημένο: Οποιαδήποτε επιλογή γράφεται άμεσα στο πρόχειρο. " ++ "Απενεργοποιημένο: Θα πρέπει να την αντιγράψετε εσείς π.χ. μέσω του Ctrl-C." ++@@ -2897,7 +2897,7 @@ msgstr "Χρήση της ίδιας ÎºÏ ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Ενεργοποιώντας αυτή την επιλογή επιτρέπει την αλλαγή όλων των κωδικοποιήσεων " ++--- a/po/hne/kdiff3.po +++++ b/po/hne/kdiff3.po ++@@ -2182,7 +2182,7 @@ msgstr "अपने अपन नकल ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2654,7 +2654,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/pl/kdiff3.po +++++ b/po/pl/kdiff3.po ++@@ -2305,7 +2305,7 @@ msgstr "Wybór automatycznego kopiowania ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Włączone: Jakiekolwiek zaznaczenie powoduje natychmiastowy zapis do " ++ "schowka.\n" ++@@ -2887,7 +2887,7 @@ msgstr "Używanie tego samego kodowania ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Włączenie tej opcji pozwala na zmianę wszystkich kodowań zmieniając tylko " ++--- a/po/fr/kdiff3.po +++++ b/po/fr/kdiff3.po ++@@ -2330,7 +2330,7 @@ msgstr "Copier automatiquement la sélec ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Activé : toute sélection est immédiatement copiée dans le presse-papiers.\n" ++ "Désactivé : vous devrez effectuer la copie explicitement (ex. via Ctrl-C)." ++@@ -2924,7 +2924,7 @@ msgstr "Utiliser le même encodage pour ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Cocher cette option permet de changer tous les encodages en ne modifiant que " ++--- a/po/ca/kdiff3.po +++++ b/po/ca/kdiff3.po ++@@ -2305,7 +2305,7 @@ msgstr "Copia la selecció automàticame ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Activat: totes les seleccions es desaran al porta-retalls.\n" ++ "Desactivat: haureu de copiar explícitament, p. ex. mitjançant Ctrl-C." ++@@ -2882,7 +2882,7 @@ msgstr "Usa la mateixa codificació a to ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Habilitar això permet canviar totes les codificacions canviant només la " ++--- a/po/et/kdiff3.po +++++ b/po/et/kdiff3.po ++@@ -2274,7 +2274,7 @@ msgstr "Valiku automaatne kopeerimine" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Sees: iga valik asetatakse otsekohe lõikepuhvrisse.\n" ++ "Väljas: kopeerimiseks tuleb anda selge käsk, nt. CTRL+C." ++@@ -2835,7 +2835,7 @@ msgstr "Kõikjal kasutatakse kodeeringut ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Lubab muuta kõiki kodeeringuid ainult esimest kodeeringut muutes.\n" ++--- a/po/uk/kdiff3.po +++++ b/po/uk/kdiff3.po ++@@ -2296,7 +2296,7 @@ msgstr "Автоматичне ÐºÐ¾Ð¿Ñ–Ñ ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Увімкнено: Будь-яка вибрана область копіюється до кишені.\n" ++ "Вимкнено: Явне проведення копіювання, наприклад за допомогою Ctrl-C." ++@@ -2860,7 +2860,7 @@ msgstr "Використовувати Ð ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Увімкнення цього параметра надає змогу змінювати всі кодування зміною лише " ++--- a/po/cy/kdiff3.po +++++ b/po/cy/kdiff3.po ++@@ -2190,7 +2190,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2663,7 +2663,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/nn/kdiff3.po +++++ b/po/nn/kdiff3.po ++@@ -2142,7 +2142,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2608,7 +2608,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/ug/kdiff3.po +++++ b/po/ug/kdiff3.po ++@@ -2142,7 +2142,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2608,7 +2608,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ ++--- a/po/cs/kdiff3.po +++++ b/po/cs/kdiff3.po ++@@ -2270,7 +2270,7 @@ msgstr "Automaticky zkopírovat výběr" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ "Zap: Celý výběr je ihned vložen do schránky.\n" ++ "Vyp: Výběr musíte zkopírovat např.: pomocí Ctrl-C." ++@@ -2838,7 +2838,7 @@ msgstr "Použít stejné kódování pro ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ "Zapnout, pokud chcete změnit vÅ¡echna kódování pouze podle změny prvního.\n" ++--- a/po/sk/kdiff3.po +++++ b/po/sk/kdiff3.po ++@@ -2140,7 +2140,7 @@ msgstr "" ++ #: optiondialog.cpp:757 ++ msgid "" ++ "On: Any selection is immediately written to the clipboard.\n" ++-"Off: You must explicitely copy e.g. via Ctrl-C." +++"Off: You must explicitly copy e.g. via Ctrl-C." ++ msgstr "" ++ ++ #: optiondialog.cpp:768 ++@@ -2606,7 +2606,7 @@ msgstr "" ++ ++ #: optiondialog.cpp:1466 ++ msgid "" ++-"Enable this allows to change all encodings by changing the first only.\n" +++"Enable this in order to change all encodings by changing the first only.\n" ++ "Disable this if different individual settings are needed." ++ msgstr "" ++ diff --cc debian/rules index 0000000,0000000..7525ca4 new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,51 @@@ ++#!/usr/bin/make -f ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++#export DH_OPTIONS=-v ++ ++#%: ++# dh $@ ++ ++# Use override_dh_* targets to customize this. ++# --------------------------------------------------- ++ ++DEB_COMPRESS_EXCLUDE := ".docbook" ++DEB_BUILD_PARALLEL = 1 ++export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed ++ ++include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/class/cmake.mk ++# include /usr/share/cdbs/1/rules/simple-patchsys.mk ++DPKG_EXPORT_BUILDFLAGS = 1 ++include /usr/share/dpkg/buildflags.mk ++ ++clean:: ++ # TODO if makefile... ++ # clean QT version ++ qmake-qt4 -nocache src-QT4/kdiff3.pro -o src-QT4/Makefile ++ make -C src-QT4 distclean ++ ++build/kdiff3-qt:: ++ qmake-qt4 -nocache src-QT4/kdiff3.pro -o src-QT4/Makefile ++ make $(DEB_MAKE_PARALLEL) -C src-QT4 prefix=$(CURDIR)/debian/kdiff3-qt ++ ++install/kdiff3:: ++ # install man page ++ mkdir --parents $(DEB_DESTDIR)usr/share/man/man1 ++ cp doc/en/kdiff3.1 $(DEB_DESTDIR)usr/share/man/man1/kdiff3.1 ++ # update gnome's icon cache ++ dh_icons --package kdiff3 --tmpdir=debian/tmp ++ ++install/kdiff3-qt:: ++ mkdir --parents $(CURDIR)/debian/kdiff3-qt ++ make INSTALL_ROOT=$(CURDIR)/debian/kdiff3-qt install -C src-QT4 prefix=$(CURDIR)/debian/kdiff3-qt ++ cd po && export INSTALL_ROOT=$(CURDIR)/debian/kdiff3-qt && /bin/sh create_qm_files install ++ # update gnome's icon cache ++ dh_icons --package kdiff3-qt --tmpdir=debian/tmp ++ ++install/kdiff3-doc:: ++ # generate HTML help ++ mkdir --parents $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ ++ cp doc/en/index.docbook $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ ++ # use UTF-8 for documentation generation, no matter the system's locale ++ cd $(DEB_DESTDIR)usr/share/doc/kdiff3-doc/html/ && LC_ALL=C.UTF-8 meinproc4 index.docbook diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/lintian-overrides index 0000000,0000000..e061568 new file mode 100644 --- /dev/null +++ b/debian/source/lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# see http://lintian.debian.org/tags/package-needs-versioned-debhelper-build-depends.html ++kdiff3 source: package-needs-versioned-debhelper-build-depends diff --cc debian/watch index 0000000,0000000..5da7bcf new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,8 @@@ ++# As version numbering of KDiff3 has changed from 0.93, 0.931, ... to 0.9.50, 0.9.60, ++# we have to dump the former ones. They would be considered to have a higher version ++# number by uscan. Addition: Ignore a x.y.zz-QT version as well. ++# Yet another version numbering change: We've got 0.9.93-3 now... But "-QT" versions ++# are automatically ignored now. ++ ++version=3 ++http://sf.net/kdiff3/kdiff3-(.\..\..*)\.tar.gz debian uupdate