Compare commits
102 Commits
@ -1,6 +1,3 @@
|
||||
[submodule "admin"]
|
||||
path = admin
|
||||
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin
|
||||
[submodule "cmake"]
|
||||
path = cmake
|
||||
url = http://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
|
||||
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
|
||||
|
@ -0,0 +1,28 @@
|
||||
#################################################
|
||||
#
|
||||
# (C) 2018 Slávek Banko
|
||||
# slavek.banko (AT) axis.cz
|
||||
#
|
||||
# Improvements and feedback are welcome
|
||||
#
|
||||
# This file is released under GPL >= 2
|
||||
#
|
||||
#################################################
|
||||
|
||||
cmake_minimum_required( VERSION 2.8 )
|
||||
|
||||
|
||||
##### include our cmake modules #################
|
||||
|
||||
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
|
||||
include( TDEL10n )
|
||||
|
||||
|
||||
##### create translation templates ##############
|
||||
|
||||
tde_l10n_auto_add_subdirectories( )
|
||||
|
||||
tde_l10n_create_template(
|
||||
CATALOG "desktop_files/kdiff3-desktops"
|
||||
SOURCES *.desktop
|
||||
)
|
@ -0,0 +1,79 @@
|
||||
############################################
|
||||
# #
|
||||
# Improvements and feedbacks are welcome #
|
||||
# #
|
||||
# This file is released under GPL >= 3 #
|
||||
# #
|
||||
############################################
|
||||
|
||||
|
||||
cmake_minimum_required( VERSION 2.8 )
|
||||
|
||||
|
||||
#### general package setup
|
||||
|
||||
project( kdiff3 )
|
||||
set( VERSION R14.0.9 )
|
||||
|
||||
|
||||
#### include essential cmake modules
|
||||
|
||||
include( FindPkgConfig )
|
||||
include( CheckFunctionExists )
|
||||
include( CheckSymbolExists )
|
||||
include( CheckIncludeFile )
|
||||
include( CheckLibraryExists )
|
||||
include( CheckCSourceCompiles )
|
||||
include( CheckCXXSourceCompiles )
|
||||
|
||||
|
||||
#### include our cmake modules
|
||||
|
||||
set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
|
||||
include( TDEMacros )
|
||||
|
||||
|
||||
##### setup install paths
|
||||
|
||||
include( TDESetupPaths )
|
||||
tde_setup_paths( )
|
||||
|
||||
|
||||
##### optional stuff
|
||||
|
||||
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
|
||||
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
|
||||
|
||||
|
||||
##### user requested modules
|
||||
|
||||
option( BUILD_ALL "Build all" ON )
|
||||
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
|
||||
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
|
||||
|
||||
|
||||
##### configure checks
|
||||
|
||||
include( ConfigureChecks.cmake )
|
||||
|
||||
|
||||
###### global compiler settings
|
||||
|
||||
add_definitions( -DHAVE_CONFIG_H )
|
||||
|
||||
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
|
||||
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
|
||||
set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
|
||||
|
||||
|
||||
##### directories
|
||||
|
||||
add_subdirectory( src )
|
||||
add_subdirectory( kdiff3plugin )
|
||||
tde_conditional_add_subdirectory( BUILD_DOC doc )
|
||||
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations )
|
||||
|
||||
|
||||
##### write configure files
|
||||
|
||||
configure_file( config.h.cmake config.h @ONLY )
|
@ -0,0 +1,25 @@
|
||||
###########################################
|
||||
# #
|
||||
# Improvements and feedback are welcome #
|
||||
# #
|
||||
# This file is released under GPL >= 3 #
|
||||
# #
|
||||
###########################################
|
||||
|
||||
# required stuff
|
||||
find_package( TQt )
|
||||
find_package( TDE )
|
||||
|
||||
tde_setup_architecture_flags( )
|
||||
|
||||
include(TestBigEndian)
|
||||
test_big_endian(WORDS_BIGENDIAN)
|
||||
|
||||
tde_setup_largefiles( )
|
||||
|
||||
|
||||
##### check for gcc visibility support
|
||||
|
||||
if( WITH_GCC_VISIBILITY )
|
||||
tde_setup_gcc_visibility( )
|
||||
endif( WITH_GCC_VISIBILITY )
|
@ -1,168 +1,16 @@
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
These are generic installation instructions.
|
||||
Please read the README-file for most needed steps first.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, a file
|
||||
`config.cache' that saves the results of its tests to speed up
|
||||
reconfiguring, and a file `config.log' containing compiler output
|
||||
(useful mainly for debugging `configure').
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If at some point `config.cache'
|
||||
contains results you don't want to keep, you may remove or edit it.
|
||||
|
||||
The file `configure.in' is used to create `configure' by a program
|
||||
called `autoconf'. You only need `configure.in' if you want to change
|
||||
it or regenerate `configure' using a newer version of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system. If you're
|
||||
using `csh' on an old version of System V, you might need to type
|
||||
`sh ./configure' instead to prevent `csh' from trying to execute
|
||||
`configure' itself.
|
||||
|
||||
Running `configure' takes a while. While running, it prints some
|
||||
messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
|
||||
4. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. You can give `configure'
|
||||
initial values for variables by setting them in the environment. Using
|
||||
a Bourne-compatible shell, you can do that on the command line like
|
||||
this:
|
||||
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
|
||||
|
||||
Or on systems that have the `env' program, you can do it like this:
|
||||
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you must use a version of `make' that
|
||||
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
|
||||
If you have to use a `make' that does not supports the `VPATH'
|
||||
variable, you have to compile the package for one architecture at a time
|
||||
in the source code directory. After you have installed the package for
|
||||
one architecture, use `make distclean' before reconfiguring for another
|
||||
architecture.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' will install the package's files in
|
||||
`/usr/local/bin', `/usr/local/man', etc. You can specify an
|
||||
installation prefix other than `/usr/local' by giving `configure' the
|
||||
option `--prefix=PATH'.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
give `configure' the option `--exec-prefix=PATH', the package will use
|
||||
PATH as the prefix for installing programs and libraries.
|
||||
Documentation and other data files will still use the regular prefix.
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' can not figure out
|
||||
automatically, but needs to determine by the type of host the package
|
||||
will run on. Usually `configure' can figure that out, but if it prints
|
||||
a message saying it can not guess the host type, give it the
|
||||
`--host=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name with three fields:
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the host type.
|
||||
|
||||
If you are building compiler tools for cross-compiling, you can also
|
||||
use the `--target=TYPE' option to select the type of system they will
|
||||
produce code for and the `--build=TYPE' option to select the type of
|
||||
system on which you are compiling the package.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Operation Controls
|
||||
==================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Use and save the results of the tests in FILE instead of
|
||||
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
|
||||
debugging `configure'.
|
||||
|
||||
`--help'
|
||||
Print a summary of the options to `configure', and exit.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made.
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--version'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options.
|
||||
|
||||
Kdiff3 relies on cmake to build.
|
||||
|
||||
Here are suggested default options:
|
||||
|
||||
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
|
||||
-DCONFIG_INSTALL_DIR="/etc/trinity" \
|
||||
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
|
||||
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_VERBOSE_MAKEFILE="ON" \
|
||||
-DCMAKE_SKIP_RPATH="OFF" \
|
||||
-DBUILD_ALL="ON" \
|
||||
-DWITH_ALL_OPTIONS="ON"
|
||||
|
@ -1,22 +0,0 @@
|
||||
SUBDIRS = $(TOPSUBDIRS)
|
||||
|
||||
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
|
||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
|
||||
|
||||
$(top_srcdir)/subdirs:
|
||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
|
||||
|
||||
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
|
||||
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
|
||||
|
||||
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
|
||||
|
||||
package-messages:
|
||||
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
|
||||
$(MAKE) -C po merge
|
||||
|
||||
EXTRA_DIST = admin COPYING configure.in.in
|
||||
|
||||
dist-hook:
|
||||
cd $(top_distdir) && perl admin/am_edit -padmin
|
||||
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
|
@ -1,10 +0,0 @@
|
||||
all:
|
||||
@echo "This Makefile is only for the CVS repository"
|
||||
@echo "This will be deleted before making the distribution"
|
||||
@echo ""
|
||||
$(MAKE) -f admin/Makefile.common cvs
|
||||
|
||||
dist:
|
||||
$(MAKE) -f admin/Makefile.common dist
|
||||
|
||||
.SILENT:
|
@ -1,280 +1,34 @@
|
||||
KDiff3-Readme
|
||||
=============
|
||||
|
||||
Author: Joachim Eibl (joachim.eibl at gmx.de)
|
||||
Copyright: (C) 2002-2006 by Joachim Eibl
|
||||
KDiff3-Version: 0.9.92
|
||||
kdiff3 - a diff and merge program.
|
||||
|
||||
|
||||
KDiff3 is a program that
|
||||
- compares and merges two or three 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
|
||||
- has support for TDE-TDEIO (ftp, sftp, http, fish, smb)
|
||||
- and has an intuitive graphical user interface,
|
||||
- also supports 64 bit systems. (Some build issues are discussed in here.)
|
||||
|
||||
|
||||
Do you want help translating? Read the README in the po-subdirectory!
|
||||
|
||||
|
||||
License:
|
||||
GNU GENERAL PUBLIC LICENSE, Version 2, June 1991
|
||||
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
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
For details see file "COPYING".
|
||||
|
||||
Exception from the GPL:
|
||||
As a special exception, the copyright holder Joachim Eibl gives permission
|
||||
to link this program with the Qt-library (commercial or non-commercial edition)
|
||||
from Trolltech (www.trolltech.com), and he permits to distribute the resulting
|
||||
executable, without including the source code for the Qt-library in the
|
||||
source distribution.
|
||||
|
||||
|
||||
Requirements & Installation:
|
||||
Version 0.9.91 provides special support for KDE3, but it can also be
|
||||
built without KDE3 if the Qt-libraries are available.
|
||||
(I also test and use the program under Windows.)
|
||||
It is now also possible to build with Qt4 (See further below).
|
||||
|
||||
You always need
|
||||
- kdiff3-0.9.91.tar.gz
|
||||
|
||||
For building the KDE3-version
|
||||
- KDE>=3.3 and QT>=3.3-libraries. (but not with KDE4)
|
||||
- gcc, g++ with version >=3.2
|
||||
|
||||
For building the Qt-only-version
|
||||
- QT-libraries (version >=3.3.0, but <4.0 or >=4.2.0).
|
||||
(www.trolltech.com)
|
||||
- for Un*x: gcc, g++ with version >=3.2
|
||||
- for Windows: VC6 / VC7.1
|
||||
|
||||
On some distributions it will be necessary to install developer
|
||||
packages (RPMs) that contain include files for compilation:
|
||||
- xorg-x11-devel (or x11-devel)
|
||||
- qt-devel
|
||||
- tdelibs-devel
|
||||
|
||||
Installation for KDE3:
|
||||
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
|
||||
If it doesn't contain the correct path, type
|
||||
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
|
||||
- cd into the directory kdiff3-0.9.91 and type
|
||||
- ./configure --prefix=/opt/trinity (your KDE3 directory here)
|
||||
- (make clean) (Required if you already compiled once.)
|
||||
- make (Run compilation)
|
||||
- make install (You must have root-rights for this step.)
|
||||
|
||||
For details also see the generic instructions in file "INSTALL".
|
||||
|
||||
If some icons are not visible or don't seem right, probably the prefix
|
||||
was wrong. Check where your KDE3 installation is located and
|
||||
use that directory with the prefix-option of configure.
|
||||
|
||||
This command should tell you: tde-config --prefix
|
||||
|
||||
For SuSE and most distributions the prefix usually is /opt/trinity.
|
||||
For Redhat/Fedora and Mandrake the prefix usually is /usr.
|
||||
For a local installation, that doesn't need root rights try
|
||||
- ./configure --prefix=$TDEHOME ($TDEHOME probably is the same as $HOME/.trinity)
|
||||
- make
|
||||
- make install (Installs everything in $TDEHOME. No root rights required.)
|
||||
- Run $TDEHOME/bin/kdiff3. ($TDEHOME/bin is probably not in your path.)
|
||||
Warning: If a local installation and a global installation exist, the local
|
||||
menu, toolbar, help etc. will be used, even if you start the global
|
||||
executable. To avoid confusion, better remove the local version then.
|
||||
(rm -R `find $TDEHOME -name "*kdiff3*" -not -name "kdiff3*rc"`)
|
||||
|
||||
On Fedora-64-bit systems the following configure-line was reported to work:
|
||||
./configure --prefix=`tde-config --prefix` --enable-libsuffix=64 --with-qt-libraries=/usr/lib64/qt-3.3/lib/
|
||||
Both --enable-libsuffix=64 and -with-qt-libraries=/usr/lib64/qt-3.3/lib/ are needed;
|
||||
without the first one it fails to find the KDE libraries,
|
||||
and without the second one it fails to find libqt-mt
|
||||
(strangely enough: libqt-mt is in /usr/lib64/qt-3.3/lib,
|
||||
and "configure" tries /usr/lib64/qt-3.3/lib64)
|
||||
If your qt-libraries are elsewhere please adapt the path accordingly.
|
||||
|
||||
Some secondary dependencies aren't correctly discovered by configure.
|
||||
If e.g the a linker error appears telling you something like
|
||||
"Can't find -lacl" this probably means that you have to install
|
||||
libacl-devel-*.rpm etc.
|
||||
KDiff3 is a program that 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.
|
||||
|
||||
If you run an older version of KDE and the make-process fails in the
|
||||
doc- or po-directory, cd to the src-directory and run "make" there. Also run
|
||||
"make install" there. This hopefully will create a working kdiff3-binary,
|
||||
although without doc and language support.
|
||||
|
||||
Upgrading KDiff3 for KDE:
|
||||
If you already installed an older version or KDiff3 and you have the
|
||||
impression, that the new version doesn't work as described, you should try to
|
||||
remove all files belonging to KDiff3 before reinstalling.
|
||||
Try this search command to locate KDiff3-related files:
|
||||
find $HOME/.trinity /usr /opt -iname "*kdiff3*"
|
||||
(Will take a few minutes.)
|
||||
Included features:
|
||||
==================
|
||||
|
||||
|
||||
Building an RPM for Fedora Core (by Vadim Likhota)
|
||||
Copy kdiff3-0.9.91.tar.gz into /usr/src/redhat/SOURCE
|
||||
Copy kdiff3.spec into /usr/src/redhat/SPEC
|
||||
Run rpmbuild -bb --target i686 kdiff3.spec
|
||||
Find kdiff3-0.9.91-fc.i686.rpm in /usr/src/redhat/RPMS/I386
|
||||
|
||||
|
||||
Installation for the Qt-only-platforms for Un*x:
|
||||
(for Qt >=3.3.0 but <4.0)
|
||||
- Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
|
||||
If it doesn't contain the correct path, type
|
||||
export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
|
||||
- cd into the directory kdiff3-0.9.91/src and type
|
||||
- make -f Makefile.qt
|
||||
- make -f Makefile.qt install (You must have root-rights for this step.)
|
||||
(copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
|
||||
- Note: The file kdiff3.pro was used to generate the Makefile.qt:
|
||||
qmake kdiff3.pro -o Makefile.qt
|
||||
If you want to build the Qt-only version _and_ the KDE-version, do this
|
||||
in separate directories, otherwise there will be errors.
|
||||
- A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt
|
||||
LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
|
||||
|
||||
|
||||
Build for Windows:
|
||||
Use qmake and kdiff3.pro to generate
|
||||
an appropriate Makefile.
|
||||
qmake kdiff3.pro -o Makefile
|
||||
|
||||
|
||||
Building KDiff3 (Qt3) for Mac OSX 10.3.8 (by Mark Teel)
|
||||
-------------------------------------------------------
|
||||
1) Install Qt/Mac with thread support and static libraries.
|
||||
2) cd .../kdiff3-0.9.91/src
|
||||
3) Create a makefile for kdiff3 by executing:
|
||||
qmake kdiff3.pro -o Makefile.qt
|
||||
4) Edit Makefile.qt and change the include path like so:
|
||||
(old) INCPATH = -I/Library/qt3/mkspecs/default -Isrc ...
|
||||
(new) INCPATH = -I/Library/qt3/mkspecs/macx-g++ -Isrc ...
|
||||
5) Execute:
|
||||
make -f Makefile.qt
|
||||
6) After the build completes copy kdiff3 from the kdiff3-0.9.91/src directory to
|
||||
/Applications
|
||||
|
||||
Building KDiff3 (Qt4) for Mac OSX (with Intel processor) as a universal binary (by Michael Schmidt)
|
||||
---------------------------------------------------------------------------------------------------
|
||||
1) Install Qt/Mac 4.x with thread support, static libraries and universal flag.
|
||||
2) cd .../kdiff3-0.9.91/src-QT4
|
||||
3a) Create a makefile for kdiff3 by executing:
|
||||
qmake kdiff3.pro
|
||||
3b) optionally generate XCode-Project (for debugging purposes only) by executing:
|
||||
qmake -spec macx-xcode kdiff3.pro
|
||||
4) Execute:
|
||||
make
|
||||
5) After the build completes copy kdiff3 from the kdiff3-0.9.91/src-QT4 directory to
|
||||
/Applications
|
||||
|
||||
----------------------------------------------------------------
|
||||
|
||||
Building KDiff3 with Qt4:
|
||||
|
||||
Requirements & Installation:
|
||||
The version 0.9.91 requires Qt 4.2.0 (from www.trolltech.com) for compilation.
|
||||
|
||||
You always need
|
||||
- kdiff3-0.9.91.tar.gz
|
||||
|
||||
- for Un*x: gcc, g++ with version >=3.4.2
|
||||
Qt-X11-libraries
|
||||
|
||||
- for Windows: Qt-win-libs
|
||||
If you have the Qt4 commercial edition, then compile with Visual Studio.
|
||||
If you use the Qt4 open source edition, then you'll need MinGW.
|
||||
I verified that compilation and debugging works with these packages (probably newer ones will also work):
|
||||
- gcc-core-3.4.2-20040916-1.tar.gz
|
||||
- binutils-2.15.91-20040904-1.tar.gz
|
||||
- gcc-g++-3.4.2-20040916-1.tar.gz
|
||||
- mingw-runtime-3.9.tar.gz
|
||||
- mingw32-make-3.80.0-3.tar.gz
|
||||
- w32api-3.6.tar.gz (see also the note below)
|
||||
- gdb-5.2.1-1.exe (for debugging)
|
||||
|
||||
(Note: At the time of writing this README, the MinGW-package that was part
|
||||
of qt-win-opensource-4.1.2-mingw.exe lacked the latest w32api needed for
|
||||
KDiff3-compilation. You will need to unpack w32api-3.6.tar.gz or newer
|
||||
from www.mingw.org into your MinGW-directory.)
|
||||
|
||||
- for Mac: gcc, g++ with version >=3.4.2
|
||||
Qt-Mac-libraries
|
||||
|
||||
|
||||
Note for KDE-users:
|
||||
The version 0.9.91-Qt4 doesn't provide support for KDE-3.x
|
||||
because KDE-3.x.y requires Qt3.
|
||||
If you need KDE-specific features like TDEIO-support stick to the
|
||||
normal version 0.9.91.
|
||||
|
||||
Build-instructions (Unix or Mac):
|
||||
- Make sure your shell-variable QTDIR is correct and that
|
||||
your path contains the Qt4-bin-directory.
|
||||
- cd into the directory kdiff3-0.9.91/src-QT4 and type
|
||||
- qmake kdiff3.pro
|
||||
- make (or "gmake" for GNU-Make)
|
||||
|
||||
Build-instructions (Windows):
|
||||
- Run your qtvars.bat in the Qt4-bin directory.
|
||||
(This should set your QTDIR, QMAKESPEC and PATH-environment-variables.)
|
||||
- cd into the directory kdiff3-0.9.91/src-Qt4 and type
|
||||
- qmake kdiff3.pro
|
||||
- make (which calls either "mingw32-make" or "nmake")
|
||||
|
||||
Debugging with MinGW under Windows:
|
||||
- The qt-win-opensource-4.2.0-mingw.exe only installs release dlls. You will have to compile the
|
||||
debug dlls yourself. Enter the qt-4.2.0-directory and run "configure -debug" and then "make".
|
||||
- cd into the directory kdiff3-0.9.91/src-Qt4
|
||||
- edit the file "Makefile.Debug" and in the LFLAGS replace "-Wl,-subsystem,windows" with "-Wl,-subsystem,console"
|
||||
(this is necessary so that gdb can send a break signal to the running program)
|
||||
- make debug (create a debuggable executable)
|
||||
- gdb debug\kdiff3.exe
|
||||
- At the "(gdb)"-prompt type "run" and enter to start.
|
||||
- While the program runs you can't set breakpoints, first interrupt it with Ctrl-C.
|
||||
- Use "help" to find out about how to use gdb. (Important commands: run, break, backtrace, print, quit)
|
||||
Using break with c++-methods requires to specify the parameter types too. Breakpoints in constructors might not work.
|
||||
- I've tested graphical gdb-frontends too:
|
||||
1. Insight (also from mingw.org) worked until I wanted to interrupt the program for setting breakpoints.
|
||||
2. Dev-Cpp: The debugger said that the app crashed before even launching it.
|
||||
Result: For Windows I recommend gdb on the console. Please tell me when things have improved!
|
||||
|
||||
(End of KDiff3 with Qt4-instructions)
|
||||
------------------------------------------------------------------------
|
||||
- compares and merges two or three input files or directories,
|
||||
- shows the differences line by line and character by character (!)
|
||||
- provides an automatic merge-facility and
|
||||
- has an integrated editor for comfortable solving of merge-conflicts
|
||||
- has support for TDE-TDEIO (ftp, sftp, http, fish, smb)
|
||||
- has an intuitive graphical user interface
|
||||
- has a Konqueror service menu plugin
|
||||
|
||||
|
||||
Start from commandline:
|
||||
- Comparing 2 files: kdiff3 file1 file2
|
||||
- Merging 2 files: kdiff3 file1 file2 -o outputfile
|
||||
- Comparing 3 files: kdiff3 file1 file2 file3
|
||||
- Merging 3 files: kdiff3 file1 file2 file3 -o outputfile
|
||||
Note that file1 will be treated as base of file2 and file3.
|
||||
|
||||
If all files have the same name but are in different directories, you can
|
||||
reduce typework by specifying the filename only for the first file. E.g.:
|
||||
- Comparing 3 files: kdiff3 dir1/filename dir2 dir3
|
||||
(This also works in the open-dialog.)
|
||||
CONTRIBUTING
|
||||
==============
|
||||
|
||||
If you start without arguments, then a dialog will appear where you can
|
||||
select your files via a filebrowser.
|
||||
If you wish to contribute to kdiff3 (TDE), you might do so:
|
||||
|
||||
For more documentation, see the help-menu or the subdirectory doc.
|
||||
- TDE Gitea Workspace (TGW) collaboration tool.
|
||||
https://mirror.git.trinitydesktop.org/gitea
|
||||
|
||||
Have fun!
|
||||
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
|
||||
https://mirror.git.trinitydesktop.org/weblate
|
||||
|
@ -1,863 +0,0 @@
|
||||
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
|
||||
# 2005 Free Software Foundation, Inc.
|
||||
# This file 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.
|
||||
|
||||
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# AM_AUTOMAKE_VERSION(VERSION)
|
||||
# ----------------------------
|
||||
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
||||
# generated from the m4 files accompanying Automake X.Y.
|
||||
AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
|
||||
|
||||
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
||||
# -------------------------------
|
||||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.9.6])])
|
||||
|
||||
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
|
||||
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
|
||||
# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
|
||||
#
|
||||
# Of course, Automake must honor this variable whenever it calls a
|
||||
# tool from the auxiliary directory. The problem is that $srcdir (and
|
||||
# therefore $ac_aux_dir as well) can be either absolute or relative,
|
||||
# depending on how configure is run. This is pretty annoying, since
|
||||
# it makes $ac_aux_dir quite unusable in subdirectories: in the top
|
||||
# source directory, any form will work fine, but in subdirectories a
|
||||
# relative path needs to be adjusted first.
|
||||
#
|
||||
# $ac_aux_dir/missing
|
||||
# fails when called from a subdirectory if $ac_aux_dir is relative
|
||||
# $top_srcdir/$ac_aux_dir/missing
|
||||
# fails if $ac_aux_dir is absolute,
|
||||
# fails when called from a subdirectory in a VPATH build with
|
||||
# a relative $ac_aux_dir
|
||||
#
|
||||
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
|
||||
# are both prefixed by $srcdir. In an in-source build this is usually
|
||||
# harmless because $srcdir is `.', but things will broke when you
|
||||
# start a VPATH build or use an absolute $srcdir.
|
||||
#
|
||||
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
|
||||
# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
|
||||
# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
|
||||
# and then we would define $MISSING as
|
||||
# MISSING="\${SHELL} $am_aux_dir/missing"
|
||||
# This will work as long as MISSING is not called from configure, because
|
||||
# unfortunately $(top_srcdir) has no meaning in configure.
|
||||
# However there are other variables, like CC, which are often used in
|
||||
# configure, and could therefore not use this "fixed" $ac_aux_dir.
|
||||
#
|
||||
# Another solution, used here, is to always expand $ac_aux_dir to an
|
||||
# absolute PATH. The drawback is that using absolute paths prevent a
|
||||
# configured tree to be moved without reconfiguration.
|
||||
|
||||
AC_DEFUN([AM_AUX_DIR_EXPAND],
|
||||
[dnl Rely on autoconf to set up CDPATH properly.
|
||||
AC_PREREQ([2.50])dnl
|
||||
# expand $ac_aux_dir to an absolute path
|
||||
am_aux_dir=`cd $ac_aux_dir && pwd`
|
||||
])
|
||||
|
||||
# AM_CONDITIONAL -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 7
|
||||
|
||||
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
||||
# -------------------------------------
|
||||
# Define a conditional.
|
||||
AC_DEFUN([AM_CONDITIONAL],
|
||||
[AC_PREREQ(2.52)dnl
|
||||
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
||||
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
||||
AC_SUBST([$1_TRUE])
|
||||
AC_SUBST([$1_FALSE])
|
||||
if $2; then
|
||||
$1_TRUE=
|
||||
$1_FALSE='#'
|
||||
else
|
||||
$1_TRUE='#'
|
||||
$1_FALSE=
|
||||
fi
|
||||
AC_CONFIG_COMMANDS_PRE(
|
||||
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
|
||||
AC_MSG_ERROR([[conditional "$1" was never defined.
|
||||
Usually this means the macro was only invoked conditionally.]])
|
||||
fi])])
|
||||
|
||||
|
||||
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 8
|
||||
|
||||
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
|
||||
# written in clear, in which case automake, when reading aclocal.m4,
|
||||
# will think it sees a *use*, and therefore will trigger all it's
|
||||
# C support machinery. Also note that it means that autoscan, seeing
|
||||
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
|
||||
|
||||
|
||||
# _AM_DEPENDENCIES(NAME)
|
||||
# ----------------------
|
||||
# See how the compiler implements dependency checking.
|
||||
# NAME is "CC", "CXX", "GCJ", or "OBJC".
|
||||
# We try a few techniques and use that to set a single cache variable.
|
||||
#
|
||||
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
|
||||
# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
|
||||
# dependency, and given that the user is not expected to run this macro,
|
||||
# just rely on AC_PROG_CC.
|
||||
AC_DEFUN([_AM_DEPENDENCIES],
|
||||
[AC_REQUIRE([AM_SET_DEPDIR])dnl
|
||||
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
|
||||
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
|
||||
AC_REQUIRE([AM_DEP_TRACK])dnl
|
||||
|
||||
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
|
||||
[$1], CXX, [depcc="$CXX" am_compiler_list=],
|
||||
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
|
||||
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
|
||||
[depcc="$$1" am_compiler_list=])
|
||||
|
||||
AC_CACHE_CHECK([dependency style of $depcc],
|
||||
[am_cv_$1_dependencies_compiler_type],
|
||||
[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
|
||||
# We make a subdir and do the tests there. Otherwise we can end up
|
||||
# making bogus files that we don't know about and never remove. For
|
||||
# instance it was reported that on HP-UX the gcc test will end up
|
||||
# making a dummy file named `D' -- because `-MD' means `put the output
|
||||
# in D'.
|
||||
mkdir conftest.dir
|
||||
# Copy depcomp to subdir because otherwise we won't find it if we're
|
||||
# using a relative directory.
|
||||
cp "$am_depcomp" conftest.dir
|
||||
cd conftest.dir
|
||||
# We will build objects and dependencies in a subdirectory because
|
||||
# it helps to detect inapplicable dependency modes. For instance
|
||||
# both Tru64's cc and ICC support -MD to output dependencies as a
|
||||
# side effect of compilation, but ICC will put the dependencies in
|
||||
# the current directory while Tru64 will put them in the object
|
||||
# directory.
|
||||
mkdir sub
|
||||
|
||||
am_cv_$1_dependencies_compiler_type=none
|
||||
if test "$am_compiler_list" = ""; then
|
||||
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
|
||||
fi
|
||||
for depmode in $am_compiler_list; do
|
||||
# Setup a source with many dependencies, because some compilers
|
||||
# like to wrap large dependency lists on column 80 (with \), and
|
||||
# we should not choose a depcomp mode which is confused by this.
|
||||
#
|
||||
# We need to recreate these files for each test, as the compiler may
|
||||
# overwrite some of them when testing with obscure command lines.
|
||||
# This happens at least with the AIX C compiler.
|
||||
: > sub/conftest.c
|
||||
for i in 1 2 3 4 5 6; do
|
||||
echo '#include "conftst'$i'.h"' >> sub/conftest.c
|
||||
# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
|
||||
# Solaris 8's {/usr,}/bin/sh.
|
||||
touch sub/conftst$i.h
|
||||
done
|
||||
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
|
||||
|
||||
case $depmode in
|
||||
nosideeffect)
|
||||
# after this tag, mechanisms are not by side-effect, so they'll
|
||||
# only be used when explicitly requested
|
||||
if test "x$enable_dependency_tracking" = xyes; then
|
||||
continue
|
||||
else
|
||||
break
|
||||
fi
|
||||
;;
|
||||
none) break ;;
|
||||
esac
|
||||
# We check with `-c' and `-o' for the sake of the "dashmstdout"
|
||||
# mode. It turns out that the SunPro C++ compiler does not properly
|
||||
# handle `-M -o', and we need to detect this.
|
||||
if depmode=$depmode \
|
||||
source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
|
||||
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
|
||||
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
|
||||
>/dev/null 2>conftest.err &&
|
||||
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
|
||||
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
|
||||
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
|
||||
# icc doesn't choke on unknown options, it will just issue warnings
|
||||
# or remarks (even with -Werror). So we grep stderr for any message
|
||||
# that says an option was ignored or not supported.
|
||||
# When given -MP, icc 7.0 and 7.1 complain thusly:
|
||||
# icc: Command line warning: ignoring option '-M'; no argument required
|
||||
# The diagnosis changed in icc 8.0:
|
||||
# icc: Command line remark: option '-MP' not supported
|
||||
if (grep 'ignoring option' conftest.err ||
|
||||
grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
|
||||
am_cv_$1_dependencies_compiler_type=$depmode
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
cd ..
|
||||
rm -rf conftest.dir
|
||||
else
|
||||
am_cv_$1_dependencies_compiler_type=none
|
||||
fi
|
||||
])
|
||||
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
|
||||
AM_CONDITIONAL([am__fastdep$1], [
|
||||
test "x$enable_dependency_tracking" != xno \
|
||||
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
|
||||
])
|
||||
|
||||
|
||||
# AM_SET_DEPDIR
|
||||
# -------------
|
||||
# Choose a directory name for dependency files.
|
||||
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
|
||||
AC_DEFUN([AM_SET_DEPDIR],
|
||||
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
||||
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
|
||||
])
|
||||
|
||||
|
||||
# AM_DEP_TRACK
|
||||
# ------------
|
||||
AC_DEFUN([AM_DEP_TRACK],
|
||||
[AC_ARG_ENABLE(dependency-tracking,
|
||||
[ --disable-dependency-tracking speeds up one-time build
|
||||
--enable-dependency-tracking do not reject slow dependency extractors])
|
||||
if test "x$enable_dependency_tracking" != xno; then
|
||||
am_depcomp="$ac_aux_dir/depcomp"
|
||||
AMDEPBACKSLASH='\'
|
||||
fi
|
||||
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
|
||||
AC_SUBST([AMDEPBACKSLASH])
|
||||
])
|
||||
|
||||
# Generate code to set up dependency tracking. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
#serial 3
|
||||
|
||||
# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
# ------------------------------
|
||||
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[for mf in $CONFIG_FILES; do
|
||||
# Strip MF so we end up with the name of the file.
|
||||
mf=`echo "$mf" | sed -e 's/:.*$//'`
|
||||
# Check whether this is an Automake generated Makefile or not.
|
||||
# We used to match only the files named `Makefile.in', but
|
||||
# some people rename them; so instead we look at the file content.
|
||||
# Grep'ing the first line is not enough: some people post-process
|
||||
# each Makefile.in and add a new line on top of each file to say so.
|
||||
# So let's grep whole file.
|
||||
if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
|
||||
dirpart=`AS_DIRNAME("$mf")`
|
||||
else
|
||||
continue
|
||||
fi
|
||||
# Extract the definition of DEPDIR, am__include, and am__quote
|
||||
# from the Makefile without running `make'.
|
||||
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
|
||||
test -z "$DEPDIR" && continue
|
||||
am__include=`sed -n 's/^am__include = //p' < "$mf"`
|
||||
test -z "am__include" && continue
|
||||
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
|
||||
# When using ansi2knr, U may be empty or an underscore; expand it
|
||||
U=`sed -n 's/^U = //p' < "$mf"`
|
||||
# Find all dependency output files, they are included files with
|
||||
# $(DEPDIR) in their names. We invoke sed twice because it is the
|
||||
# simplest approach to changing $(DEPDIR) to its actual value in the
|
||||
# expansion.
|
||||
for file in `sed -n "
|
||||
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
|
||||
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
|
||||
# Make sure the directory exists.
|
||||
test -f "$dirpart/$file" && continue
|
||||
fdir=`AS_DIRNAME(["$file"])`
|
||||
AS_MKDIR_P([$dirpart/$fdir])
|
||||
# echo "creating $dirpart/$file"
|
||||
echo '# dummy' > "$dirpart/$file"
|
||||
done
|
||||
done
|
||||
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
|
||||
|
||||
# AM_OUTPUT_DEPENDENCY_COMMANDS
|
||||
# -----------------------------
|
||||
# This macro should only be invoked once -- use via AC_REQUIRE.
|
||||
#
|
||||
# This code is only required when automatic dependency tracking
|
||||
# is enabled. FIXME. This creates each `.P' file that we will
|
||||
# need in order to bootstrap the dependency handling code.
|
||||
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[AC_CONFIG_COMMANDS([depfiles],
|
||||
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
|
||||
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
|
||||
])
|
||||
|
||||
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 8
|
||||
|
||||
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
|
||||
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
|
||||
|
||||
# Do all the work for Automake. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 12
|
||||
|
||||
# This macro actually does too much. Some checks are only needed if
|
||||
# your package does certain things. But this isn't really a big deal.
|
||||
|
||||
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
|
||||
# AM_INIT_AUTOMAKE([OPTIONS])
|
||||
# -----------------------------------------------
|
||||
# The call with PACKAGE and VERSION arguments is the old style
|
||||
# call (pre autoconf-2.50), which is being phased out. PACKAGE
|
||||
# and VERSION should now be passed to AC_INIT and removed from
|
||||
# the call to AM_INIT_AUTOMAKE.
|
||||
# We support both call styles for the transition. After
|
||||
# the next Automake release, Autoconf can make the AC_INIT
|
||||
# arguments mandatory, and then we can depend on a new Autoconf
|
||||
# release and drop the old call support.
|
||||
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_PREREQ([2.58])dnl
|
||||
dnl Autoconf wants to disallow AM_ names. We explicitly allow
|
||||
dnl the ones we care about.
|
||||
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
|
||||
AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
||||
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||
# test to see if srcdir already configured
|
||||
if test "`cd $srcdir && pwd`" != "`pwd`" &&
|
||||
test -f $srcdir/config.status; then
|
||||
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
||||
fi
|
||||
|
||||
# test whether we have cygpath
|
||||
if test -z "$CYGPATH_W"; then
|
||||
if (cygpath --version) >/dev/null 2>/dev/null; then
|
||||
CYGPATH_W='cygpath -w'
|
||||
else
|
||||
CYGPATH_W=echo
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([CYGPATH_W])
|
||||
|
||||
# Define the identity of the package.
|
||||
dnl Distinguish between old-style and new-style calls.
|
||||
m4_ifval([$2],
|
||||
[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
|
||||
AC_SUBST([PACKAGE], [$1])dnl
|
||||
AC_SUBST([VERSION], [$2])],
|
||||
[_AM_SET_OPTIONS([$1])dnl
|
||||
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
|
||||
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
|
||||
|
||||
_AM_IF_OPTION([no-define],,
|
||||
[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
|
||||
|
||||
# Some tools Automake needs.
|
||||
AC_REQUIRE([AM_SANITY_CHECK])dnl
|
||||
AC_REQUIRE([AC_ARG_PROGRAM])dnl
|
||||
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
|
||||
AM_MISSING_PROG(AUTOCONF, autoconf)
|
||||
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
|
||||
AM_MISSING_PROG(AUTOHEADER, autoheader)
|
||||
AM_MISSING_PROG(MAKEINFO, makeinfo)
|
||||
AM_PROG_INSTALL_SH
|
||||
AM_PROG_INSTALL_STRIP
|
||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
|
||||
# We need awk for the "check" target. The system "awk" is bad on
|
||||
# some platforms.
|
||||
AC_REQUIRE([AC_PROG_AWK])dnl
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
|
||||
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
|
||||
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
|
||||
[_AM_PROG_TAR([v7])])])
|
||||
_AM_IF_OPTION([no-dependencies],,
|
||||
[AC_PROVIDE_IFELSE([AC_PROG_CC],
|
||||
[_AM_DEPENDENCIES(CC)],
|
||||
[define([AC_PROG_CC],
|
||||
defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
|
||||
AC_PROVIDE_IFELSE([AC_PROG_CXX],
|
||||
[_AM_DEPENDENCIES(CXX)],
|
||||
[define([AC_PROG_CXX],
|
||||
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
# When config.status generates a header, we must update the stamp-h file.
|
||||
# This file resides in the same directory as the config header
|
||||
# that is generated. The stamp files are numbered to have different names.
|
||||
|
||||
# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
|
||||
# loop where config.status creates the headers, so we can generate
|
||||
# our stamp files there.
|
||||
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
|
||||
[# Compute $1's index in $config_headers.
|
||||
_am_stamp_count=1
|
||||
for _am_header in $config_headers :; do
|
||||
case $_am_header in
|
||||
$1 | $1:* )
|
||||
break ;;
|
||||
* )
|
||||
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
|
||||
esac
|
||||
done
|
||||
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
|
||||
|
||||
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# AM_PROG_INSTALL_SH
|
||||
# ------------------
|
||||
# Define $install_sh.
|
||||
AC_DEFUN([AM_PROG_INSTALL_SH],
|
||||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
||||
install_sh=${install_sh-"$am_aux_dir/install-sh"}
|
||||
AC_SUBST(install_sh)])
|
||||
|
||||
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 2
|
||||
|
||||
# Check whether the underlying file-system supports filenames
|
||||
# with a leading dot. For instance MS-DOS doesn't.
|
||||
AC_DEFUN([AM_SET_LEADING_DOT],
|
||||
[rm -rf .tst 2>/dev/null
|
||||
mkdir .tst 2>/dev/null
|
||||
if test -d .tst; then
|
||||
am__leading_dot=.
|
||||
else
|
||||
am__leading_dot=_
|
||||
fi
|
||||
rmdir .tst 2>/dev/null
|
||||
AC_SUBST([am__leading_dot])])
|
||||
|
||||
# Check to see how 'make' treats includes. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 3
|
||||
|
||||
# AM_MAKE_INCLUDE()
|
||||
# -----------------
|
||||
# Check to see how make treats includes.
|
||||
AC_DEFUN([AM_MAKE_INCLUDE],
|
||||
[am_make=${MAKE-make}
|
||||
cat > confinc << 'END'
|
||||
am__doit:
|
||||
@echo done
|
||||
.PHONY: am__doit
|
||||
END
|
||||
# If we don't find an include directive, just comment out the code.
|
||||
AC_MSG_CHECKING([for style of include used by $am_make])
|
||||
am__include="#"
|
||||
am__quote=
|
||||
_am_result=none
|
||||
# First try GNU make style include.
|
||||
echo "include confinc" > confmf
|
||||
# We grep out `Entering directory' and `Leaving directory'
|
||||
# messages which can occur if `w' ends up in MAKEFLAGS.
|
||||
# In particular we don't look at `^make:' because GNU make might
|
||||
# be invoked under some other name (usually "gmake"), in which
|
||||
# case it prints its new name instead of `make'.
|
||||
if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
|
||||
am__include=include
|
||||
am__quote=
|
||||
_am_result=GNU
|
||||
fi
|
||||
# Now try BSD make style include.
|
||||
if test "$am__include" = "#"; then
|
||||
echo '.include "confinc"' > confmf
|
||||
if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
|
||||
am__include=.include
|
||||
am__quote="\""
|
||||
_am_result=BSD
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([am__include])
|
||||
AC_SUBST([am__quote])
|
||||
AC_MSG_RESULT([$_am_result])
|
||||
rm -f confinc confmf
|
||||
])
|
||||
|
||||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 4
|
||||
|
||||
# AM_MISSING_PROG(NAME, PROGRAM)
|
||||
# ------------------------------
|
||||
AC_DEFUN([AM_MISSING_PROG],
|
||||
[AC_REQUIRE([AM_MISSING_HAS_RUN])
|
||||
$1=${$1-"${am_missing_run}$2"}
|
||||
AC_SUBST($1)])
|
||||
|
||||
|
||||
# AM_MISSING_HAS_RUN
|
||||
# ------------------
|
||||
# Define MISSING if not defined so far and test if it supports --run.
|
||||
# If it does, set am_missing_run to use it, otherwise, to nothing.
|
||||
AC_DEFUN([AM_MISSING_HAS_RUN],
|
||||
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
||||
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
|
||||
# Use eval to expand $SHELL
|
||||
if eval "$MISSING --run true"; then
|
||||
am_missing_run="$MISSING --run "
|
||||
else
|
||||
am_missing_run=
|
||||
AC_MSG_WARN([`missing' script is too old or missing])
|
||||
fi
|
||||
])
|
||||
|
||||
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# AM_PROG_MKDIR_P
|
||||
# ---------------
|
||||
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
|
||||
#
|
||||
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
|
||||
# created by `make install' are always world readable, even if the
|
||||
# installer happens to have an overly restrictive umask (e.g. 077).
|
||||
# This was a mistake. There are at least two reasons why we must not
|
||||
# use `-m 0755':
|
||||
# - it causes special bits like SGID to be ignored,
|
||||
# - it may be too restrictive (some setups expect 775 directories).
|
||||
#
|
||||
# Do not use -m 0755 and let people choose whatever they expect by
|
||||
# setting umask.
|
||||
#
|
||||
# We cannot accept any implementation of `mkdir' that recognizes `-p'.
|
||||
# Some implementations (such as Solaris 8's) are not thread-safe: if a
|
||||
# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
|
||||
# concurrently, both version can detect that a/ is missing, but only
|
||||
# one can create it and the other will error out. Consequently we
|
||||
# restrict ourselves to GNU make (using the --version option ensures
|
||||
# this.)
|
||||
AC_DEFUN([AM_PROG_MKDIR_P],
|
||||
[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
||||
# We used to keeping the `.' as first argument, in order to
|
||||
# allow $(mkdir_p) to be used without argument. As in
|
||||
# $(mkdir_p) $(somedir)
|
||||
# where $(somedir) is conditionally defined. However this is wrong
|
||||
# for two reasons:
|
||||
# 1. if the package is installed by a user who cannot write `.'
|
||||
# make install will fail,
|
||||
# 2. the above comment should most certainly read
|
||||
# $(mkdir_p) $(DESTDIR)$(somedir)
|
||||
# so it does not work when $(somedir) is undefined and
|
||||
# $(DESTDIR) is not.
|
||||
# To support the latter case, we have to write
|
||||
# test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
|
||||
# so the `.' trick is pointless.
|
||||
mkdir_p='mkdir -p --'
|
||||
else
|
||||
# On NextStep and OpenStep, the `mkdir' command does not
|
||||
# recognize any option. It will interpret all options as
|
||||
# directories to create, and then abort because `.' already
|
||||
# exists.
|
||||
for d in ./-p ./--version;
|
||||
do
|
||||
test -d $d && rmdir $d
|
||||
done
|
||||
# $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
|
||||
if test -f "$ac_aux_dir/mkinstalldirs"; then
|
||||
mkdir_p='$(mkinstalldirs)'
|
||||
else
|
||||
mkdir_p='$(install_sh) -d'
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([mkdir_p])])
|
||||
|
||||
# Helper functions for option handling. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 3
|
||||
|
||||
# _AM_MANGLE_OPTION(NAME)
|
||||
# -----------------------
|
||||
AC_DEFUN([_AM_MANGLE_OPTION],
|
||||
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
|
||||
|
||||
# _AM_SET_OPTION(NAME)
|
||||
# ------------------------------
|
||||
# Set option NAME. Presently that only means defining a flag for this option.
|
||||
AC_DEFUN([_AM_SET_OPTION],
|
||||
[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
|
||||
|
||||
# _AM_SET_OPTIONS(OPTIONS)
|
||||
# ----------------------------------
|
||||
# OPTIONS is a space-separated list of Automake options.
|
||||
AC_DEFUN([_AM_SET_OPTIONS],
|
||||
[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
|
||||
|
||||
# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
|
||||
# -------------------------------------------
|
||||
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
|
||||
AC_DEFUN([_AM_IF_OPTION],
|
||||
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
|
||||
|
||||
# Check to make sure that the build environment is sane. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 4
|
||||
|
||||
# AM_SANITY_CHECK
|
||||
# ---------------
|
||||
AC_DEFUN([AM_SANITY_CHECK],
|
||||
[AC_MSG_CHECKING([whether build environment is sane])
|
||||
# Just in case
|
||||
sleep 1
|
||||
echo timestamp > conftest.file
|
||||
# Do `set' in a subshell so we don't clobber the current shell's
|
||||
# arguments. Must try -L first in case configure is actually a
|
||||
# symlink; some systems play weird games with the mod time of symlinks
|
||||
# (eg FreeBSD returns the mod time of the symlink's containing
|
||||
# directory).
|
||||
if (
|
||||
set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
|
||||
if test "$[*]" = "X"; then
|
||||
# -L didn't work.
|
||||
set X `ls -t $srcdir/configure conftest.file`
|
||||
fi
|
||||
rm -f conftest.file
|
||||
if test "$[*]" != "X $srcdir/configure conftest.file" \
|
||||
&& test "$[*]" != "X conftest.file $srcdir/configure"; then
|
||||
|
||||
# If neither matched, then we have a broken ls. This can happen
|
||||
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
||||
# broken ls alias from the environment. This has actually
|
||||
# happened. Such a system could not be considered "sane".
|
||||
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
||||
alias in your environment])
|
||||
fi
|
||||
|
||||
test "$[2]" = conftest.file
|
||||
)
|
||||
then
|
||||
# Ok.
|
||||
:
|
||||
else
|
||||
AC_MSG_ERROR([newly created file is older than distributed files!
|
||||
Check your system clock])
|
||||
fi
|
||||
AC_MSG_RESULT(yes)])
|
||||
|
||||
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# AM_PROG_INSTALL_STRIP
|
||||
# ---------------------
|
||||
# One issue with vendor `install' (even GNU) is that you can't
|
||||
# specify the program used to strip binaries. This is especially
|
||||
# annoying in cross-compiling environments, where the build's strip
|
||||
# is unlikely to handle the host's binaries.
|
||||
# Fortunately install-sh will honor a STRIPPROG variable, so we
|
||||
# always use install-sh in `make install-strip', and initialize
|
||||
# STRIPPROG with the value of the STRIP variable (set by the user).
|
||||
AC_DEFUN([AM_PROG_INSTALL_STRIP],
|
||||
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
|
||||
# Installed binaries are usually stripped using `strip' when the user
|
||||
# run `make install-strip'. However `strip' might not be the right
|
||||
# tool to use in cross-compilation environments, therefore Automake
|
||||
# will honor the `STRIP' environment variable to overrule this program.
|
||||
dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
|
||||
if test "$cross_compiling" != no; then
|
||||
AC_CHECK_TOOL([STRIP], [strip], :)
|
||||
fi
|
||||
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
|
||||
AC_SUBST([INSTALL_STRIP_PROGRAM])])
|
||||
|
||||
# Check how to create a tarball. -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file 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.
|
||||
|
||||
# serial 2
|
||||
|
||||
# _AM_PROG_TAR(FORMAT)
|
||||
# --------------------
|
||||
# Check how to create a tarball in format FORMAT.
|
||||
# FORMAT should be one of `v7', `ustar', or `pax'.
|
||||
#
|
||||
# Substitute a variable $(am__tar) that is a command
|
||||
# writing to stdout a FORMAT-tarball containing the directory
|
||||
# $tardir.
|
||||
# tardir=directory && $(am__tar) > result.tar
|
||||
#
|
||||
# Substitute a variable $(am__untar) that extract such
|
||||
# a tarball read from stdin.
|
||||
# $(am__untar) < result.tar
|
||||
AC_DEFUN([_AM_PROG_TAR],
|
||||
[# Always define AMTAR for backward compatibility.
|
||||
AM_MISSING_PROG([AMTAR], [tar])
|
||||
m4_if([$1], [v7],
|
||||
[am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
|
||||
[m4_case([$1], [ustar],, [pax],,
|
||||
[m4_fatal([Unknown tar format])])
|
||||
AC_MSG_CHECKING([how to create a $1 tar archive])
|
||||
# Loop over all known methods to create a tar archive until one works.
|
||||
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
|
||||
_am_tools=${am_cv_prog_tar_$1-$_am_tools}
|
||||
# Do not fold the above two line into one, because Tru64 sh and
|
||||
# Solaris sh will not grok spaces in the rhs of `-'.
|
||||
for _am_tool in $_am_tools
|
||||
do
|
||||
case $_am_tool in
|
||||
gnutar)
|
||||
for _am_tar in tar gnutar gtar;
|
||||
do
|
||||
AM_RUN_LOG([$_am_tar --version]) && break
|
||||
done
|
||||
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
|
||||
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
|
||||
am__untar="$_am_tar -xf -"
|
||||
;;
|
||||
plaintar)
|
||||
# Must skip GNU tar: if it does not support --format= it doesn't create
|
||||
# ustar tarball either.
|
||||
(tar --version) >/dev/null 2>&1 && continue
|
||||
am__tar='tar chf - "$$tardir"'
|
||||
am__tar_='tar chf - "$tardir"'
|
||||
am__untar='tar xf -'
|
||||
;;
|
||||
pax)
|
||||
am__tar='pax -L -x $1 -w "$$tardir"'
|
||||
am__tar_='pax -L -x $1 -w "$tardir"'
|
||||
am__untar='pax -r'
|
||||
;;
|
||||
cpio)
|
||||
am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
|
||||
am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
|
||||
am__untar='cpio -i -H $1 -d'
|
||||
;;
|
||||
none)
|
||||
am__tar=false
|
||||
am__tar_=false
|
||||
am__untar=false
|
||||
;;
|
||||
esac
|
||||
|
||||
# If the value was cached, stop now. We just wanted to have am__tar
|
||||
# and am__untar set.
|
||||
test -n "${am_cv_prog_tar_$1}" && break
|
||||
|
||||
# tar/untar a dummy directory, and stop if the command works
|
||||
rm -rf conftest.dir
|
||||
mkdir conftest.dir
|
||||
echo GrepMe > conftest.dir/file
|
||||
AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
|
||||
rm -rf conftest.dir
|
||||
if test -s conftest.tar; then
|
||||
AM_RUN_LOG([$am__untar <conftest.tar])
|
||||
grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
|
||||
fi
|
||||
done
|
||||
rm -rf conftest.dir
|
||||
|
||||
AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
|
||||
AC_MSG_RESULT([$am_cv_prog_tar_$1])])
|
||||
AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
m4_include([acinclude.m4])
|
@ -1 +0,0 @@
|
||||
Subproject commit 04db460623e1f235e7239f08fdcc2d0ef72636af
|
@ -1 +1 @@
|
||||
Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463
|
||||
Subproject commit 136cfe6ca9af12b6770b33a6ba54a821bbaca061
|
@ -0,0 +1,8 @@
|
||||
#define VERSION "@VERSION@"
|
||||
|
||||
// Defined if you have fvisibility and fvisibility-inlines-hidden support.
|
||||
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@
|
@ -1,244 +0,0 @@
|
||||
/* config.h.in. Generated from configure.in by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
|
||||
#undef HAVE_CARBON_CARBON_H
|
||||
|
||||
/* Define if you have the CoreAudio API */
|
||||
#undef HAVE_COREAUDIO
|
||||
|
||||
/* Define to 1 if you have the <crt_externs.h> header file. */
|
||||
#undef HAVE_CRT_EXTERNS_H
|
||||
|
||||
/* Defines if your system has the crypt function */
|
||||
#undef HAVE_CRYPT
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define if you have libjpeg */
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
/* Define if you have libpng */
|
||||
#undef HAVE_LIBPNG
|
||||
|
||||
/* Define if you have a working libpthread (will enable threaded code) */
|
||||
#undef HAVE_LIBPTHREAD
|
||||
|
||||
/* Define if you have libz */
|
||||
#undef HAVE_LIBZ
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define if your system needs _NSGetEnviron to set up the environment */
|
||||
#undef HAVE_NSGETENVIRON
|
||||
|
||||
/* Define if you have res_init */
|
||||
#undef HAVE_RES_INIT
|
||||
|
||||
/* Define if you have the res_init prototype */
|
||||
#undef HAVE_RES_INIT_PROTO
|
||||
|
||||
/* Define if you have a STL implementation by SGI */
|
||||
#undef HAVE_SGI_STL
|
||||
|
||||
/* Define to 1 if you have the `snprintf' function. */
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define if you have strlcat */
|
||||
#undef HAVE_STRLCAT
|
||||
|
||||
/* Define if you have the strlcat prototype */
|
||||
#undef HAVE_STRLCAT_PROTO
|
||||
|
||||
/* Define if you have strlcpy */
|
||||
#undef HAVE_STRLCPY
|
||||
|
||||
/* Define if you have the strlcpy prototype */
|
||||
#undef HAVE_STRLCPY_PROTO
|
||||
|
||||
/* Define to 1 if you have the <sys/bitypes.h> header file. */
|
||||
#undef HAVE_SYS_BITYPES_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 if you have the `vsnprintf' function. */
|
||||
#undef HAVE_VSNPRINTF
|
||||
|
||||
/* Suffix for lib directories */
|
||||
#undef KDELIBSUFF
|
||||
|
||||
/* Define a safe value for MAXPATHLEN */
|
||||
#undef KDEMAXPATHLEN
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* The size of `char *', as computed by sizeof. */
|
||||
#undef SIZEOF_CHAR_P
|
||||
|
||||
/* The size of `int', as computed by sizeof. */
|
||||
#undef SIZEOF_INT
|
||||
|
||||
/* The size of `long', as computed by sizeof. */
|
||||
#undef SIZEOF_LONG
|
||||
|
||||
/* The size of `short', as computed by sizeof. */
|
||||
#undef SIZEOF_SHORT
|
||||
|
||||
/* The size of `size_t', as computed by sizeof. */
|
||||
#undef SIZEOF_SIZE_T
|
||||
|
||||
/* The size of `unsigned long', as computed by sizeof. */
|
||||
#undef SIZEOF_UNSIGNED_LONG
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Defined if compiling without arts */
|
||||
#undef WITHOUT_ARTS
|
||||
|
||||
/* Define to 1 if your processor stores words with the most significant byte
|
||||
first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||
#undef WORDS_BIGENDIAN
|
||||
|
||||
/*
|
||||
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
|
||||
* headers and I'm too lazy to write a configure test as long as only
|
||||
* unixware is related
|
||||
*/
|
||||
#ifdef _UNIXWARE
|
||||
#define HAVE_BOOLEAN
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
|
||||
* that defines bzero.
|
||||
*/
|
||||
|
||||
#if defined(_AIX)
|
||||
#include <strings.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
|
||||
# include <sys/time.h>
|
||||
# include <crt_externs.h>
|
||||
# define environ (*_NSGetEnviron())
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if !defined(HAVE_RES_INIT_PROTO)
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
int res_init(void);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if !defined(HAVE_STRLCAT_PROTO)
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
unsigned long strlcat(char*, const char*, unsigned long);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if !defined(HAVE_STRLCPY_PROTO)
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
unsigned long strlcpy(char*, const char*, unsigned long);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* On HP-UX, the declaration of vsnprintf() is needed every time !
|
||||
*/
|
||||
|
||||
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
|
||||
#if __STDC__
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <varargs.h>
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
int snprintf(char *str, size_t n, char const *fmt, ...);
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#if defined(__SVR4) && !defined(__svr4__)
|
||||
#define __svr4__ 1
|
||||
#endif
|
||||
|
||||
|
||||
/* type to use in place of socklen_t if not defined */
|
||||
#undef kde_socklen_t
|
||||
|
||||
/* type to use in place of socklen_t if not defined (deprecated, use
|
||||
kde_socklen_t) */
|
||||
#undef ksize_t
|
@ -1,2 +0,0 @@
|
||||
./admin/configure.in.min
|
||||
configure.in.in
|
@ -1,166 +0,0 @@
|
||||
dnl =======================================================
|
||||
dnl FILE: ./admin/configure.in.min
|
||||
dnl =======================================================
|
||||
|
||||
dnl This file is part of the KDE libraries/packages
|
||||
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
|
||||
|
||||
dnl This file is free software; you can redistribute it and/or
|
||||
dnl modify it under the terms of the GNU Library General Public
|
||||
dnl License as published by the Free Software Foundation; either
|
||||
dnl version 2 of the License, or (at your option) any later version.
|
||||
|
||||
dnl This library is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl Library General Public License for more details.
|
||||
|
||||
dnl You should have received a copy of the GNU Library General Public License
|
||||
dnl along with this library; see the file COPYING.LIB. If not, write to
|
||||
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
dnl Boston, MA 02110-1301, USA.
|
||||
|
||||
# Original Author was Kalle@kde.org
|
||||
# I lifted it in some mater. (Stephan Kulow)
|
||||
# I used much code from Janos Farkas
|
||||
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_INIT(acinclude.m4) dnl a source file from your sub dir
|
||||
|
||||
dnl This is so we can use kde-common
|
||||
AC_CONFIG_AUX_DIR(admin)
|
||||
|
||||
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
|
||||
unset CDPATH
|
||||
|
||||
dnl Checking host/target/build systems, for make, install etc.
|
||||
AC_CANONICAL_SYSTEM
|
||||
dnl Perform program name transformation
|
||||
AC_ARG_PROGRAM
|
||||
|
||||
dnl Automake doc recommends to do this only here. (Janos)
|
||||
AM_INIT_AUTOMAKE(kdiff3, 0.9.92) dnl searches for some needed programs
|
||||
|
||||
KDE_SET_PREFIX
|
||||
|
||||
dnl generate the config header
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
KDE_PROG_LIBTOOL
|
||||
|
||||
dnl for NLS support. Call them in this order!
|
||||
dnl WITH_NLS is for the po files
|
||||
AM_KDE_WITH_NLS
|
||||
|
||||
KDE_USE_QT(3.2)
|
||||
AC_PATH_KDE
|
||||
dnl =======================================================
|
||||
dnl FILE: configure.in.in
|
||||
dnl =======================================================
|
||||
|
||||
#MIN_CONFIG(3.2)
|
||||
|
||||
###################################################
|
||||
# Check for Konqueror (copied from krusader-1.70)
|
||||
###################################################
|
||||
|
||||
AC_ARG_WITH(konqueror,
|
||||
AC_HELP_STRING([--without-konqueror],[build KDiff3 without support Konqueror's servicemenus [default=with]]),
|
||||
[with_konq=$withval],
|
||||
[with_konq=yes]
|
||||
)
|
||||
|
||||
if test "$with_konq" != "no"; then
|
||||
# check for the headers
|
||||
have_libkonq=yes
|
||||
KDE_CHECK_HEADER(konq_popupmenu.h, ,[have_libkonq=no] )
|
||||
|
||||
if test "$have_libkonq" = "no"; then
|
||||
# if this var is 'yes', the configure-suppery drops a warning.
|
||||
# see admin/configure.in.bot.end
|
||||
warn_konq=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$have_libkonq" != "yes"; then
|
||||
DO_NOT_COMPILE="$DO_NOT_COMPILE kdiff3plugin"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(include_libkonq, test "$have_libkonq" = yes)
|
||||
|
||||
dnl PACKAGE set before
|
||||
AC_C_BIGENDIAN
|
||||
AC_CHECK_KDEMAXPATHLEN
|
||||
|
||||
KDE_CREATE_SUBDIRSLIST
|
||||
AC_CONFIG_FILES([ Makefile ])
|
||||
AC_CONFIG_FILES([ doc/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/da/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/de/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/en/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/es/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/et/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/fr/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/it/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/nl/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/pt/Makefile ])
|
||||
AC_CONFIG_FILES([ doc/sv/Makefile ])
|
||||
AC_CONFIG_FILES([ kdiff3plugin/Makefile ])
|
||||
AC_CONFIG_FILES([ kdiff3plugin/po/Makefile ])
|
||||
AC_CONFIG_FILES([ po/Makefile ])
|
||||
AC_CONFIG_FILES([ src/Makefile ])
|
||||
AC_OUTPUT
|
||||
# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
|
||||
if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
|
||||
# And if so, warn when they don't match
|
||||
if test "$kde_libs_prefix" != "$given_prefix"; then
|
||||
# And if kde doesn't know about the prefix yet
|
||||
echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
|
||||
if test $? -ne 0; then
|
||||
echo ""
|
||||
echo "Warning: you chose to install this package in $given_prefix,"
|
||||
echo "but KDE was found in $kde_libs_prefix."
|
||||
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
|
||||
echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
|
||||
echo "Then restart KDE."
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
|
||||
echo ""
|
||||
echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
|
||||
echo "was not included. Therefore, GCC symbol visibility support remains disabled."
|
||||
echo ""
|
||||
echo "For better performance, consider including the Qt visibility supporting patch"
|
||||
echo "located at:"
|
||||
echo ""
|
||||
echo "http://bugs.kde.org/show_bug.cgi?id=109386"
|
||||
echo ""
|
||||
echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
|
||||
echo "everything will continue to work just fine without it."
|
||||
echo ""
|
||||
fi
|
||||
|
||||
if (test $warn_konq);
|
||||
then echo "NOTICE: Since the Konqueror-headers were not found KDiff3 will be built without support for its service-menus and the KDiff3-service menu will not be built. (Install the package containing konq_popupmenu.h. Possibly tdebase-devel or on Debian libkonq4-dev etc.)"
|
||||
fi
|
||||
|
||||
if test "$all_tests" = "bad"; then
|
||||
if test ! "$cache_file" = "/dev/null"; then
|
||||
echo ""
|
||||
echo "Please remove the file $cache_file after changing your setup"
|
||||
echo "so that configure will find the changes next time."
|
||||
echo ""
|
||||
fi
|
||||
else
|
||||
echo ""
|
||||
echo "Good - your configure finished. Start make now"
|
||||
echo ""
|
||||
fi
|
@ -1,36 +0,0 @@
|
||||
#MIN_CONFIG(3.2)
|
||||
|
||||
KDE_ENABLE_HIDDEN_VISIBILITY
|
||||
|
||||
###################################################
|
||||
# Check for Konqueror (copied from krusader-1.70)
|
||||
###################################################
|
||||
|
||||
AC_ARG_WITH(konqueror,
|
||||
AC_HELP_STRING([--without-konqueror],[build KDiff3 without support Konqueror's servicemenus [default=with]]),
|
||||
[with_konq=$withval],
|
||||
[with_konq=yes]
|
||||
)
|
||||
|
||||
if test "$with_konq" != "no"; then
|
||||
# check for the headers
|
||||
have_libkonq=yes
|
||||
KDE_CHECK_HEADER(konq_popupmenu.h, ,[have_libkonq=no] )
|
||||
|
||||
if test "$have_libkonq" = "no"; then
|
||||
# if this var is 'yes', the configure-suppery drops a warning.
|
||||
# see admin/configure.in.bot.end
|
||||
warn_konq=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$have_libkonq" != "yes"; then
|
||||
DO_NOT_COMPILE="$DO_NOT_COMPILE kdiff3plugin"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(include_libkonq, test "$have_libkonq" = yes)
|
||||
|
||||
AM_INIT_AUTOMAKE(kdiff3, 0.9.92)
|
||||
AC_C_BIGENDIAN
|
||||
AC_CHECK_KDEMAXPATHLEN
|
||||
|
@ -1 +0,0 @@
|
||||
SUBDIRS = doc
|
@ -1,3 +0,0 @@
|
||||
kdiff3dir = ${kde_datadir}/kdiff3/doc
|
||||
|
||||
kdiff3_DATA = compilation.html credits.html dirmerge.html dirmergeoptions.html dirmergevisible.html documentation.html dothemerge.html faq.html features.html find.html index.html installation.html interpretinginformation.html introduction.html kpart.html merging.html misc.html navigation.html opendialog.html options.html other.html pasteinput.html preprocessors.html printing.html requirements.html saving.html screenshots.html selections.html startingdirmerge.html
|
@ -0,0 +1,6 @@
|
||||
##### create translation templates ##############
|
||||
|
||||
tde_l10n_create_template(
|
||||
CATALOG "messages/diff_ext/"
|
||||
DESTINATION "./translations"
|
||||
)
|
@ -1,102 +0,0 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-09-04 15:35+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: diff_ext.cpp:363
|
||||
msgid "Compare with %1"
|
||||
msgstr "Vergleichen mit %1"
|
||||
|
||||
#: diff_ext.cpp:364
|
||||
msgid "Merge with %1"
|
||||
msgstr "Zusammenführen mit %1"
|
||||
|
||||
#: diff_ext.cpp:379
|
||||
msgid "3-way merge with base"
|
||||
msgstr "3-Wege Zusammenführung mit Basis"
|
||||
|
||||
#: diff_ext.cpp:382
|
||||
msgid "Save '%1' for later"
|
||||
msgstr "Speichere '%1' für später"
|
||||
|
||||
#: diff_ext.cpp:404
|
||||
msgid "Compare with ..."
|
||||
msgstr "Vergleichen mit ..."
|
||||
|
||||
#: diff_ext.cpp:403
|
||||
msgid "Compare"
|
||||
msgstr "Vergleichen"
|
||||
|
||||
#: diff_ext.cpp:403
|
||||
msgid "Clear list"
|
||||
msgstr "Liste löschen"
|
||||
|
||||
|
||||
#: diff_ext.cpp:407
|
||||
msgid "3 way comparison"
|
||||
msgstr "Vergleiche 3 Dateien"
|
||||
|
||||
#: diff_ext.cpp:413
|
||||
msgid "About Diff-Ext ..."
|
||||
msgstr "Über Diff-Ext ..."
|
||||
|
||||
#: diff_ext.cpp:474
|
||||
msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
|
||||
msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\n"
|
||||
|
||||
#: diff_ext.cpp:475
|
||||
msgid "This software is distributable under the BSD license.\n"
|
||||
msgstr "Weitergabe dieses Programms unter den Bedingungen der BSD Lizenz.\n"
|
||||
|
||||
#: diff_ext.cpp:476
|
||||
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
|
||||
msgstr "Einige Erweiterungen für KDiff3 von Joachim Eibl.\n"
|
||||
|
||||
#: diff_ext.cpp:477
|
||||
msgid "See the homepage http://diff-ext.sourceforge.net"
|
||||
msgstr "Siehe die Homepage http://diff-ext.sourceforge.net"
|
||||
|
||||
#: diff_ext.cpp:478
|
||||
msgid "About Diff-Ext for KDiff3"
|
||||
msgstr "Über Diff-Ext für KDiff3"
|
||||
|
||||
#: diff_ext.cpp:503
|
||||
msgid "Compare selected files"
|
||||
msgstr "Vergleiche markierte Dateien"
|
||||
|
||||
#: diff_ext.cpp:509 diff_ext.cpp:529
|
||||
msgid "Compare '%1' with '%2'"
|
||||
msgstr "Vergleiche '%1' mit '%2'"
|
||||
|
||||
#: diff_ext.cpp:515
|
||||
msgid "Merke '%1' für spätere Aktion"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:567
|
||||
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
|
||||
msgstr "Konnte KDiff3 nicht starten. Bitte wiederholen Sie die KDiff3 Installation."
|
||||
|
||||
#: diff_ext.cpp:568
|
||||
msgid "Command"
|
||||
msgstr "Kommando"
|
||||
|
||||
#: diff_ext.cpp:569
|
||||
msgid "CommandLine"
|
||||
msgstr "Kommandozeile"
|
||||
|
||||
#: diff_ext.cpp:570
|
||||
msgid "Diff-Ext For KDiff3"
|
||||
msgstr "Diff-Ext für KDiff3"
|
@ -0,0 +1 @@
|
||||
tde_auto_add_subdirectories()
|
@ -0,0 +1,14 @@
|
||||
file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
|
||||
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
|
||||
|
||||
foreach( _po ${po_files} )
|
||||
get_filename_component( _lang ${_po} NAME_WE )
|
||||
if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
|
||||
if( "${_po}" MATCHES "^([^/]*)/.*" )
|
||||
string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
|
||||
else( )
|
||||
set( _component "${PROJECT_NAME}" )
|
||||
endif( )
|
||||
tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
|
||||
endif( )
|
||||
endforeach( )
|
@ -0,0 +1,125 @@
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
|
||||
"PO-Revision-Date: 2019-08-28 23:45+0000\n"
|
||||
"Last-Translator: Chris <xchrisx@uber.space>\n"
|
||||
"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
|
||||
"projects/applications/kdiff3-diff_ext/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 3.8\n"
|
||||
|
||||
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
|
||||
msgid ""
|
||||
"_: NAME OF TRANSLATORS\n"
|
||||
"Your names"
|
||||
msgstr "Chris (TDE)"
|
||||
|
||||
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
|
||||
msgid ""
|
||||
"_: EMAIL OF TRANSLATORS\n"
|
||||
"Your emails"
|
||||
msgstr "(Keine Email)"
|
||||
|
||||
#: diff_ext.cpp:369
|
||||
#, c-format
|
||||
msgid "Compare with %1"
|
||||
msgstr "Vergleichen mit %1"
|
||||
|
||||
#: diff_ext.cpp:370
|
||||
#, c-format
|
||||
msgid "Merge with %1"
|
||||
msgstr "Zusammenführen mit %1"
|
||||
|
||||
#: diff_ext.cpp:386
|
||||
msgid "3-way merge with base"
|
||||
msgstr "3-Wege Zusammenführung mit Basis"
|
||||
|
||||
#: diff_ext.cpp:389
|
||||
msgid "Save '%1' for later"
|
||||
msgstr "Speichere '%1' für später"
|
||||
|
||||
#: diff_ext.cpp:404
|
||||
msgid "Compare with ..."
|
||||
msgstr "Vergleichen mit ..."
|
||||
|
||||
#: diff_ext.cpp:407
|
||||
msgid "Clear list"
|
||||
msgstr "Liste löschen"
|
||||
|
||||
#: diff_ext.cpp:412
|
||||
msgid "Compare"
|
||||
msgstr "Vergleichen"
|
||||
|
||||
#: diff_ext.cpp:416
|
||||
msgid "3 way comparison"
|
||||
msgstr "Vergleiche 3 Dateien"
|
||||
|
||||
#: diff_ext.cpp:422
|
||||
msgid "About Diff-Ext ..."
|
||||
msgstr "Über Diff-Ext ..."
|
||||
|
||||
#: diff_ext.cpp:491
|
||||
msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
|
||||
msgstr ""
|
||||
"Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\n"
|
||||
|
||||
#: diff_ext.cpp:492
|
||||
msgid "This software is distributable under the BSD license.\n"
|
||||
msgstr "Weitergabe dieses Programms unter den Bedingungen der BSD Lizenz.\n"
|
||||
|
||||
#: diff_ext.cpp:493
|
||||
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
|
||||
msgstr "Einige Erweiterungen für KDiff3 von Joachim Eibl.\n"
|
||||
|
||||
#: diff_ext.cpp:494
|
||||
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
|
||||
msgstr "Siehe die Homepage für Diff-Ext: http://diff-ext.sourceforge.net\n"
|
||||
|
||||
#: diff_ext.cpp:495
|
||||
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
|
||||
msgstr ""
|
||||
"Siehe die Homepage für KDiff3: https://mirror.git.trinitydesktop.org/gitea/"
|
||||
"TDE/kdiff3"
|
||||
|
||||
#: diff_ext.cpp:496
|
||||
msgid "About Diff-Ext for KDiff3"
|
||||
msgstr "Über Diff-Ext für KDiff3"
|
||||
|
||||
#: diff_ext.cpp:521
|
||||
msgid "Compare selected files"
|
||||
msgstr "Vergleiche markierte Dateien"
|
||||
|
||||
#: diff_ext.cpp:527 diff_ext.cpp:547
|
||||
msgid "Compare '%1' with '%2'"
|
||||
msgstr "Vergleiche '%1' mit '%2'"
|
||||
|
||||
#: diff_ext.cpp:533
|
||||
msgid "Save '%1' for later operation"
|
||||
msgstr "'%1' für spätere Operation speichern"
|
||||
|
||||
#: diff_ext.cpp:585
|
||||
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
|
||||
msgstr ""
|
||||
"Konnte KDiff3 nicht starten. Bitte wiederholen Sie die KDiff3 Installation."
|
||||
|
||||
#: diff_ext.cpp:586
|
||||
msgid "Command"
|
||||
msgstr "Kommando"
|
||||
|
||||
#: diff_ext.cpp:587
|
||||
msgid "CommandLine"
|
||||
msgstr "Kommandozeile"
|
||||
|
||||
#: diff_ext.cpp:588
|
||||
msgid "Diff-Ext For KDiff3"
|
||||
msgstr "Diff-Ext für KDiff3"
|
@ -1,96 +1,118 @@
|
||||
# Diff-ext-for-KDiff3
|
||||
# Copyright (C) 2006 Joachim Eibl
|
||||
# This file is distributed under the same license as the diff-ext-for-KDiff3 package.
|
||||
# PO-Template created by Joachim Eibl <Joachim dot Eibl at gmx dot de>, 2006.
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-10-03 06:05+0200\n"
|
||||
"POT-Creation-Date: 2020-05-11 13:14+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: diff_ext.cpp:368 diff_ext.cpp:402
|
||||
msgid "Compare with"
|
||||
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
|
||||
#, ignore-inconsistent
|
||||
msgid ""
|
||||
"_: NAME OF TRANSLATORS\n"
|
||||
"Your names"
|
||||
msgstr ""
|
||||
|
||||
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
|
||||
#, ignore-inconsistent
|
||||
msgid ""
|
||||
"_: EMAIL OF TRANSLATORS\n"
|
||||
"Your emails"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:369
|
||||
msgid "Merge with"
|
||||
#, c-format
|
||||
msgid "Compare with %1"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:370
|
||||
#, c-format
|
||||
msgid "Merge with %1"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:384
|
||||
#: diff_ext.cpp:386
|
||||
msgid "3-way merge with base"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:387
|
||||
msgid "Save '%1' for later comparison or merge"
|
||||
#: diff_ext.cpp:389
|
||||
msgid "Save '%1' for later"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:408
|
||||
msgid "Compare"
|
||||
#: diff_ext.cpp:404
|
||||
msgid "Compare with ..."
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:407
|
||||
msgid "Clear list"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:412
|
||||
msgid "Compare"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:416
|
||||
msgid "3 way comparison"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:418
|
||||
#: diff_ext.cpp:422
|
||||
msgid "About Diff-Ext ..."
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:482
|
||||
#: diff_ext.cpp:491
|
||||
msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:483
|
||||
#: diff_ext.cpp:492
|
||||
msgid "This software is distributable under the BSD license.\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:484
|
||||
#: diff_ext.cpp:493
|
||||
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:485
|
||||
#: diff_ext.cpp:494
|
||||
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:486
|
||||
#: diff_ext.cpp:495
|
||||
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:487
|
||||
#: diff_ext.cpp:496
|
||||
msgid "About Diff-Ext for KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:512
|
||||
#: diff_ext.cpp:521
|
||||
msgid "Compare selected files"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:518 diff_ext.cpp:538
|
||||
#: diff_ext.cpp:527 diff_ext.cpp:547
|
||||
msgid "Compare '%1' with '%2'"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:524
|
||||
#: diff_ext.cpp:533
|
||||
msgid "Save '%1' for later operation"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:576
|
||||
#: diff_ext.cpp:585
|
||||
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:577
|
||||
#: diff_ext.cpp:586
|
||||
msgid "Command"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:578
|
||||
#: diff_ext.cpp:587
|
||||
msgid "CommandLine"
|
||||
msgstr ""
|
||||
|
||||
#: diff_ext.cpp:579
|
||||
#: diff_ext.cpp:588
|
||||
msgid "Diff-Ext For KDiff3"
|
||||
msgstr ""
|
@ -0,0 +1,34 @@
|
||||
file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
|
||||
list( REMOVE_ITEM _dirs html man )
|
||||
|
||||
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
|
||||
|
||||
foreach( _dir IN LISTS _dirs )
|
||||
if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}
|
||||
AND ( "${_dir}" STREQUAL "en" OR
|
||||
"${_linguas}" MATCHES "^;*$" OR
|
||||
";${_linguas};" MATCHES ";${_dir};" ))
|
||||
file( GLOB _doc_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} ${_dir}/*.docbook )
|
||||
if( _doc_files )
|
||||
list( FIND _doc_files "index.docbook" _find_index )
|
||||
if( -1 EQUAL _find_index )
|
||||
set( _noindex "NOINDEX" )
|
||||
else()
|
||||
unset( _noindex )
|
||||
endif()
|
||||
tde_create_handbook(
|
||||
SOURCE_BASEDIR ${_dir}
|
||||
${_noindex}
|
||||
LANG ${_dir}
|
||||
DESTINATION ${PROJECT_NAME}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/html/CMakeLists.txt )
|
||||
add_subdirectory( html )
|
||||
endif()
|
||||
if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/man/CMakeLists.txt )
|
||||
add_subdirectory( man )
|
||||
endif()
|
@ -1,6 +0,0 @@
|
||||
# the SUBDIRS is filled automatically by am_edit. If files are
|
||||
# in this directory they are installed into the english dir
|
||||
|
||||
KDE_LANG = en da de es et fr it nl pt sv
|
||||
KDE_DOCS = kdiff3
|
||||
SUBDIRS = $(AUTODIRS)
|
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = da
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = de
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,2 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = en
|
Before Width: | Height: | Size: 665 B After Width: | Height: | Size: 593 B |
Before Width: | Height: | Size: 174 B After Width: | Height: | Size: 167 B |
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 493 B After Width: | Height: | Size: 399 B |
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 199 B After Width: | Height: | Size: 193 B |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 233 B After Width: | Height: | Size: 219 B |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = es
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = et
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = fr
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -0,0 +1,12 @@
|
||||
file( GLOB _htmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.html )
|
||||
|
||||
file(
|
||||
GLOB _pngs
|
||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../en/*.png
|
||||
)
|
||||
|
||||
install(
|
||||
FILES ${_htmls} ${_pngs}
|
||||
DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${PROJECT_NAME}/html
|
||||
)
|
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = it
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -0,0 +1,5 @@
|
||||
INSTALL(
|
||||
FILES ${PROJECT_NAME}.1
|
||||
DESTINATION ${MAN_INSTALL_DIR}/man1
|
||||
COMPONENT doc
|
||||
)
|
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = nl
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = pt
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,4 +0,0 @@
|
||||
KDE_DOCS = kdiff3
|
||||
KDE_LANG = sv
|
||||
|
||||
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
Before Width: | Height: | Size: 185 B After Width: | Height: | Size: 164 B |
Before Width: | Height: | Size: 255 B After Width: | Height: | Size: 205 B |
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.9 KiB |
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@ -1,61 +0,0 @@
|
||||
Name: kdiff3
|
||||
Version: 0.9.91
|
||||
Release: 1.fc
|
||||
|
||||
URL: http://www.kde-apps.org/content/show.php?content=9807
|
||||
License: GPL
|
||||
Summary: Tool for Comparison and Merge of Files and Directories
|
||||
Group: Development/Tools
|
||||
|
||||
Source: http://heanet.dl.sourceforge.net/sourceforge/kdiff3/kdiff3-%{version}.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
Requires: tdelibs > 3.3
|
||||
BuildRequires: gcc-c++ >= 3.2
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: qt-devel >= 3.3
|
||||
BuildRequires: tdelibs-devel >= 3.3
|
||||
|
||||
%description
|
||||
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 TDEIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
|
||||
Unicode & UTF-8 support
|
||||
|
||||
%prep
|
||||
%setup
|
||||
|
||||
%build
|
||||
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
|
||||
|
||||
export TDEDIR=%{_prefix}
|
||||
|
||||
%configure --prefix=/usr
|
||||
%{__make} %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%{__rm} -rf %{buildroot}
|
||||
source /etc/profile.d/qt.sh
|
||||
%makeinstall
|
||||
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO
|
||||
%{_bindir}/kdiff3
|
||||
%{_datadir}/applnk/*
|
||||
%{_datadir}/apps/kdiff3/*
|
||||
%{_datadir}/apps/kdiff3part/*
|
||||
%{_datadir}/doc/HTML/*
|
||||
%{_datadir}/icons/*
|
||||
%{_datadir}/locale/*
|
||||
%{_datadir}/man/man1/kdiff3*
|
||||
%{_datadir}/services/kdiff3*
|
||||
%{_libdir}/trinity/libkdiff3*
|
||||
|
||||
%changelog
|
||||
* Mon May 15 2006 Vadim Likhota <vadim-lvv@yandex.ru> - 0.9.90-1.fc
|
||||
- write spec for fc/rhel/centos/asp for kdiff3
|
||||
|
@ -0,0 +1,3 @@
|
||||
##### create translation templates ##############
|
||||
|
||||
tde_l10n_create_template( "messages/kdiff3_plugin/" )
|
@ -0,0 +1,40 @@
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${TDE_INCLUDE_DIR}
|
||||
${TQT_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
link_directories(
|
||||
${TQT_LIBRARY_DIRS}
|
||||
${TDE_LIB_DIR}
|
||||
)
|
||||
|
||||
|
||||
##### libkdiff3plugin (kpart)
|
||||
|
||||
tde_add_kpart( libkdiff3plugin AUTOMOC
|
||||
|
||||
SOURCES
|
||||
kdiff3plugin.cpp
|
||||
LINK
|
||||
konq
|
||||
tdecore-shared
|
||||
tdeui-shared
|
||||
|
||||
DESTINATION ${PLUGIN_INSTALL_DIR}
|
||||
)
|
||||
|
||||
|
||||
##### other data
|
||||
|
||||
tde_create_translated_desktop(
|
||||
SOURCE kdiff3_plugin.desktop
|
||||
DESTINATION ${SERVICES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
tde_create_translated_desktop(
|
||||
SOURCE kdiff3plugin.desktop
|
||||
DESTINATION ${APPS_INSTALL_DIR}/.hidden
|
||||
)
|
@ -1,20 +0,0 @@
|
||||
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 $(LIB_TDECORE) $(LIB_TDEUI)
|
||||
libkdiff3plugin_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(LIB_QT)
|
||||
|
||||
#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
|
@ -1,661 +0,0 @@
|
||||
# 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 = ${prefix}/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 = ${prefix}/bin/dcopidl
|
||||
DCOPIDL2CPP = ${prefix}/bin/dcopidl2cpp
|
||||
DCOPIDLNG = ${prefix}/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 = ${prefix}/bin/tdeconfig_compiler
|
||||
KDECONFIG = ${prefix}/bin/tde-config
|
||||
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
|
||||
KDE_EXTRA_RPATH =
|
||||
KDE_INCLUDES = -I/usr/include/tde
|
||||
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/tde-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_TDEABC = -ltdeabc
|
||||
LIB_TDECORE = -ltdecore
|
||||
LIB_KDED =
|
||||
LIB_TDEPIM = -ltdepim
|
||||
LIB_TDEPRINT = -ltdeprint
|
||||
LIB_TDEUI = -ltdeui
|
||||
LIB_TDEDNSSD = -ltdednssd
|
||||
LIB_TDEFILE = -ltdeio
|
||||
LIB_KFM =
|
||||
LIB_TDEHTML = -ltdehtml
|
||||
LIB_TDEIMPROXY = -ltdeimproxy
|
||||
LIB_TDEIO = -ltdeio
|
||||
LIB_KJS = -lkjs
|
||||
LIB_KNEWSTUFF = -lknewstuff
|
||||
LIB_TDEPARTS = -ltdeparts
|
||||
LIB_TDESPELL = -ltdespell
|
||||
LIB_TDESYCOCA = -ltdeio
|
||||
LIB_TDEUNITTEST = -ltdeunittest
|
||||
LIB_TDEUTILS = -ltdeutils
|
||||
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
|
||||
MAKETDEWIDGETS =
|
||||
MCOPIDL = ${prefix}/bin/mcopidl
|
||||
MEINPROC = ${prefix}/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/tde -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/tde/HTML
|
||||
kde_icondir = ${datadir}/icons
|
||||
kde_includes = /usr/include/tde
|
||||
kde_kcfgdir = ${datadir}/config.kcfg
|
||||
kde_libraries = /usr/lib
|
||||
kde_libs_htmldir = /usr/share/doc/tde/HTML
|
||||
kde_libs_prefix = /usr
|
||||
kde_locale = ${datadir}/locale
|
||||
kde_mimedir = ${datadir}/mimelnk
|
||||
kde_moduledir = ${libdir}/trinity
|
||||
kde_qtver = 3
|
||||
kde_servicesdir = ${datadir}/services
|
||||
kde_servicetypesdir = ${datadir}/servicetypes
|
||||
kde_sounddir = ${datadir}/sounds
|
||||
kde_styledir = ${libdir}/trinity/plugins/styles
|
||||
kde_templatesdir = ${datadir}/templates
|
||||
kde_wallpaperdir = ${datadir}/wallpapers
|
||||
kde_widgetdir = /usr/lib/trinity/plugins/designer
|
||||
tdeinitdir = $(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/tde
|
||||
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
|
@ -1,2 +0,0 @@
|
||||
PACKAGE=kdiff3_plugin
|
||||
POFILES = AUTO
|
@ -1,2 +0,0 @@
|
||||
man_MANS = kdiff3.1
|
||||
EXTRA_DIST = $(man_MANS)
|
@ -1 +0,0 @@
|
||||
POFILES = AUTO
|
@ -1,133 +0,0 @@
|
||||
README for KDiff3-Internationalisation (i18n)
|
||||
=============================================
|
||||
Author: Joachim Eibl 2004
|
||||
|
||||
This text is for you, if you might want to help translating KDiff3 or just want
|
||||
to learn how this i18n-thing works.
|
||||
|
||||
grep "Language-Team" *.po
|
||||
|
||||
az Azerbaijani <translation-team-az@lists.sourceforge.net>
|
||||
ca LANGUAGE <LL@li.org>
|
||||
da Danish <dansk@klid.dk>
|
||||
de Deutsch <kde-i18n-de@kde.org>
|
||||
en_GB British English <kde-en-gb@kde.me.uk>
|
||||
es espaniol <kde-es@kybs.de>
|
||||
et Estonian <kde-et@linux.ee>
|
||||
fr French <kde-francophone@kde.org>
|
||||
hu Hungarian <kde-lista@sophia.jpte.hu>
|
||||
it Italian <kde-i18n-it@kde.org>
|
||||
nl Nederlands <kde-i18n-nl@kde.org>
|
||||
pl Polish
|
||||
pt_BR Brazilian Portuguese <kde-i18n-pt_BR@mail.kde.org>
|
||||
pt Portuguese <kde-i18n-pt@kde.org>
|
||||
ro Romanian <ro-kde@egroups.com>
|
||||
ru Russian <ru@li.org>
|
||||
sr Serbian
|
||||
sv Svenska <sv@li.org>
|
||||
ta <tamilpc@ambalam.com>
|
||||
tr Türkçe <tr@li.org>
|
||||
zh_CN zh_CN <i18n-translation@lists.linux.net.cn>
|
||||
|
||||
|
||||
Thanks to all translators!
|
||||
|
||||
|
||||
The program was written with English as main language. But to allow automatic
|
||||
translation of messages, every translatable text in the program was written as
|
||||
i18n("translatable").
|
||||
|
||||
i18n() is a translator-function. If a translation table exists, at runtime the
|
||||
function looks for the given string in that table and returns the translation.
|
||||
|
||||
The translation-table is created in 3 steps:
|
||||
1. First a template-translation table kdiff3.pot should be created: Usually via
|
||||
xgettext --keyword=i18n --keyword=I18N_NOOP -C -o ../po/kdiff3.pot *.cpp *.h
|
||||
|
||||
It contains all translatable strings of the program, but no translations.
|
||||
(xgettext is usually part of package gettext-devel)
|
||||
|
||||
2. Translators create a translation for a specific language. Because we don't want
|
||||
to modify the template now, we'll create a copy for each language.
|
||||
e.g.: cp kdiff3.pot de.po
|
||||
Using KBabel we can comfortably edit the translated strings.
|
||||
e.g.: kbabel de.po
|
||||
|
||||
3. The last step is to create a fast lookup-table (*.gmo) from the po-file via
|
||||
msgfmt, but this happens automatically during the build process.
|
||||
(If a new po-file was added: make -f Makefile.cvs; configure; make)
|
||||
|
||||
Before starting to translate make sure nobody else is already doing it. It would
|
||||
be a pity, if your precious time is wasted. Look at http://i18n.kde.org/, send a
|
||||
message to the translation team coordinator for your language, and tell them that
|
||||
you want to translate KDiff3. He'll inform you if you should proceed. Also read
|
||||
the other docs on that site.
|
||||
|
||||
============
|
||||
|
||||
The following is for my own memory and for those who really want to learn dirty tricks and details:
|
||||
|
||||
The KDE-i18n team stores their results in SVN. But I would like to have an independent
|
||||
copy of all translations in the po-directory of the source package. Actually it's just
|
||||
copying and renaming, but simplified with these commands:
|
||||
|
||||
|
||||
First fetch all available translations from the SVN-repository (access via websvn and wget)
|
||||
wget http://websvn.kde.org/*checkout*/trunk/l10n/subdirs
|
||||
for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/messages/extragear-utils/kdiff3.po -O $i.po; done
|
||||
|
||||
|
||||
This was the explanation for translations within KDE.
|
||||
But KDiff3 can also be compiled and run without KDE:
|
||||
|
||||
Since Qt was used for KDiff3, the first part is quite the same: Only the fast lookup-table
|
||||
(*.qm-files) must be created with $QTDIR/bin/msg2tqm (instead of msgfmt). ($QTDIR/tools/msg2tqm)
|
||||
|
||||
Still one detail isn't right: Some strings are not translated, because under KDE their
|
||||
translation is within KDE-libs or within Qt. But the translations are available:
|
||||
|
||||
For Qt-strings in $QTDIR/translations (already as .qm-files)
|
||||
|
||||
For KDE-libs in the SVN-repository, where we can reuse the previous trick to get
|
||||
all tdelibs*.po-files:
|
||||
|
||||
for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/messages/tdelibs/tdelibs.po -O tdelibs_$i.po; done
|
||||
|
||||
Finally the program must only read the correct translation tables:
|
||||
|
||||
QTranslator kdiff3Translator( 0 );
|
||||
kdiff3Translator.load( QString("kdiff3_")+QTextCodec::locale(), translationDir );
|
||||
app.installTranslator( &kdiff3Translator );
|
||||
|
||||
QTranslator qtTranslator( 0 );
|
||||
qtTranslator.load( QString("qt_")+QTextCodec::locale(), translationDir );
|
||||
app.installTranslator( &qtTranslator );
|
||||
|
||||
QTranslator tdelibsTranslator( 0 );
|
||||
tdelibsTranslator.load( QString("tdelibs_")+QTextCodec::locale(), translationDir );
|
||||
app.installTranslator( &tdelibsTranslator );
|
||||
|
||||
This should do the job, if the translation-tables can be found.
|
||||
The difficult part is: Where to search for the files, because this depends on
|
||||
where the program was installed. (I didn't solve this puzzle yet.)
|
||||
|
||||
Because it's too much effort to copy all tdelibs*.po-files along: Here is a little info
|
||||
about how to extract only the needed strings and to create the qm-files.
|
||||
|
||||
1. Only src/kreplacements/kreplacements.cpp contains strings, that were not covered by
|
||||
the normal translations. Hence a special pot-file is needed.
|
||||
xgettext --keyword=i18n --keyword=I18N_NOOP -C ../src/kreplacements/kreplacements.cpp -o kreplacements.pot
|
||||
(xgettext is usually part of package gettext-devel)
|
||||
|
||||
2. Take only needed strings and translations from tdelibs*.po:
|
||||
msgmerge --no-fuzzy-matching tdelibs_de.po kreplacements.pot >kreplacements_de.po
|
||||
|
||||
3. Concatenate the normal de.po and kreplacements_de.po:
|
||||
msgcat --use-first de.po kreplacements_de.po >kdiff3_de.po
|
||||
|
||||
4. Finally create the fast lookup table:
|
||||
$QTDIR/bin/msg2tqm kdiff3_de.po kdiff3_de.qm
|
||||
|
||||
5. The intermediate files can then be deleted.
|
||||
|
||||
The script createqm does steps 2-5 for languages where a kdiff3.po-translation exists.
|
@ -1,9 +0,0 @@
|
||||
for i in `cat subdirs` ; do
|
||||
if [ -a $i.po ]; then
|
||||
echo $i
|
||||
msgmerge --no-fuzzy-matching tdelibspo/tdelibs_$i.po kreplacements.pot >kreplacements_$i.po
|
||||
msgcat --use-first $i.po kreplacements_$i.po >kdiff3_$i.po
|
||||
/usr/lib/qt3/bin/msg2tqm kdiff3_$i.po kdiff3_$i.qm
|
||||
rm kdiff3_$i.po kreplacements_$i.po
|
||||
fi
|
||||
done
|
@ -1,3 +0,0 @@
|
||||
cvs co tde-i18n/subdirs
|
||||
for i in `cat tde-i18n/subdirs`; do cvs co tde-i18n/$i/messages/kdeextragear-1/kdiff3.po; done
|
||||
for i in `cat tde-i18n/subdirs`; do cp -p tde-i18n/$i/messages/kdeextragear-1/kdiff3.po $i.po; done
|
@ -0,0 +1,6 @@
|
||||
##### create translation templates ##############
|
||||
|
||||
tde_l10n_create_template(
|
||||
CATALOG "messages/kdiff3/"
|
||||
EXCLUDES "^kreplacements/"
|
||||
)
|
@ -0,0 +1,85 @@
|
||||
include_directories(
|
||||
${CMAKE_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${TDE_INCLUDE_DIR}
|
||||
${TQT_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
link_directories(
|
||||
${TQT_LIBRARY_DIRS}
|
||||
${TDE_LIB_DIR}
|
||||
)
|
||||
|
||||
|
||||
##### kdiff3 (executable)
|
||||
|
||||
tde_add_executable( ${PROJECT_NAME} AUTOMOC
|
||||
|
||||
SOURCES
|
||||
main.cpp
|
||||
kdiff3_shell.cpp
|
||||
LINK
|
||||
tdecore-shared
|
||||
tdeui-shared
|
||||
tdeio-shared
|
||||
tdeparts-shared
|
||||
|
||||
DESTINATION ${BIN_INSTALL_DIR}
|
||||
)
|
||||
|
||||
|
||||
##### libkdiff3part (kpart)
|
||||
|
||||
tde_add_kpart( libkdiff3part AUTOMOC
|
||||
|
||||
SOURCES
|
||||
kdiff3_part.cpp
|
||||
kdiff3.cpp
|
||||
directorymergewindow.cpp
|
||||
merger.cpp
|
||||
pdiff.cpp
|
||||
difftextwindow.cpp
|
||||
diff.cpp
|
||||
optiondialog.cpp
|
||||
mergeresultwindow.cpp
|
||||
fileaccess.cpp
|
||||
gnudiff_analyze.cpp
|
||||
gnudiff_io.cpp
|
||||
gnudiff_xmalloc.cpp
|
||||
common.cpp
|
||||
smalldialogs.cpp
|
||||
LINK
|
||||
tdecore-shared
|
||||
tdeui-shared
|
||||
tdeio-shared
|
||||
tdeprint-shared
|
||||
tdeparts-shared
|
||||
|
||||
DESTINATION ${PLUGIN_INSTALL_DIR}
|
||||
)
|
||||
|
||||
|
||||
##### icons
|
||||
|
||||
tde_install_icons( ${PROJECT_NAME} )
|
||||
|
||||
|
||||
##### other data
|
||||
|
||||
install(
|
||||
FILES kdiff3_shell.rc
|
||||
DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}
|
||||
)
|
||||
|
||||
tde_create_translated_desktop(
|
||||
SOURCE kdiff3part.desktop
|
||||
DESTINATION ${SERVICES_INSTALL_DIR}
|
||||
)
|
||||
|
||||
install(
|
||||
FILES kdiff3_part.rc
|
||||
DESTINATION ${DATA_INSTALL_DIR}/kdiff3part
|
||||
)
|
||||
|
||||
tde_create_translated_desktop( ${PROJECT_NAME}.desktop )
|
@ -1,58 +0,0 @@
|
||||
|
||||
# set the include path for X, qt and KDE
|
||||
INCLUDES = $(all_includes)
|
||||
|
||||
# these are the headers for your project
|
||||
noinst_HEADERS = kdiff3_part.h kdiff3_shell.h kdiff3.h common.h diff.h \
|
||||
directorymergewindow.h merger.h optiondialog.h fileaccess.h version.h \
|
||||
smalldialogs.h difftextwindow.h mergeresultwindow.h
|
||||
|
||||
# let automoc handle all of the meta source files (moc)
|
||||
METASOURCES = AUTO
|
||||
|
||||
messages: rc.cpp
|
||||
$(XGETTEXT) *.cpp -o $(podir)/kdiff3.pot
|
||||
|
||||
KDE_ICON = kdiff3
|
||||
|
||||
# this Makefile creates both a KPart application and a KPart
|
||||
#########################################################################
|
||||
# APPLICATION SECTION
|
||||
#########################################################################
|
||||
# this is the program that gets installed. it's name is used for all
|
||||
# of the other Makefile.am variables
|
||||
bin_PROGRAMS = kdiff3
|
||||
|
||||
# the application source, library search path, and link libraries
|
||||
kdiff3_SOURCES = main.cpp kdiff3_shell.cpp
|
||||
kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
|
||||
kdiff3_LDADD = $(LIB_TDEPARTS)
|
||||
|
||||
# this is where the desktop file will go
|
||||
shelldesktopdir = $(kde_appsdir)/Development
|
||||
shelldesktop_DATA = kdiff3.desktop
|
||||
|
||||
# this is where the shell's XML-GUI resource file goes
|
||||
shellrcdir = $(kde_datadir)/kdiff3
|
||||
shellrc_DATA = kdiff3_shell.rc
|
||||
|
||||
#########################################################################
|
||||
# KPART SECTION
|
||||
#########################################################################
|
||||
kde_module_LTLIBRARIES = libkdiff3part.la
|
||||
|
||||
# the Part's source, library search path, and link libraries
|
||||
libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.cpp \
|
||||
merger.cpp pdiff.cpp difftextwindow.cpp diff.cpp optiondialog.cpp \
|
||||
mergeresultwindow.cpp fileaccess.cpp gnudiff_analyze.cpp gnudiff_io.cpp gnudiff_xmalloc.cpp \
|
||||
common.cpp smalldialogs.cpp
|
||||
libkdiff3part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT)
|
||||
libkdiff3part_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE)
|
||||
|
||||
# this is where the desktop file will go
|
||||
partdesktopdir = $(kde_servicesdir)
|
||||
partdesktop_DATA = kdiff3part.desktop
|
||||
|
||||
# this is where the part's XML-GUI resource file goes
|
||||
partrcdir = $(kde_datadir)/kdiff3part
|
||||
partrc_DATA = kdiff3_part.rc
|
@ -1,425 +0,0 @@
|
||||
#############################################################################
|
||||
# Makefile for building: kdiff3
|
||||
# Generated by qmake (1.07a) (Qt 3.3.5) on: Sat Apr 8 20:11:51 2006
|
||||
# Project: kdiff3.pro
|
||||
# Template: app
|
||||
# Command: $(QMAKE) -o Makefile kdiff3.pro
|
||||
#############################################################################
|
||||
|
||||
####### Compiler, tools and options
|
||||
|
||||
CC = gcc
|
||||
CXX = g++
|
||||
LEX = flex
|
||||
YACC = yacc
|
||||
CFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
|
||||
CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM
|
||||
LEXFLAGS =
|
||||
YACCFLAGS= -d
|
||||
INCPATH = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include
|
||||
LINK = g++
|
||||
LFLAGS =
|
||||
LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lXext -lX11 -lm -lpthread
|
||||
AR = ar cqs
|
||||
RANLIB =
|
||||
MOC = $(QTDIR)/bin/moc
|
||||
UIC = $(QTDIR)/bin/uic
|
||||
QMAKE = qmake
|
||||
TAR = tar -cf
|
||||
GZIP = gzip -9f
|
||||
COPY = cp -f
|
||||
COPY_FILE= $(COPY)
|
||||
COPY_DIR = $(COPY) -r
|
||||
INSTALL_FILE= $(COPY_FILE)
|
||||
INSTALL_DIR = $(COPY_DIR)
|
||||
DEL_FILE = rm -f
|
||||
SYMLINK = ln -sf
|
||||
DEL_DIR = rmdir
|
||||
MOVE = mv -f
|
||||
CHK_DIR_EXISTS= test -d
|
||||
MKDIR = mkdir -p
|
||||
|
||||
####### Output directory
|
||||
|
||||
OBJECTS_DIR = ./
|
||||
|
||||
####### Files
|
||||
|
||||
HEADERS = version.h \
|
||||
diff.h \
|
||||
difftextwindow.h \
|
||||
mergeresultwindow.h \
|
||||
kdiff3.h \
|
||||
merger.h \
|
||||
optiondialog.h \
|
||||
kreplacements/kreplacements.h \
|
||||
directorymergewindow.h \
|
||||
fileaccess.h \
|
||||
kdiff3_shell.h \
|
||||
kdiff3_part.h \
|
||||
smalldialogs.h
|
||||
SOURCES = main.cpp \
|
||||
diff.cpp \
|
||||
difftextwindow.cpp \
|
||||
kdiff3.cpp \
|
||||
merger.cpp \
|
||||
mergeresultwindow.cpp \
|
||||
optiondialog.cpp \
|
||||
pdiff.cpp \
|
||||
directorymergewindow.cpp \
|
||||
fileaccess.cpp \
|
||||
smalldialogs.cpp \
|
||||
kdiff3_shell.cpp \
|
||||
kdiff3_part.cpp \
|
||||
gnudiff_analyze.cpp \
|
||||
gnudiff_io.cpp \
|
||||
gnudiff_xmalloc.cpp \
|
||||
common.cpp \
|
||||
kreplacements/kreplacements.cpp \
|
||||
kreplacements/ShellContextMenu.cpp
|
||||
OBJECTS = main.o \
|
||||
diff.o \
|
||||
difftextwindow.o \
|
||||
kdiff3.o \
|
||||
merger.o \
|
||||
mergeresultwindow.o \
|
||||
optiondialog.o \
|
||||
pdiff.o \
|
||||
directorymergewindow.o \
|
||||
fileaccess.o \
|
||||
smalldialogs.o \
|
||||
kdiff3_shell.o \
|
||||
kdiff3_part.o \
|
||||
gnudiff_analyze.o \
|
||||
gnudiff_io.o \
|
||||
gnudiff_xmalloc.o \
|
||||
common.o \
|
||||
kreplacements.o \
|
||||
ShellContextMenu.o
|
||||
FORMS =
|
||||
UICDECLS =
|
||||
UICIMPLS =
|
||||
SRCMOC = moc_difftextwindow.cpp \
|
||||
moc_mergeresultwindow.cpp \
|
||||
moc_kdiff3.cpp \
|
||||
moc_optiondialog.cpp \
|
||||
kreplacements/moc_kreplacements.cpp \
|
||||
moc_directorymergewindow.cpp \
|
||||
moc_fileaccess.cpp \
|
||||
moc_kdiff3_shell.cpp \
|
||||
moc_kdiff3_part.cpp \
|
||||
moc_smalldialogs.cpp
|
||||
OBJMOC = moc_difftextwindow.o \
|
||||
moc_mergeresultwindow.o \
|
||||
moc_kdiff3.o \
|
||||
moc_optiondialog.o \
|
||||
moc_kreplacements.o \
|
||||
moc_directorymergewindow.o \
|
||||
moc_fileaccess.o \
|
||||
moc_kdiff3_shell.o \
|
||||
moc_kdiff3_part.o \
|
||||
moc_smalldialogs.o
|
||||
DIST = kdiff3.pro
|
||||
QMAKE_TARGET = kdiff3
|
||||
DESTDIR =
|
||||
TARGET = kdiff3
|
||||
|
||||
first: all
|
||||
####### Implicit rules
|
||||
|
||||
.SUFFIXES: .c .o .cpp .cc .cxx .C
|
||||
|
||||
.cpp.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
||||
|
||||
.cc.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
||||
|
||||
.cxx.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
||||
|
||||
.C.o:
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
|
||||
|
||||
####### Build rules
|
||||
|
||||
all: $(TARGET)
|
||||
|
||||
$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
|
||||
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)
|
||||
|
||||
mocables: $(SRCMOC)
|
||||
uicables: $(UICDECLS) $(UICIMPLS)
|
||||
|
||||
$(MOC):
|
||||
( cd $(QTDIR)/src/moc && $(MAKE) )
|
||||
|
||||
dist:
|
||||
@mkdir -p .tmp/kdiff3 && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/kdiff3/ && ( cd `dirname .tmp/kdiff3` && $(TAR) kdiff3.tar kdiff3 && $(GZIP) kdiff3.tar ) && $(MOVE) `dirname .tmp/kdiff3`/kdiff3.tar.gz . && $(DEL_FILE) -r .tmp/kdiff3
|
||||
|
||||
mocclean:
|
||||
-$(DEL_FILE) $(OBJMOC)
|
||||
-$(DEL_FILE) $(SRCMOC)
|
||||
|
||||
uiclean:
|
||||
|
||||
yaccclean:
|
||||
lexclean:
|
||||
clean: mocclean
|
||||
-$(DEL_FILE) $(OBJECTS)
|
||||
-$(DEL_FILE) *~ core *.core
|
||||
|
||||
|
||||
####### Sub-libraries
|
||||
|
||||
distclean: clean
|
||||
-$(DEL_FILE) $(TARGET) $(TARGET)
|
||||
|
||||
|
||||
FORCE:
|
||||
|
||||
####### Compile
|
||||
|
||||
main.o: main.cpp kdiff3_shell.h \
|
||||
version.h \
|
||||
optiondialog.h \
|
||||
common.h
|
||||
|
||||
diff.o: diff.cpp diff.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h \
|
||||
common.h
|
||||
|
||||
difftextwindow.o: difftextwindow.cpp difftextwindow.h \
|
||||
merger.h \
|
||||
optiondialog.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
fileaccess.h
|
||||
|
||||
kdiff3.o: kdiff3.cpp difftextwindow.h \
|
||||
mergeresultwindow.h \
|
||||
kdiff3.h \
|
||||
optiondialog.h \
|
||||
fileaccess.h \
|
||||
kdiff3_part.h \
|
||||
directorymergewindow.h \
|
||||
smalldialogs.h \
|
||||
xpm/downend.xpm \
|
||||
xpm/currentpos.xpm \
|
||||
xpm/down1arrow.xpm \
|
||||
xpm/down2arrow.xpm \
|
||||
xpm/upend.xpm \
|
||||
xpm/up1arrow.xpm \
|
||||
xpm/up2arrow.xpm \
|
||||
xpm/prevunsolved.xpm \
|
||||
xpm/nextunsolved.xpm \
|
||||
xpm/iconA.xpm \
|
||||
xpm/iconB.xpm \
|
||||
xpm/iconC.xpm \
|
||||
xpm/autoadvance.xpm \
|
||||
xpm/showwhitespace.xpm \
|
||||
xpm/showwhitespacechars.xpm \
|
||||
xpm/showlinenumbers.xpm \
|
||||
diff.h \
|
||||
common.h
|
||||
|
||||
merger.o: merger.cpp merger.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
mergeresultwindow.o: mergeresultwindow.cpp mergeresultwindow.h \
|
||||
optiondialog.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
fileaccess.h
|
||||
|
||||
optiondialog.o: optiondialog.cpp optiondialog.h \
|
||||
diff.h \
|
||||
smalldialogs.h \
|
||||
common.h \
|
||||
fileaccess.h
|
||||
|
||||
pdiff.o: pdiff.cpp difftextwindow.h \
|
||||
mergeresultwindow.h \
|
||||
directorymergewindow.h \
|
||||
smalldialogs.h \
|
||||
kdiff3.h \
|
||||
optiondialog.h \
|
||||
fileaccess.h \
|
||||
gnudiff_diff.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
gnudiff_system.h
|
||||
|
||||
directorymergewindow.o: directorymergewindow.cpp directorymergewindow.h \
|
||||
optiondialog.h \
|
||||
xpm/link_arrow.xpm \
|
||||
xpm/file.xpm \
|
||||
xpm/folder.xpm \
|
||||
xpm/startmerge.xpm \
|
||||
xpm/showequalfiles.xpm \
|
||||
xpm/showfilesonlyina.xpm \
|
||||
xpm/showfilesonlyinb.xpm \
|
||||
xpm/showfilesonlyinc.xpm \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
diff.h
|
||||
|
||||
fileaccess.o: fileaccess.cpp fileaccess.h \
|
||||
optiondialog.h \
|
||||
common.h
|
||||
|
||||
smalldialogs.o: smalldialogs.cpp smalldialogs.h \
|
||||
optiondialog.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
fileaccess.h
|
||||
|
||||
kdiff3_shell.o: kdiff3_shell.cpp kdiff3_shell.h \
|
||||
kdiff3.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
kdiff3_part.o: kdiff3_part.cpp kdiff3_part.h \
|
||||
kdiff3.h \
|
||||
fileaccess.h \
|
||||
version.h \
|
||||
diff.h \
|
||||
common.h \
|
||||
optiondialog.h
|
||||
|
||||
gnudiff_analyze.o: gnudiff_analyze.cpp gnudiff_diff.h \
|
||||
gnudiff_system.h
|
||||
|
||||
gnudiff_io.o: gnudiff_io.cpp gnudiff_diff.h \
|
||||
gnudiff_system.h
|
||||
|
||||
gnudiff_xmalloc.o: gnudiff_xmalloc.cpp gnudiff_diff.h \
|
||||
gnudiff_system.h
|
||||
|
||||
common.o: common.cpp common.h
|
||||
|
||||
kreplacements.o: kreplacements/kreplacements.cpp kreplacements/kreplacements.h \
|
||||
common.h \
|
||||
xpm/fileopen.xpm \
|
||||
xpm/filesave.xpm \
|
||||
xpm/fileprint.xpm \
|
||||
kreplacements/kreplacements.moc
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o kreplacements.o kreplacements/kreplacements.cpp
|
||||
|
||||
ShellContextMenu.o: kreplacements/ShellContextMenu.cpp kreplacements/ShellContextMenu.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o ShellContextMenu.o kreplacements/ShellContextMenu.cpp
|
||||
|
||||
moc_difftextwindow.o: moc_difftextwindow.cpp difftextwindow.h diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
moc_mergeresultwindow.o: moc_mergeresultwindow.cpp mergeresultwindow.h diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
moc_kdiff3.o: moc_kdiff3.cpp kdiff3.h diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
moc_optiondialog.o: moc_optiondialog.cpp optiondialog.h
|
||||
|
||||
moc_kreplacements.o: kreplacements/moc_kreplacements.cpp kreplacements/kreplacements.h common.h
|
||||
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_kreplacements.o kreplacements/moc_kreplacements.cpp
|
||||
|
||||
moc_directorymergewindow.o: moc_directorymergewindow.cpp directorymergewindow.h common.h \
|
||||
fileaccess.h \
|
||||
diff.h \
|
||||
optiondialog.h
|
||||
|
||||
moc_fileaccess.o: moc_fileaccess.cpp fileaccess.h
|
||||
|
||||
moc_kdiff3_shell.o: moc_kdiff3_shell.cpp kdiff3_shell.h
|
||||
|
||||
moc_kdiff3_part.o: moc_kdiff3_part.cpp kdiff3_part.h
|
||||
|
||||
moc_smalldialogs.o: moc_smalldialogs.cpp smalldialogs.h diff.h \
|
||||
common.h \
|
||||
fileaccess.h \
|
||||
optiondialog.h
|
||||
|
||||
moc_difftextwindow.cpp: $(MOC) difftextwindow.h
|
||||
$(MOC) difftextwindow.h -o moc_difftextwindow.cpp
|
||||
|
||||
moc_mergeresultwindow.cpp: $(MOC) mergeresultwindow.h
|
||||
$(MOC) mergeresultwindow.h -o moc_mergeresultwindow.cpp
|
||||
|
||||
moc_kdiff3.cpp: $(MOC) kdiff3.h
|
||||
$(MOC) kdiff3.h -o moc_kdiff3.cpp
|
||||
|
||||
moc_optiondialog.cpp: $(MOC) optiondialog.h
|
||||
$(MOC) optiondialog.h -o moc_optiondialog.cpp
|
||||
|
||||
kreplacements/moc_kreplacements.cpp: $(MOC) kreplacements/kreplacements.h
|
||||
$(MOC) kreplacements/kreplacements.h -o kreplacements/moc_kreplacements.cpp
|
||||
|
||||
moc_directorymergewindow.cpp: $(MOC) directorymergewindow.h
|
||||
$(MOC) directorymergewindow.h -o moc_directorymergewindow.cpp
|
||||
|
||||
moc_fileaccess.cpp: $(MOC) fileaccess.h
|
||||
$(MOC) fileaccess.h -o moc_fileaccess.cpp
|
||||
|
||||
moc_kdiff3_shell.cpp: $(MOC) kdiff3_shell.h
|
||||
$(MOC) kdiff3_shell.h -o moc_kdiff3_shell.cpp
|
||||
|
||||
moc_kdiff3_part.cpp: $(MOC) kdiff3_part.h
|
||||
$(MOC) kdiff3_part.h -o moc_kdiff3_part.cpp
|
||||
|
||||
moc_smalldialogs.cpp: $(MOC) smalldialogs.h
|
||||
$(MOC) smalldialogs.h -o moc_smalldialogs.cpp
|
||||
|
||||
####### Install
|
||||
|
||||
install_documentation: all
|
||||
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/da" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/de" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/en" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/et" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/fr" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/it" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/pt" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
-$(INSTALL_DIR) "../doc/sv" "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
|
||||
|
||||
uninstall_documentation:
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/da"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/de"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/en"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/et"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/fr"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/it"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/pt"
|
||||
-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/sv"
|
||||
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/share/doc/kdiff3/"
|
||||
|
||||
|
||||
install_target: all
|
||||
@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/local/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/local/bin/"
|
||||
-$(INSTALL_FILE) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
|
||||
|
||||
uninstall_target:
|
||||
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
|
||||
-$(DEL_DIR) "$(INSTALL_ROOT)/usr/local/bin/"
|
||||
|
||||
|
||||
install: install_documentation install_target
|
||||
|
||||
uninstall: uninstall_documentation uninstall_target
|
||||
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 170 B |
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 234 B |
@ -1,14 +0,0 @@
|
||||
Begin4
|
||||
Title: kdiff3
|
||||
Version: R14.0.0
|
||||
Entered-date: 2010-05-10
|
||||
Description: Tool for comparing and merging files or directories
|
||||
Keywords: TDE Qt
|
||||
Author: Joachim Eibl <joachim at gmx.de>
|
||||
Maintained-by: The Trinity Desktop Environment (TDE) http://www.trinitydesktop.org/
|
||||
Primary-site: http://git.trinitydesktop.org/cgit/
|
||||
Alternate-site:
|
||||
Original-site: http://kdiff3.sourceforge.net
|
||||
Platforms: Linux and other Unices running TDE
|
||||
Copying-policy: GPL
|
||||
End
|
@ -1,57 +0,0 @@
|
||||
TEMPLATE = app
|
||||
# When unresolved items remain during linking: Try adding "shared" in the CONFIG.
|
||||
CONFIG += qt warn_on thread release
|
||||
HEADERS = version.h \
|
||||
diff.h \
|
||||
difftextwindow.h \
|
||||
mergeresultwindow.h \
|
||||
kdiff3.h \
|
||||
merger.h \
|
||||
optiondialog.h \
|
||||
kreplacements/kreplacements.h \
|
||||
directorymergewindow.h \
|
||||
fileaccess.h \
|
||||
kdiff3_shell.h \
|
||||
kdiff3_part.h \
|
||||
smalldialogs.h
|
||||
SOURCES = main.cpp \
|
||||
diff.cpp \
|
||||
difftextwindow.cpp \
|
||||
kdiff3.cpp \
|
||||
merger.cpp \
|
||||
mergeresultwindow.cpp \
|
||||
optiondialog.cpp \
|
||||
pdiff.cpp \
|
||||
directorymergewindow.cpp \
|
||||
fileaccess.cpp \
|
||||
smalldialogs.cpp \
|
||||
kdiff3_shell.cpp \
|
||||
kdiff3_part.cpp \
|
||||
gnudiff_analyze.cpp \
|
||||
gnudiff_io.cpp \
|
||||
gnudiff_xmalloc.cpp \
|
||||
common.cpp \
|
||||
kreplacements/kreplacements.cpp \
|
||||
kreplacements/ShellContextMenu.cpp
|
||||
TARGET = kdiff3
|
||||
INCLUDEPATH += . ./kreplacements
|
||||
|
||||
win32 {
|
||||
# QMAKE_CXXFLAGS_DEBUG -= -Zi
|
||||
# QMAKE_CXXFLAGS_DEBUG += -GX -GR -Z7 /FR -DQT_NO_ASCII_CAST
|
||||
# QMAKE_LFLAGS_DEBUG += /PDB:NONE
|
||||
# QMAKE_CXXFLAGS_RELEASE += -GX -GR -DNDEBUG -DQT_NO_ASCII_CAST
|
||||
|
||||
QMAKE_CXXFLAGS_DEBUG += -DQT_NO_ASCII_CAST
|
||||
QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -DQT_NO_ASCII_CAST
|
||||
RC_FILE = kdiff3.rc
|
||||
}
|
||||
unix {
|
||||
documentation.path = /usr/local/share/doc/kdiff3
|
||||
documentation.files = ../doc/*
|
||||
|
||||
INSTALLS += documentation
|
||||
|
||||
target.path = /usr/local/bin
|
||||
INSTALLS += target
|
||||
}
|
@ -1 +0,0 @@
|
||||
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 170 B |
Before Width: | Height: | Size: 346 B After Width: | Height: | Size: 234 B |
@ -1,19 +0,0 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 by Joachim Eibl *
|
||||
* joachim.eibl@gmx.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; 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 *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||
***************************************************************************/
|
@ -1,24 +0,0 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2005 by Joachim Eibl *
|
||||
* joachim.eibl@gmx.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; 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 *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef
|
||||
#define
|
||||
|
||||
#endif
|
@ -0,0 +1 @@
|
||||
tde_auto_add_subdirectories()
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ar\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "واجهة أمامية لبرامج Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "أداة مقارنة و دمج ملفات و دلائل (مجلًدات )"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: bs\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfejs za Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Alat za upoređivanje i spajanje datoteka i direktorija"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ca\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfície per a diff/patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Una eina per a comparar i fusionar fitxers o directoris"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,48 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: cs\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
#, fuzzy
|
||||
msgid "KDiff3"
|
||||
msgstr "Komponenta KDiff3"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Rozhraní pro Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Nástroj pro porovnávání a slučování souborů a adresářů"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "Komponenta KDiff3"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: cy\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Blaen Gwahaniaethau/Clytiau"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: da\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Forende for diff/patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Et indfletningsværktøj for filer og mapper"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Graphische Oberfläche zu Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: es\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfaz Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Una herramienta para mezclar y comparar archivos y directorios"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: et\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Võrdlemise ja liitmise rakendus"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Failide ja kataloogide võrdlemise ja liitmise tööriist"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,49 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ga\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Comhéadan Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
"Uirlis a chuireann comhaid agus comhadlanna i gcomparáid agus a chumascann "
|
||||
"iad más gá"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: gl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interface para Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Comparazón e Unificazón de Ficheiros e Cartafoles"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: hi\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr "के-डिफ3"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "डिफ/पैच फ्रन्टएण्ड"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "एक फाइल तथा डिरेक्ट्री तुलना तथा विलीन उपकरण"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "के-डिफ3पार्ट"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: hu\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Grafikus diff/patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Segédprogram fájlok, könyvtárak összehasonlításához"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: is\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch viðmót"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Skráa og möppu samanburðar og sameiningartól"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: it\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfaccia per diff/patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Uno strumento di confronto e unione di file e directory"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ja\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch フロントエンド"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "ファイル/ディレクトリの比較/統合ツール"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ka\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr ""
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "ფაილთა და საქაღალდეთა შედარების და შერწყმის ხელსაწყო"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr ""
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: lt\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch naudotojo sąsaja"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ms\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Bahagian Depan Beza/Tampal"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Perbandingan Fail Dan Direktori Dan Alatan Gabungan"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,48 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: nb\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
#, fuzzy
|
||||
msgid "KDiff3"
|
||||
msgstr "KDiff3-del"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Endrings-/lappeprogram"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Et verktøy for å sammenlikne og slå sammen filer og mapper"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "KDiff3-del"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: nl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Een schil voor Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: pa\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch ਮੁੱਖ"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "ਇੱਕ ਫਾਇਲ ਅਤੇ ਡਾਇਰੈਕਟਰੀ ਤੁਲਨਾ ਅਤੇ ਮਿਲਾਨ ਸੰਦ ਹੈ"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: pl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfejs do programów Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Narzędzie do porównywania oraz łączenia plików i katalogów"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: pt\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interface do Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Uma Ferramenta de Comparação e Junção de Ficheiros e Pastas"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,48 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: pt_BR\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
#, fuzzy
|
||||
msgid "KDiff3"
|
||||
msgstr "Componente KDiff3"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interface do Diff/Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Uma Ferramenta de Comparação e Junção de Arquivos e Diretórios"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "Componente KDiff3"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ru\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Графический интерфейс к Diff и Patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Утилита сравнения и объединения файлов и каталогов"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: sk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Rozhranie pre diff/patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Nástroj pre porovnanie a spájanie súborov a priečinkov"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: sr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Интерфејс за diff и patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Алат за поређење и стапање фајлова и директоријума"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: sr@Latn\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Interfejs za diff i patch"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Alat za poređenje i stapanje fajlova i direktorijuma"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: sv\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr "Kdiff3"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Jämförelse- och programfixgränssnitt"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "Ett jämförelseverktyg för fil- och katalogjämförelser"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "Kdiff3-del"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: ta\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr "கேடிஃப்3"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch Frontend"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "கேடிஃப்3 பகுதி"
|
@ -0,0 +1,48 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: zh_CN\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
#, fuzzy
|
||||
msgid "KDiff3"
|
||||
msgstr "KDiff3 组件"
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/Patch 前端"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr "一个文件和目录的比较及合并工具"
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr "KDiff3 组件"
|
@ -0,0 +1,47 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# This file is put in the public domain.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2020-06-28 10:45+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: zu\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3_plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: kdiff3plugin/kdiff3plugin.desktop:4
|
||||
msgid "Compare/Merge Files/Directories with KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3.desktop:3
|
||||
msgid "KDiff3"
|
||||
msgstr ""
|
||||
|
||||
#. GenericName
|
||||
#: src/kdiff3.desktop:5
|
||||
msgid "Diff/Patch Frontend"
|
||||
msgstr "Diff/PatchIsiqalo sokugcina"
|
||||
|
||||
#. Comment
|
||||
#: src/kdiff3.desktop:7
|
||||
msgid "A File And Directory Comparison And Merge Tool"
|
||||
msgstr ""
|
||||
|
||||
#. Name
|
||||
#: src/kdiff3part.desktop:3
|
||||
msgid "KDiff3Part"
|
||||
msgstr ""
|
@ -0,0 +1,14 @@
|
||||
file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po )
|
||||
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
|
||||
|
||||
foreach( _po ${po_files} )
|
||||
get_filename_component( _lang ${_po} NAME_WE )
|
||||
if( "${_linguas}" MATCHES "^;*$" OR ";${_linguas};" MATCHES ";${_lang};" )
|
||||
if( "${_po}" MATCHES "^([^/]*)/.*" )
|
||||
string( REGEX REPLACE "^([^/]*)/.*" "\\1" _component "${_po}" )
|
||||
else( )
|
||||
set( _component "${PROJECT_NAME}" )
|
||||
endif( )
|
||||
tde_create_translation( FILES ${_po} LANG ${_lang} OUTPUT_NAME ${_component} )
|
||||
endif( )
|
||||
endforeach( )
|
@ -0,0 +1,102 @@
|
||||
# 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: 2020-05-11 04:19+0200\n"
|
||||
"PO-Revision-Date: 2019-12-04 23:59+0000\n"
|
||||
"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
|
||||
"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
|
||||
"projects/applications/kdiff3-plugin/sk/>\n"
|
||||
"Language: sk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 3.9.1\n"
|
||||
|
||||
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
|
||||
msgid ""
|
||||
"_: NAME OF TRANSLATORS\n"
|
||||
"Your names"
|
||||
msgstr "Marek Mlynár"
|
||||
|
||||
#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
|
||||
msgid ""
|
||||
"_: EMAIL OF TRANSLATORS\n"
|
||||
"Your emails"
|
||||
msgstr "marek.inq.mlynar@gmail.com"
|
||||
|
||||
#: kdiff3plugin.cpp:97
|
||||
msgid "KDiff3"
|
||||
msgstr "KDiff3"
|
||||
|
||||
#: kdiff3plugin.cpp:104
|
||||
#, c-format
|
||||
msgid "Compare with %1"
|
||||
msgstr "Porovnaj s %1"
|
||||
|
||||
#: kdiff3plugin.cpp:109
|
||||
#, c-format
|
||||
msgid "Merge with %1"
|
||||
msgstr "Zlúč s %1"
|
||||
|
||||
#: kdiff3plugin.cpp:114
|
||||
msgid "Save '%1' for later"
|
||||
msgstr "Ulož '%1' na neskôr"
|
||||
|
||||
#: kdiff3plugin.cpp:119
|
||||
msgid "3-way merge with base"
|
||||
msgstr "3-cestné zlúčenie so základom"
|
||||
|
||||
#: kdiff3plugin.cpp:125
|
||||
msgid "Compare with ..."
|
||||
msgstr "Porovnaj s..."
|
||||
|
||||
#: kdiff3plugin.cpp:134
|
||||
msgid "Clear list"
|
||||
msgstr "Vyčisti zoznam"
|
||||
|
||||
#: kdiff3plugin.cpp:141
|
||||
msgid "Compare"
|
||||
msgstr "Porovnaj"
|
||||
|
||||
#: kdiff3plugin.cpp:146
|
||||
msgid "3 way comparison"
|
||||
msgstr "3 cestné porovnanie"
|
||||
|
||||
#: kdiff3plugin.cpp:149
|
||||
msgid "About KDiff3 menu plugin ..."
|
||||
msgstr "O KDiff3 menu plugine..."
|
||||
|
||||
#: kdiff3plugin.cpp:250
|
||||
msgid ""
|
||||
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
|
||||
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
|
||||
"\n"
|
||||
msgstr ""
|
||||
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
|
||||
"KDiff3 domáca stránka: http://kdiff3.sourceforge.net\n"
|
||||
"\n"
|
||||
|
||||
#: kdiff3plugin.cpp:252
|
||||
msgid ""
|
||||
"Using the contextmenu extension:\n"
|
||||
"For simple comparison of two selected 2 files choose \"Compare\".\n"
|
||||
"If the other file is somewhere else \"Save\" the first file for later. It "
|
||||
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
|
||||
"on second file.\n"
|
||||
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
|
||||
"choose \"3-way merge with base\" on the other branch which will be used as "
|
||||
"destination.\n"
|
||||
"Same also applies to directory comparison and merge."
|
||||
msgstr ""
|
||||
"Používanie rozšírenia kontextového menu:\n"
|
||||
"Pre jednoduché porovnanie 2 súborov vyberte \"Porovnaj\".\n"
|
||||
"Ak sa nachádza ďalší súbor niekde inde, vyberte \"Uložiť\" prvý súbor na "
|
||||
"neskôr. potom sa objaví v submenu \"Porovnaj s...\". potom použite "
|
||||
"\"Porovnaj s...\" na druhý súbor.\n"
|
||||
"Pre 3-cestné zlúčenie najskôr použite \"Uložiť\" na prvý súbor, tiež na "
|
||||
"druhý súbor a nakoniec zvoľte \"3-cestné zlúčenie so základom\" na tretí "
|
||||
"ktorý poslúži ako cieľový."
|