Compare commits

...

202 Commits

Author SHA1 Message Date
Michele Calgaro e9df76c144
Amendment to previous commit
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 month ago
Michele Calgaro 2c74158e84
Use tdeinstance.h
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 month ago
Michele Calgaro 5f1e1f97a2
Use TDESimpleConfig
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 months ago
Andrei Stepanov 33f077f626 Translated using Weblate (Russian)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/ru/
3 months ago
Andrei Stepanov 145b378669 Added translation using Weblate (Russian) 3 months ago
Michele Calgaro 9df78396b3 Translated using Weblate (Italian)
Currently translated at 100.0% (24 of 24 strings)

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/it/
4 months ago
Michele Calgaro d021ac4fe2 Added translation using Weblate (Italian) 4 months ago
Slávek Banko 26df01de2d Added translation using Weblate (Spanish (Argentina)) 5 months ago
Slávek Banko 70b48b0caf Added translation using Weblate (Spanish (Argentina)) 5 months ago
Slávek Banko 3cd8204530 Added translation using Weblate (Spanish (Argentina)) 5 months ago
Slávek Banko 8460dac27f Added translation using Weblate (Spanish (Argentina)) 5 months ago
Toad114514 86055fa96f Translated using Weblate (Chinese (Simplified))
Currently translated at 84.6% (437 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/zh_Hans/
5 months ago
TDE Weblate 4540f9cb2c Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
6 months ago
TDE Weblate 8c88624645 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/
6 months ago
Heimen Stoffels 41ff3d2478 Translated using Weblate (Dutch)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/nl/
6 months ago
Heimen Stoffels 16f3c8cbb2 Translated using Weblate (Dutch)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/nl/
6 months ago
Jan Stolarek 7f07d5f710 Translated using Weblate (Polish)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/pl/
6 months ago
Jan Stolarek 34a380313d Translated using Weblate (Polish)
Currently translated at 100.0% (24 of 24 strings)

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/pl/
6 months ago
Jan Stolarek 512463b2ca Added translation using Weblate (Polish) 6 months ago
Jan Stolarek 846a544553 Added translation using Weblate (Polish) 6 months ago
TDE Weblate bd6fa47f95 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
6 months ago
TDE Weblate 72c0331bec Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
6 months ago
TDE Weblate 871d87b19b Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/
6 months ago
Michele Calgaro ca51e6be42
Use tdestandarddirs.h
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 months ago
Michele Calgaro 6538b3d223
Use tdeApp
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
8 months ago
Toad114514 b0a8e135a1 Translated using Weblate (Chinese (Simplified))
Currently translated at 78.5% (11 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/zh_Hans/
8 months ago
Toad114514 883d6a2773 Translated using Weblate (Chinese (Simplified))
Currently translated at 80.2% (414 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/zh_Hans/
8 months ago
Temuri Doghonadze fbd7a4774f Translated using Weblate (Georgian)
Currently translated at 100.0% (516 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ka/
10 months ago
Temuri Doghonadze b782bc4ecf Translated using Weblate (Georgian)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/ka/
11 months ago
Temuri Doghonadze cdf36bca67 Translated using Weblate (Georgian)
Currently translated at 100.0% (24 of 24 strings)

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/ka/
11 months ago
Temuri Doghonadze 98c4e2620c Added translation using Weblate (Georgian) 11 months ago
Temuri Doghonadze 6485768162 Added translation using Weblate (Georgian) 11 months ago
Temuri Doghonadze 04f4578780 Translated using Weblate (Georgian)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/ka/
11 months ago
TDE Weblate d556aa5c7a Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
12 months ago
Michele Calgaro cd53daa908
Rename __KDE_HAVE_GCC_VISIBILITY to __TDE_HAVE_GCC_VISIBILITY
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 year ago
Michele Calgaro 7d42c691a8
Replace KDE_[NO_]EXPORT with TDE_[NO_]EXPORT
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
1 year ago
Andrei Stepanov ac9e1fb170 Translated using Weblate (Russian)
Currently translated at 67.2% (347 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ru/
1 year ago
TDE Weblate 97fe01f400 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/
2 years ago
TDE Weblate 0a217c78af Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
2 years ago
Michele Calgaro 5078bedfdc
Use centralized cmake version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro 3d8bcf0b07
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro 2065ffa4d0
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro 1efbeb497b
Replaced various '#define' with actual strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro 7c9ad54619
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Andrei Stepanov 453f35a8af Translated using Weblate (Russian)
Currently translated at 67.2% (347 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ru/
2 years ago
Andrei Stepanov 473667613c Translated using Weblate (Russian)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/ru/
2 years ago
TDE Weblate 810025fbcc Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
2 years ago
TDE Gitea b65164faf0 Update translation template. 2 years ago
Michele Calgaro 50860c0fde
Fix pasting UTF8 text from clipboard.
This commit is based on work from Roman Savochenko <roman@home.home> available at PR #13, but adapted to the TDE standard. It replaces the aforementioned PR #13.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Slávek Banko f186fb6efb
Raise the minimum required version of CMake to 3.5.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
2 years ago
Michele Calgaro 77c18c3fab
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro 02927b1c01
Replace TQ_*Focus* and TQ_Scale* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
TDE Weblate abcdeb43e1 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
2 years ago
TDE Gitea 1bab99024d Update translation template. 2 years ago
Michele Calgaro 635077214f
Drop USE_QT4 code and unnecessary .tdevelop project file
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Slávek Banko ac19644190
Fix FTBFS from issue #6.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
2 years ago
Michele Calgaro 263f2650ae
Drop TQT_BASE_OBJECT* defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro d89d2afab3
Drop TQT_TQ*_CONST defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
Michele Calgaro c46be60525
Replace Q_OBJECT with TQ_OBJECT
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
2 years ago
TDE Weblate 955c49f5fc Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
3 years ago
Xiao Wenming f43e1970bb Translated using Weblate (Chinese (Simplified))
Currently translated at 42.8% (6 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/zh_Hans/
3 years ago
Xiao Wenming b175087716 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/zh_Hans/
3 years ago
Xiao Wenming abbfe8887c Added translation using Weblate (Chinese (Simplified)) 3 years ago
TDE Weblate b617ad97a5 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
3 years ago
Michele Calgaro 92edf72f2e
Use TDE cmake macro to set version
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 years ago
Roman Savochenko 9f05772531 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (516 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Roman Savochenko 00951894f5 Translated using Weblate (Ukrainian)
Currently translated at 81.7% (422 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Roman Savochenko 56905a24ff Translated using Weblate (Ukrainian)
Currently translated at 76.9% (397 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Roman Savochenko 70fa26c913 Translated using Weblate (Ukrainian)
Currently translated at 73.4% (379 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Roman Savochenko 211b487812 Translated using Weblate (Ukrainian)
Currently translated at 30.2% (156 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Roman Savochenko e46627e5db Translated using Weblate (Ukrainian)
Currently translated at 12.5% (65 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/uk/
3 years ago
Michele Calgaro 81f42c56d8
Remove obsolete setting of CMAKE_MODULE_PATH in cmake files.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 years ago
Mehmet Dokuz 7b55ba5776 Translated using Weblate (Turkish)
Currently translated at 55.2% (285 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/tr/
4 years ago
Slávek Banko 111598df87
Raise the minimum required version of CMake to 3.1 in CMakeL10n rules.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
Slávek Banko c8b04b77e4
Raise the minimum required version of CMake to 3.1.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
Sebastião Guerra a45454872f Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/pt_BR/
4 years ago
Sebastião Guerra 1c477b9ce9 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/pt_BR/
4 years ago
Marek W 1450853673 Translated using Weblate (Polish)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/pl/
4 years ago
Slávek Banko fb43068580
Change README to markdown format.
Add translation status overview.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
Michele Calgaro e52079f672 Translated using Weblate (Italian)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/it/
4 years ago
Michele Calgaro a50504ffd0 Translated using Weblate (Italian)
Currently translated at 100.0% (516 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/it/
4 years ago
Slávek Banko 8392334986
Use common rules for build and install documentation and translations.
Customized copy of the usual en/common directory deleted because the
standard version from tdelibs is always used for TDE version.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
TDE Weblate 029ebf59a2 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
4 years ago
TDE Gitea 367848c037 Update translation template. 4 years ago
Slávek Banko 6904f8ce3d
Remove cmake submodule since it has now been replaced by cmake-trinity dependency.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
4 years ago
TDE Gitea f8a1d380c6 Reset submodule main/applications/kdiff3/cmake to latest HEAD 4 years ago
TDE Gitea aa017973fe Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 36b0e100b0 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea b5b474b3cf Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
Slávek Banko e58bc7e6df
Raise the minimum required version of CMake to 2.8.12.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
TDE Gitea cac002ee97 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 2bc2c64b28 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 38869ec87c Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
Michele Calgaro 5de2e7f88d
Removed code formatting modelines.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
5 years ago
TDE Gitea abdb98d6db Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea a5c698e095 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 67735145b4 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
Emanoil Kotsev 79d1350600 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (6 of 6 strings)

Translation: applications/kdiff3 - desktop files
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/bg/
5 years ago
Slávek Banko 215dbe5916
Add installation of png files for html documentation.
Clean up unused CMakeLists.txt, which have been replaced
by common cmake rules for documentation.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
TDE Weblate 17919ef00e Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
5 years ago
Slávek Banko 4296c4b867 Update translation template. 5 years ago
Slávek Banko 509de40974
Desktop file translations:
+ Creation of POT template for desktop files added to CMakeL10n rules.
+ Added creation of translated desktop files during build.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
Slávek Banko 8dfa8ebe8d
Remove the original translation directory layout.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
Slávek Banko e1df226b3f
Fix translation file name in diff_ext.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
Slávek Banko 9f51acfc47
Move translations to a new directory layout.
Add support for LINGUAS for listing translations to install.
Use common cmake rules for documentation.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
5 years ago
Michele Calgaro caa6e33141
Fixed detection of files in kdiff3_part.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
5 years ago
gregory guy bddb43436c
Finished up previous commit.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
5 years ago
gregory guy e14732aa76
Drop automake build support.
Add basic cmake build instructions.
Delete the NEWS file.
Rework of the README.
The man folder has been moved into the doc folder for consistency with what
have been done so far.
The html pages have been moved into the doc folder as well.
Some cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
5 years ago
TDE Gitea eadb41b09f Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 2363109526 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 1bf78b6bca Reset submodule main/applications/kdiff3/admin to latest HEAD 5 years ago
TDE Gitea 44dac94527 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea ee233a0d8b Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 8dee806a3a Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea ea504f4a64 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea a25c73a8b7 Reset submodule main/applications/kdiff3/admin to latest HEAD 5 years ago
TDE Gitea b28c6d3664 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 53a2754148 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 95e8e5da13 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Weblate ae5e598b81 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
5 years ago
TDE Weblate a33c1ca903 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/
5 years ago
TDE Weblate 9593e82141 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
5 years ago
Slávek Banko 9f61aa9762 Update translation template. 5 years ago
TDE Gitea 2141ca646f Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 1baf93c559 Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Weblate 1e6f90c8ec Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
5 years ago
TDE Weblate b78827a8ec Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
5 years ago
TDE Gitea fdc2b17cdd Reset submodule main/applications/kdiff3/cmake to latest HEAD 5 years ago
TDE Gitea 07ca24ae57 Reset submodule main/applications/kdiff3/cmake to latest HEAD 6 years ago
TDE Gitea f3f581a08c Reset submodule main/applications/kdiff3/cmake to latest HEAD 6 years ago
TDE Gitea dfeaab9027 Reset submodule main/applications/kdiff3/cmake to latest HEAD 6 years ago
Slávek Banko 0cc35839ad
Fix FTBFS with clang.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago
Michele Calgaro 0d584916ac
Removed explicit usage of the 'register' keyword.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
6 years ago
Hugo Carvalho a400f01e53 Translated using Weblate (Portuguese)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/pt/
6 years ago
Serg Bormant 0159c0ffc8 Translated using Weblate (Russian)
Currently translated at 67.2% (347 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ru/
6 years ago
Serg Bormant 11505ac972 Translated using Weblate (Russian)
Currently translated at 67.1% (346 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/ru/
6 years ago
Chris 893325d07d Translated using Weblate (German)
Currently translated at 100.0% (516 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/de/
6 years ago
TDE Gitea 94480294f5 Reset submodule main/applications/kdiff3/cmake to latest HEAD 6 years ago
Slávek Banko 6631b30848
Switch all submodules to https.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago
Slávek Banko 4e22c3f55e
Remove unnecessary "Preklad SVK:"
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
6 years ago
Marek Mlynar 8de044bc7b Translated using Weblate (Slovak)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/sk/
6 years ago
Chris c4320b7576 Translated using Weblate (German)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/de/
6 years ago
gregory guy ac4ae19235
conversion to the cmake building system
Signed-off-by: gregory guy <g-gregory@gmx.fr>
6 years ago
Michele Calgaro 1554e26b7c
Removed .lsm files. lsm database is outdated and unmaintained. 6 years ago
Chris 46c1350629 Translated using Weblate (German)
Currently translated at 100.0% (24 of 24 strings)

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/de/
6 years ago
TDE Gitea 91d350b68b Reset submodule main/applications/kdiff3/cmake to latest HEAD 6 years ago
stefano 4469eeb6c3 Translated using Weblate (Italian)
Currently translated at 100.0% (14 of 14 strings)

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/it/
6 years ago
stefano f04d1f5331 Translated using Weblate (Italian)
Currently translated at 100.0% (516 of 516 strings)

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/it/
6 years ago
Automated System 8ab60342df Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 3028b2c145 Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 47deee27fa Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
TDE Gitea 35e5b04fae Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 927a10a63f Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Weblate e98834131e Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
7 years ago
Slávek Banko 1ee2d43781 Update translation template. 7 years ago
TDE Gitea 53e566bf45 Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 49ab95f15f Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Weblate 938564a538 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - plugin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/
7 years ago
TDE Weblate 7aaa41bf65 Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3 - diff_ext
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-diff_ext/
7 years ago
TDE Weblate 7637a92a1d Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: applications/kdiff3
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/
7 years ago
Slávek Banko 0ee39c1ce9
Add CMakeL10n rules.
Update translation templates.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
TDE Gitea 3816fc742c Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 0a34fd98ce Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 2d1e8b9f05 Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
TDE Gitea 61097b6198 Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 0f48d12196 Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
Michele Calgaro 3734254d2a
Removed obsolete Qt2's TQList/TQListIterator classes and replaced
with TQt3's TQPtrList/TQPtrListIterator ones.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro 7325a710bc
QT_NO_* -> TQT_NO_* renaming.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro 3b8b42bbbf
Replaced _BSD_SOURCE, _SVID_SOURCE with _DEFAULT_SOURCE. Removed AC_CHECK_GNU_EXTENSIONS.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Slávek Banko 995b421d1b
Remove incorrect header lines from PO files
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
TDE Gitea d2b8a3a4f4 Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
Michele Calgaro 3035df221c
qt -> tqt conversion:
kdeqt -> kdetqt
qtkde -> tqtkde
qtdesigner -> tqtdesigner

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro f0c056c67a
qt -> tqt conversion:
QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro bcbc4cad35
qt -> tqt conversion:
QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro e5650b540c
qt -> tqt conversion:
qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Slávek Banko e0ce0ea640
qt_includes => tqt_includes conversion
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
Slávek Banko 553da9f77a
QT_INCLUDES => TQT_INCLUDES conversion
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
7 years ago
TDE Gitea 213da6f02f Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
Michele Calgaro 80b43e7373
Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro a028b6f4d6
KDE_USE_QT* -> KDE_USE_TQT* conversion
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro e160b9ac8c
AC_PATH_QT* -> AC_PATH_TQT* conversion
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro 2c46c17371
QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Michele Calgaro 9b5a0aee31
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
TDE Gitea abf6d0960a Reset submodule main/applications/kdiff3/cmake to latest HEAD 7 years ago
TDE Gitea 2c8885d703 Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
Michele Calgaro 9d3be1c6ea
Removed unnecessary executable flag.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
7 years ago
Automated System 1c0071acaf Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
Automated System ecbad56c60 Reset submodule main/applications/kdiff3/admin to latest HEAD 7 years ago
Automated System 63da3636ba Reset submodule main/applications/kdiff3/admin to latest HEAD 8 years ago
Slávek Banko 78a84914bc Reset submodule main/applications/kdiff3/cmake to latest HEAD 9 years ago
Automated System 1360eed7a4 Reset submodule main/applications/kdiff3/cmake to latest HEAD 9 years ago
Slávek Banko c065434369 Reset submodule main/applications/kdiff3/cmake to latest HEAD 9 years ago
Slávek Banko 3e244d2a61 cmake: add tde_add_check_executable macro 9 years ago
Automated System 19939011aa Reset submodule main/applications/kdiff3/admin to latest HEAD 9 years ago
Timothy Pearson 7f392bb439 Fix invalid headers in PNG files and optimize for size 9 years ago
Automated System 5339aff687 Reset submodule main/applications/kdiff3/cmake to latest HEAD 10 years ago
Automated System a9e3a460c6 Reset submodule main/applications/kdiff3/cmake to latest HEAD 10 years ago
Michele Calgaro 2873f3a87f Update version number to R14.1.0
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
10 years ago
Slávek Banko 008428190a Reset submodule main/applications/kdiff3/cmake to latest HEAD 10 years ago
Slávek Banko eaf5fd4b31 Reset submodule main/applications/kdiff3/cmake to latest HEAD 11 years ago
Slávek Banko d4e158c936 Reset submodule main/applications/kdiff3/admin to latest HEAD 11 years ago
Michele Calgaro 23ca514701 Fixed wrong DocPath strings. This relates to bug 2319.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
11 years ago

6
.gitmodules vendored

@ -1,6 +0,0 @@
[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

@ -0,0 +1,31 @@
#################################################
#
# (C) 2018 Slávek Banko
# slavek.banko (AT) axis.cz
#
# Improvements and feedback are welcome
#
# This file is released under GPL >= 2
#
#################################################
##### set project version ########################
include( TDEVersion )
cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
##### include our 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,85 @@
############################################
# #
# Improvements and feedbacks are welcome #
# #
# This file is released under GPL >= 3 #
# #
############################################
##### set project version ########################
include( TDEVersion )
cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
tde_set_project_version( )
#### general package setup
project( kdiff3 )
#### include essential cmake modules
include( FindPkgConfig )
include( CheckFunctionExists )
include( CheckSymbolExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )
#### include our 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 )
##### other data ################################
tde_conditional_add_project_docs( BUILD_DOC )
tde_conditional_add_project_translations( BUILD_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 +0,0 @@
See the ChangeLog

280
README

@ -1,280 +0,0 @@
KDiff3-Readme
=============
Author: Joachim Eibl (joachim.eibl at gmx.de)
Copyright: (C) 2002-2006 by Joachim Eibl
KDiff3-Version: 0.9.92
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.
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.)
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)
------------------------------------------------------------------------
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.)
If you start without arguments, then a dialog will appear where you can
select your files via a filebrowser.
For more documentation, see the help-menu or the subdirectory doc.
Have fun!

@ -0,0 +1,51 @@
kdiff3 - a diff and merge program.
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.
Included features:
------------------
- 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
.
Contributing
--------------
If you wish to contribute to kdiff3 (TDE), you might do so:
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate
Translations status
---------------------
### messages
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3/multi-auto.svg
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3/)
### plugin
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3-plugin/multi-auto.svg
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-plugin/)
### desktop files
[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kdiff3-desktop-files/multi-auto.svg
"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kdiff3-desktop-files/)

File diff suppressed because it is too large Load Diff

863
aclocal.m4 vendored

@ -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 +0,0 @@
Subproject commit 1994b808819fd74446cb8f1a0491b3e10244f463

1686
config.guess vendored

File diff suppressed because it is too large Load Diff

@ -0,0 +1,8 @@
#define VERSION "@VERSION@"
// Defined if you have fvisibility and fvisibility-inlines-hidden support.
#cmakedefine __TDE_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

1686
config.sub vendored

File diff suppressed because it is too large Load Diff

@ -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,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 04:19+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,117 @@
# SOME DESCRIPTIVE TITLE.
# Slávek Banko <slavek.banko@axis.cz>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: es_AR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. 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
#, c-format
msgid "Compare with %1"
msgstr ""
#: diff_ext.cpp:370
#, c-format
msgid "Merge with %1"
msgstr ""
#: diff_ext.cpp:386
msgid "3-way merge with base"
msgstr ""
#: diff_ext.cpp:389
msgid "Save '%1' for later"
msgstr ""
#: 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:422
msgid "About Diff-Ext ..."
msgstr ""
#: diff_ext.cpp:491
msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
msgstr ""
#: diff_ext.cpp:492
msgid "This software is distributable under the BSD license.\n"
msgstr ""
#: diff_ext.cpp:493
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
msgstr ""
#: diff_ext.cpp:494
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
msgstr ""
#: diff_ext.cpp:495
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
msgstr ""
#: diff_ext.cpp:496
msgid "About Diff-Ext for KDiff3"
msgstr ""
#: diff_ext.cpp:521
msgid "Compare selected files"
msgstr ""
#: diff_ext.cpp:527 diff_ext.cpp:547
msgid "Compare '%1' with '%2'"
msgstr ""
#: diff_ext.cpp:533
msgid "Save '%1' for later operation"
msgstr ""
#: diff_ext.cpp:585
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
msgstr ""
#: diff_ext.cpp:586
msgid "Command"
msgstr ""
#: diff_ext.cpp:587
msgid "CommandLine"
msgstr ""
#: diff_ext.cpp:588
msgid "Diff-Ext For KDiff3"
msgstr ""

@ -0,0 +1,121 @@
# SOME DESCRIPTIVE TITLE.
# Michele Calgaro <michele.calgaro@yahoo.it>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-05-26 01:36+0000\n"
"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-diff_ext/it/>\n"
"Language: it\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 4.18.2\n"
#. 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 "Michele Calgaro"
#. 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 "michele.calgaro@yahoo.it"
#: diff_ext.cpp:369
#, c-format
msgid "Compare with %1"
msgstr "Confronta con %1"
#: diff_ext.cpp:370
#, c-format
msgid "Merge with %1"
msgstr "Fondi con %1"
#: diff_ext.cpp:386
msgid "3-way merge with base"
msgstr "Fusione a 3 vie con base"
#: diff_ext.cpp:389
msgid "Save '%1' for later"
msgstr "Salva '%1' per dopo"
#: diff_ext.cpp:404
msgid "Compare with ..."
msgstr "Confronta con..."
#: diff_ext.cpp:407
msgid "Clear list"
msgstr "Cancella lista"
#: diff_ext.cpp:412
msgid "Compare"
msgstr "Compara"
#: diff_ext.cpp:416
msgid "3 way comparison"
msgstr "Confronto a 3 vie"
#: diff_ext.cpp:422
msgid "About Diff-Ext ..."
msgstr "Informazioni su Diff-Ext ..."
#: diff_ext.cpp:491
msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n"
msgstr "Copyright (c) 2003-2006, Sergey Zorin. Tutti i diritti riservati.\n"
#: diff_ext.cpp:492
msgid "This software is distributable under the BSD license.\n"
msgstr "Questo software è distribuibile secondo la licenza BSD.\n"
#: diff_ext.cpp:493
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
msgstr "Alcune estensioni per KDiff3 di Joachim Eibl.\n"
#: diff_ext.cpp:494
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
msgstr "Homepage di Diff-Ext: http://diff-ext.sourceforge.net\n"
#: diff_ext.cpp:495
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
msgstr "Homepage di KDiff3: http://kdiff3.sourceforge.net"
#: diff_ext.cpp:496
msgid "About Diff-Ext for KDiff3"
msgstr "Informazioni su Diff-Ext per KDiff3"
#: diff_ext.cpp:521
msgid "Compare selected files"
msgstr "Confronta i file selezionati"
#: diff_ext.cpp:527 diff_ext.cpp:547
msgid "Compare '%1' with '%2'"
msgstr "Confronta '%1' con '%2'"
#: diff_ext.cpp:533
msgid "Save '%1' for later operation"
msgstr "Salva '%1' per un'operazione successiva"
#: diff_ext.cpp:585
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
msgstr ""
"Impossibile avviare KDiff3. Eseguire nuovamente l'installazione di KDiff3."
#: diff_ext.cpp:586
msgid "Command"
msgstr "Comando"
#: diff_ext.cpp:587
msgid "CommandLine"
msgstr "Riga di comando"
#: diff_ext.cpp:588
msgid "Diff-Ext For KDiff3"
msgstr "Diff-Ext per KDiff3"

@ -0,0 +1,119 @@
# SOME DESCRIPTIVE TITLE.
# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2024-11-09 08:10+0000\n"
"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-diff_ext/ka/>\n"
"Language: ka\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 4.17\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 "თემური დოღონაძე"
#. 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 "temuri.doghonadze@gmail.com"
#: diff_ext.cpp:369
#, c-format
msgid "Compare with %1"
msgstr "%1-სთან შედარება"
#: diff_ext.cpp:370
#, c-format
msgid "Merge with %1"
msgstr "%1-სთან შერწყმა"
#: diff_ext.cpp:386
msgid "3-way merge with base"
msgstr "3-მხრივი შერწყმა ბაზით"
#: diff_ext.cpp:389
msgid "Save '%1' for later"
msgstr "'%1'-ის შენახვა"
#: 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 "3-მხრივი შედარება"
#: diff_ext.cpp:422
msgid "About Diff-Ext ..."
msgstr "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. ყველა უფლება დაცულია.\n"
#: diff_ext.cpp:492
msgid "This software is distributable under the BSD license.\n"
msgstr "ეს პროგრამა ვრცელდება BSD ლიცენზიით.\n"
#: diff_ext.cpp:493
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
msgstr "გაფართოებები KDiff3-სთვის იოახიმ აიბლისგან.\n"
#: diff_ext.cpp:494
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
msgstr "Diff-Ext-ის ვებგვერდი: http://diff-ext.sourceforge.net\n"
#: diff_ext.cpp:495
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
msgstr "KDiff3-ის ვებგვერდი: http://kdiff3.sourceforge.net"
#: diff_ext.cpp:496
msgid "About Diff-Ext for KDiff3"
msgstr "Diff-Ext KDiff3-სთვის შესახებ"
#: diff_ext.cpp:521
msgid "Compare selected files"
msgstr "მონიშნული ფაილების შედარება"
#: diff_ext.cpp:527 diff_ext.cpp:547
msgid "Compare '%1' with '%2'"
msgstr "'%1'-ის შედარება '%2'-სთან"
#: diff_ext.cpp:533
msgid "Save '%1' for later operation"
msgstr "'%1'-ის შენახვა მოგვიანებით სამუშაოდ"
#: diff_ext.cpp:585
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
msgstr "KDiff3-ის გაშვების შეცდომა. დააყენეთ თავიდან KDiff3."
#: diff_ext.cpp:586
msgid "Command"
msgstr "ბრძანება"
#: diff_ext.cpp:587
msgid "CommandLine"
msgstr "ბრძანებისსტრიქონი"
#: diff_ext.cpp:588
msgid "Diff-Ext For KDiff3"
msgstr "Diff-Ext KDiff3-სთვის"

@ -0,0 +1,122 @@
# SOME DESCRIPTIVE TITLE.
# Jan Stolarek <jan.stolarek@mailbox.org>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-03-24 23:32+0000\n"
"Last-Translator: Jan Stolarek <jan.stolarek@mailbox.org>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-diff_ext/pl/>\n"
"Language: pl\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%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\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 "Jan Stolarek"
#. 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 "jan.stolarek@mailbox.org"
#: diff_ext.cpp:369
#, c-format
msgid "Compare with %1"
msgstr "Porównaj z %1"
#: diff_ext.cpp:370
#, c-format
msgid "Merge with %1"
msgstr "Scal z %1"
#: diff_ext.cpp:386
msgid "3-way merge with base"
msgstr "Scalenie trójstronne z plikiem bazowym"
#: diff_ext.cpp:389
msgid "Save '%1' for later"
msgstr "Zapamiętaj %1 na później"
#: diff_ext.cpp:404
msgid "Compare with ..."
msgstr "Porównaj z ..."
#: diff_ext.cpp:407
msgid "Clear list"
msgstr "Wyczyść listę"
#: diff_ext.cpp:412
msgid "Compare"
msgstr "Porównaj"
#: diff_ext.cpp:416
msgid "3 way comparison"
msgstr "Porównanie trójstronne"
#: diff_ext.cpp:422
msgid "About Diff-Ext ..."
msgstr "O 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. Wszelkie prawa zastrzeżone.\n"
#: diff_ext.cpp:492
msgid "This software is distributable under the BSD license.\n"
msgstr "To oprogramowanie jest dystrybuowane na licencji BSD.\n"
#: diff_ext.cpp:493
msgid "Some extensions for KDiff3 by Joachim Eibl.\n"
msgstr "Autorem niektórych rozszerzeń do KDiff3 jest Joachim Eibl.\n"
#: diff_ext.cpp:494
msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"
msgstr "Strona domowa Diff-Ext: http://diff-ext.sourceforge.net\n"
#: diff_ext.cpp:495
msgid "Homepage for KDiff3: http://kdiff3.sourceforge.net"
msgstr "Strona domowa KDiff3: http://kdiff3.sourceforge.net"
#: diff_ext.cpp:496
msgid "About Diff-Ext for KDiff3"
msgstr "O rozszerzeniu Diff-Ext dla KDiff3"
#: diff_ext.cpp:521
msgid "Compare selected files"
msgstr "Porównaj wybrane pliki"
#: diff_ext.cpp:527 diff_ext.cpp:547
msgid "Compare '%1' with '%2'"
msgstr "Porównaj %1 z %2"
#: diff_ext.cpp:533
msgid "Save '%1' for later operation"
msgstr "Zapamiętaj '%1' do późniejszych działań"
#: diff_ext.cpp:585
msgid "Could not start KDiff3. Please rerun KDiff3 installation."
msgstr ""
"Nie można uruchomić KDiff3. Upewnij się, że program jest zainstalowany "
"poprawnie."
#: diff_ext.cpp:586
msgid "Command"
msgstr "Polecenie"
#: diff_ext.cpp:587
msgid "CommandLine"
msgstr "Linia poleceń"
#: diff_ext.cpp:588
msgid "Diff-Ext For KDiff3"
msgstr "Diff-Ext dla KDiff3"

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1403,7 +1403,7 @@ Please at least include KDE, the KDE package it is in, the name
></term
><listitem
><para
>Visse sprog skrives fra højre til venstre. Når dette er aktiveret, tegner &kdiff3; tekst fra højre til venstre i sammenligningsvinduerne og i sammenfletningsvinduet. Bemærk at hvis du starter &kdiff3; med kommandolinjeflaget "--reverse" så vises al layout også fra højre til venstre. (Dette er en funktion som &Qt; sørger for.) Denne dokumentation er skrevet under antagelse af at "Sprog som læses fra højre til venstre" eller omvendt layout ikke er aktiverede. Visse referencer til "venstre" eller "højre" skal erstattes af det modsatte hvis du bruger disse valgmuligheder. </para
>Visse sprog skrives fra højre til venstre. Når dette er aktiveret, tegner &kdiff3; tekst fra højre til venstre i sammenligningsvinduerne og i sammenfletningsvinduet. Bemærk at hvis du starter &kdiff3; med kommandolinjeflaget "--reverse" så vises al layout også fra højre til venstre. (Dette er en funktion som &TQt; sørger for.) Denne dokumentation er skrevet under antagelse af at "Sprog som læses fra højre til venstre" eller omvendt layout ikke er aktiverede. Visse referencer til "venstre" eller "højre" skal erstattes af det modsatte hvis du bruger disse valgmuligheder. </para
></listitem
></varlistentry>
@ -2890,7 +2890,7 @@ Please at least include KDE, the KDE package it is in, the name
<para
>Hvis du ikke bruger KDE, så brug ikke <command
>configure</command
> men følg instruktionerne for systemer som kun bruger Qt i filen README.</para>
> men følg instruktionerne for systemer som kun bruger TQt i filen README.</para>
<para
>Eftersom &kdiff3; bruger <command
>autoconf</command
@ -2904,15 +2904,3 @@ Please at least include KDE, the KDE package it is in, the name
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = de

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1038,7 +1038,7 @@ Options:
></term
><listitem
><para
>Einige Sprachen werden von Rechts nach Links geschrieben. Wenn diese Option aktiviert ist, zeigt &kdiff3; den Text in Vergleichs- und Zusammenführen-Fenstern von Rechts nach Links an. Wenn Sie &kdiff3; mit der Option "--reverse" starten, wird das gesamte Layout der Programmoberfläche von Rechts nach Links angezeigt. (Dies ist eine Funktion von Qt.) Diese Dokumentation wurde unter der Annahme geschrieben, dass "Rechts-nach-Links Sprache" und umgedrehtes Layout abgeschaltet sind. Wenn Sie diese Optionen verwenden, müssen Sie also Referenzen auf "Rechts" und "Links" entsprechend umkehren. </para
>Einige Sprachen werden von Rechts nach Links geschrieben. Wenn diese Option aktiviert ist, zeigt &kdiff3; den Text in Vergleichs- und Zusammenführen-Fenstern von Rechts nach Links an. Wenn Sie &kdiff3; mit der Option "--reverse" starten, wird das gesamte Layout der Programmoberfläche von Rechts nach Links angezeigt. (Dies ist eine Funktion von TQt.) Diese Dokumentation wurde unter der Annahme geschrieben, dass "Rechts-nach-Links Sprache" und umgedrehtes Layout abgeschaltet sind. Wenn Sie diese Optionen verwenden, müssen Sie also Referenzen auf "Rechts" und "Links" entsprechend umkehren. </para
></listitem
></varlistentry>
@ -2416,15 +2416,3 @@ Options:
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,2 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = en

@ -1,36 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<title>$title ($projectname)</title>
<link href="../../common/doxygen.css" rel="stylesheet" type="text/css">
</head>
<div class="header">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td rowspan="2" width="92">
<a href="../../index.html" title="The API documentation main page"><img src="../../common/docheadergears.png" style="border:0px;" alt=""></a>
</td>
<td width="95%">
<h1>$projectname API Documentation</h1>
</td>
</tr>
<tr>
<td valign="bottom">
<table class="links" border=0 cellspacing=0>
<tr>
<td><a href="index.html">Overview</a></td>
<td><a href="architecture.html" title="Software architecture and components">Architecture</a></td>
<td><a href="hierarchy.html" title="Inheritance list, sorted roughly alphabetically">Class&nbsp;Hierarchy</a></td>
<td><a href="classes.html" title="Alphabetical list of classes">Classes</a></td>
<td><a href="annotated.html" title="Classes, structs, unions and interfaces with brief descriptions">Classes&nbsp;(annotated)</a></td>
<td><a href="functions.html" title="Documented class members with links to the classes they belong to">Members</a></td>
<td><a href="namespaces.html" title="All documented namespaces with brief descriptions">Namespaces</a></td>
<td><a href="files.html" title="A list of all documented files with brief descriptions">Source&nbsp;Files</a></td>
<td><form action="search.php" method="get"><a title="Search for keywords in the entire documentation">Search&nbsp;for&nbsp;<input type="text" name="query" value="" size="20" accesskey="s"/></a></form></td>
</tr>
</table>
</td></tr></table>
</div>
<div id="hgrad"></div>
<div class="text">

@ -1,165 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html40/strict.dtd">
<HTML LANG="en-US">
<HEAD>
<TITLE>The "Artistic License"</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META HTTP-EQUIV="Content-Language" CONTENT="en-US">
<META NAME="description" CONTENT="Artistic License">
<META NAME="keywords" CONTENT="Artistic, artistic, Artistic License, Artistic license, Artisticlicense, artistic license, artisticlicense, Artistic Licence, Artistic licence, Artisticlicence, artistic licence, artisticlicence, license, licence, software, softwarelicense">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>The "Artistic License"</H1>
<H2>Preamble</H2>
<P>The intent of this document is to state the conditions under
which a Package may be copied, such that the Copyright Holder
maintains some semblance of artistic control over the
development of the package, while giving the users of the
package the right to use and distribute the Package in a
more-or-less customary fashion, plus the right to make
reasonable modifications.</P>
<H2>Definitions</H2>
<P>"Package" refers to the collection of files distributed by the
Copyright Holder, and derivatives of that collection of files
created through textual modification.</P>
<P>"Standard Version" refers to such a Package if it has not been
modified, or has been modified in accordance with the wishes of
the Copyright Holder as specified below.</P>
<P>"Copyright Holder" is whoever is named in the copyright or
copyrights for the package.</P>
<P>"You" is you, if you're thinking about copying or distributing
this Package.</P>
<P>"Reasonable copying fee" is whatever you can justify on the
basis of media cost, duplication charges, time of people
involved, and so on. (You will not be required to justify it to
the Copyright Holder, but only to the computing community at
large as a market that must bear the fee.)</P>
<P>"Freely Available" means that no fee is charged for the item
itself, though there may be fees involved in handling the
item. It also means that recipients of the item may redistribute
it under the same conditions they received it.</P>
<OL STYLE="list-style-type: decimal;">
<LI><DIV CLASS="li">You may make and give away verbatim copies of the source
form of the Standard Version of this Package without
restriction, provided that you duplicate all of the original
copyright notices and associated disclaimers.</DIV></LI>
<LI>You may apply bug fixes, portability fixes and other
modifications derived from the Public Domain or from the
Copyright Holder. A Package modified in such a way shall still
be considered the Standard Version.</LI>
<LI>You may otherwise modify your copy of this Package in any
way, provided that you insert a prominent notice in each
changed file stating how and when you changed that file, and
provided that you do at least ONE of the following:
<OL STYLE="list-style-type: lower-alpha;">
<LI>place your modifications in the Public Domain or
otherwise make them Freely Available, such as by posting
said modifications to Usenet or an equivalent medium, or
placing the modifications on a major archive site such as
uunet.uu.net, or by allowing the Copyright Holder to
include your modifications in the Standard Version of the
Package.</LI>
<LI>use the modified Package only within your corporation or
organization.</LI>
<LI>rename any non-standard executables so the names do not
conflict with standard executables, which must also be
provided, and provide a separate manual page for each
non-standard executable that clearly documents how it
differs from the Standard Version. d. make other
distribution arrangements with the Copyright Holder.</LI>
</OL>
</LI>
</OL>
<P>You may distribute the programs of this Package in object code
or executable form, provided that you do at least ONE of the
following:</P>
<OL STYLE="list-style-type: lower-alpha;">
<LI>distribute a Standard Version of the executables and library
files, together with instructions (in the manual page or
equivalent) on where to get the Standard Version.</LI>
<LI>accompany the distribution with the machine-readable source
of the Package with your modifications.</LI>
<LI>give non-standard executables non-standard names, and
clearly document the differences in manual pages (or
equivalent), together with instructions on where to get the
Standard Version.</LI>
<LI>make other distribution arrangements with the Copyright
Holder.</LI>
</OL>
<P>You may charge a reasonable copying fee for any distribution of
this Package. You may charge any fee you choose for support of
this Package. You may not charge a fee for this Package
itself. However, you may distribute this Package in aggregate
with other (possibly commercial) programs as part of a larger
(possibly commercial) software distribution provided that you do
not advertise this Package as a product of your own. You may
embed this Package's interpreter within an executable of yours
(by linking); this shall be construed as a mere form of
aggregation, provided that the complete Standard Version of the
interpreter is so embedded.</P>
<P>The scripts and library files supplied as input to or produced
as output from the programs of this Package do not automatically
fall under the copyright of this Package, but belong to whomever
generated them, and may be sold commercially, and may be
aggregated with this Package. If such scripts or library files
are aggregated with this Package via the so-called "undump" or
"unexec" methods of producing a binary executable image, then
distribution of such an image shall neither be construed as a
distribution of this Package nor shall it fall under the
restrictions of Paragraphs 3 and 4, provided that you do not
represent such an executable image as a Standard Version of this
Package.</P>
<P>C subroutines (or comparably compiled subroutines in other
languages) supplied by you and linked into this Package in order
to emulate subroutines and variables of the language defined by
this Package shall not be considered part of this Package, but
are the equivalent of input as in Paragraph 6, provided these
subroutines do not change the language in any way that would
cause it to fail the regression tests for the language.</P>
<P>Aggregation of this Package with a commercial distribution is
always permitted provided that the use of this Package is
embedded; that is, when no overt attempt is made to make this
Package's interfaces visible to the end user of the commercial
distribution. Such use shall not be construed as a distribution
of this Package.</P>
<P>The name of the Copyright Holder may not be used to endorse or
promote products derived from this software without specific
prior written permission.</P>
<P>THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
PURPOSE.</P>
<DIV STYLE="text-align: center;">The End</DIV>
</BODY>
</HTML>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

@ -1,353 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html40/strict.dtd">
<HTML LANG="en-US">
<HEAD>
<TITLE>GNU Free Documentation License - version 1.1</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META HTTP-EQUIV="Content-Language" CONTENT="en-US">
<META NAME="description" CONTENT="GNU free documentation license (for inclusion in documentation files)">
<META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License, documentation licence, documentation license, documentation, GNU free documentation license, GNU Free Documentation License">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>GNU Free Documentation License</H1>
Version 1.1, March 2000
<P>Copyright (C) 2000 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA<BR>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.</P>
<H2>0. Preamble</H2>
<P>The purpose of this License is to make a manual, textbook, or other
written document "free" in the sense of freedom: to assure everyone
the effective freedom to copy and redistribute it, with or without
modifying it, either commercially or noncommercially. Secondarily,
this License preserves for the author and publisher a way to get
credit for their work, while not being considered responsible for
modifications made by others.</P>
<P>This License is a kind of "copyleft", which means that derivative
works of the document must themselves be free in the same sense. It
complements the GNU General Public License, which is a copyleft
license designed for free software.</P>
<P>We have designed this License in order to use it for manuals for free
software, because free software needs free documentation: a free
program should come with manuals providing the same freedoms that the
software does. But this License is not limited to software manuals;
it can be used for any textual work, regardless of subject matter or
whether it is published as a printed book. We recommend this License
principally for works whose purpose is instruction or reference.</P>
<H2>1. Applicability And Definitions</H2>
<P>This License applies to any manual or other work that contains a
notice placed by the copyright holder saying it can be distributed
under the terms of this License. The "Document", below, refers to any
such manual or work. Any member of the public is a licensee, and is
addressed as "you".</P>
<P>A "Modified Version" of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
modifications and/or translated into another language.</P>
<P>A "Secondary Section" is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall subject
(or to related matters) and contains nothing that could fall directly
within that overall subject. (For example, if the Document is in part a
textbook of mathematics, a Secondary Section may not explain any
mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
commercial, philosophical, ethical or political position regarding
them.</P>
<P>The "Invariant Sections" are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
that says that the Document is released under this License.</P>
<P>The "Cover Texts" are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
the Document is released under this License.</P>
<P>A "Transparent" copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
general public, whose contents can be viewed and edited directly and
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
format whose markup has been designed to thwart or discourage
subsequent modification by readers is not Transparent. A copy that is
not "Transparent" is called "Opaque".</P>
<P>Examples of suitable formats for Transparent copies include plain
ASCII without markup, Texinfo input format, LaTeX input format, SGML
or XML using a publicly available DTD, and standard-conforming simple
HTML designed for human modification. Opaque formats include
PostScript, PDF, proprietary formats that can be read and edited only
by proprietary word processors, SGML or XML for which the DTD and/or
processing tools are not generally available, and the
machine-generated HTML produced by some word processors for output
purposes only.</P>
<P>The "Title Page" means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
this License requires to appear in the title page. For works in
formats which do not have any title page as such, "Title Page" means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.</P>
<H2>2. Verbatim Copying</H2>
<P>You may copy and distribute the Document in any medium, either
commercially or noncommercially, provided that this License, the
copyright notices, and the license notice saying this License applies
to the Document are reproduced in all copies, and that you add no other
conditions whatsoever to those of this License. You may not use
technical measures to obstruct or control the reading or further
copying of the copies you make or distribute. However, you may accept
compensation in exchange for copies. If you distribute a large enough
number of copies you must also follow the conditions in section 3.</P>
<P>You may also lend copies, under the same conditions stated above, and
you may publicly display copies.</P>
<H2>3. Copying In Quantity</H2>
<P>If you publish printed copies of the Document numbering more than 100,
and the Document's license notice requires Cover Texts, you must enclose
the copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
the full title with all words of the title equally prominent and
visible. You may add other material on the covers in addition.
Copying with changes limited to the covers, as long as they preserve
the title of the Document and satisfy these conditions, can be treated
as verbatim copying in other respects.</P>
<P>If the required texts for either cover are too voluminous to fit
legibly, you should put the first ones listed (as many as fit
reasonably) on the actual cover, and continue the rest onto adjacent
pages.</P>
<P>If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
a publicly-accessible computer-network location containing a complete
Transparent copy of the Document, free of added material, which the
general network-using public has access to download anonymously at no
charge using public-standard network protocols. If you use the latter
option, you must take reasonably prudent steps, when you begin
distribution of Opaque copies in quantity, to ensure that this
Transparent copy will remain thus accessible at the stated location
until at least one year after the last time you distribute an Opaque
copy (directly or through your agents or retailers) of that edition to
the public.</P>
<P>It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to give
them a chance to provide you with an updated version of the Document.</P>
<H2>4. Modifications</H2>
<P>You may copy and distribute a Modified Version of the Document under
the conditions of sections 2 and 3 above, provided that you release
the Modified Version under precisely this License, with the Modified
Version filling the role of the Document, thus licensing distribution
and modification of the Modified Version to whoever possesses a copy
of it. In addition, you must do these things in the Modified Version:</P>
<OL STYLE="list-style-type: upper-alpha;">
<LI>Use in the Title Page (and on the covers, if any) a title distinct
from that of the Document, and from those of previous versions
(which should, if there were any, be listed in the History section
of the Document). You may use the same title as a previous
version if the original publisher of that version gives
permission.</LI>
<LI>List on the Title Page, as authors, one or more persons or
entities responsible for authorship of the modifications in the
Modified Version, together with at least five of the principal
authors of the Document (all of its principal authors, if it has
less than five).</LI>
<LI>State on the Title page the name of the publisher of the Modified
Version, as the publisher.</LI>
<LI>Preserve all the copyright notices of the Document.</LI>
<LI>Add an appropriate copyright notice for your modifications
adjacent to the other copyright notices.</LI>
<LI>Include, immediately after the copyright notices, a license notice
giving the public permission to use the Modified Version under the
terms of this License, in the form shown in the Addendum
below.</LI>
<LI>Preserve in that license notice the full lists of Invariant
Sections and required Cover Texts given in the Document's license
notice.</LI>
<LI>Include an unaltered copy of this License.</LI>
<LI>Preserve the section entitled "History", and its title, and add to
it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section entitled "History" in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.</LI>
<LI>Preserve the network location, if any, given in the Document for
public access to a Transparent copy of the Document, and likewise
the network locations given in the Document for previous versions
it was based on. These may be placed in the "History" section.
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.</LI>
<LI>In any section entitled "Acknowledgements" or "Dedications",
preserve the section's title, and preserve in the section all the
substance and tone of each of the contributor acknowledgements
and/or dedications given therein.</LI>
<LI>Preserve all the Invariant Sections of the Document, unaltered in
their text and in their titles. Section numbers or the equivalent
are not considered part of the section titles.</LI>
<LI>Delete any section entitled "Endorsements". Such a section may
not be included in the Modified Version.</LI>
<LI>Do not retitle any existing section as "Endorsements" or to
conflict in title with any Invariant Section.</LI>
</OL>
<P>If the Modified Version includes new front-matter sections or
appendices that qualify as Secondary Sections and contain no material
copied from the Document, you may at your option designate some or all
of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.</P>
<P>You may add a section entitled "Endorsements", provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
standard.</P>
<P>You may add a passage of up to five words as a Front-Cover Text, and a
passage of up to 25 words as a Back-Cover Text, to the end of the list
of Cover Texts in the Modified Version. Only one passage of
Front-Cover Text and one of Back-Cover Text may be added by (or
through arrangements made by) any one entity. If the Document already
includes a cover text for the same cover, previously added by you or
by arrangement made by the same entity you are acting on behalf of,
you may not add another; but you may replace the old one, on explicit
permission from the previous publisher that added the old one.</P>
<P>The author(s) and publisher(s) of the Document do not by this License
give permission to use their names for publicity for or to assert or
imply endorsement of any Modified Version.</P>
<H2>5. Combining Documents</H2>
<P>You may combine the Document with other documents released under this
License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
license notice.</P>
<P>The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
copy. If there are multiple Invariant Sections with the same name but
different contents, make the title of each such section unique by
adding at the end of it, in parentheses, the name of the original
author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.</P>
<P>In the combination, you must combine any sections entitled "History"
in the various original documents, forming one section entitled
"History"; likewise combine any sections entitled "Acknowledgements",
and any sections entitled "Dedications". You must delete all sections
entitled "Endorsements."</P>
<H2>6. Collections Of Documents</H2>
<P>You may make a collection consisting of the Document and other documents
released under this License, and replace the individual copies of this
License in the various documents with a single copy that is included in
the collection, provided that you follow the rules of this License for
verbatim copying of each of the documents in all other respects.</P>
<P>You may extract a single document from such a collection, and distribute
it individually under this License, provided you insert a copy of this
License into the extracted document, and follow this License in all
other respects regarding verbatim copying of that document.</P>
<H2>7. Aggregation With Independent Works</H2>
<P>A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
distribution medium, does not as a whole count as a Modified Version
of the Document, provided no compilation copyright is claimed for the
compilation. Such a compilation is called an "aggregate", and this
License does not apply to the other self-contained works thus compiled
with the Document, on account of their being thus compiled, if they
are not themselves derivative works of the Document.</P>
<P>If the Cover Text requirement of section 3 is applicable to these
copies of the Document, then if the Document is less than one quarter
of the entire aggregate, the Document's Cover Texts may be placed on
covers that surround only the Document within the aggregate.
Otherwise they must appear on covers around the whole aggregate.</P>
<H2>8. Translation</H2>
<P>Translation is considered a kind of modification, so you may
distribute translations of the Document under the terms of section 4.
Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License provided that you also include the
original English version of this License. In case of a disagreement
between the translation and the original English version of this
License, the original English version will prevail.</P>
<H2>9. Termination</H2>
<P>You may not copy, modify, sublicense, or distribute the Document except
as expressly provided for under this License. Any other attempt to
copy, modify, sublicense or distribute the Document is void, and will
automatically terminate your rights under this License. However,
parties who have received copies, or rights, from you under this
License will not have their licenses terminated so long as such
parties remain in full compliance.</P>
<H2>10. Future Revisions Of This License</H2>
<P>The Free Software Foundation may publish new, revised versions
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
<A HREF="http:///www.gnu.org/copyleft/">http:///www.gnu.org/copyleft/</A>.</P>
<P>Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
License "or any later version" applies to it, you have the option of
following the terms and conditions either of that specified version or
of any later version that has been published (not as a draft) by the
Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation.</P>
</BODY>
</HTML>

@ -1,15 +0,0 @@
<html>
<head>
<title>FDL Notice</title>
</head>
<body>
<p>Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or any
later version published by the Free Software Foundation; with no Invariant
Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy
of the license is included <a href="fdl-license.html">here</a>.</p>
</body>
</html>

@ -1,65 +0,0 @@
</div></div>
</td>
</tr>
<tr>
<td valign="top" id="leftmenu" width="25%">
<a name="navigation"></a>
<div class="menu_box"><h2>$projectname</h2>
<div class="nav_list">
<!-- menu -->
<!-- cmenu.begin -->
<h2>Class Picker</h2>
<div style="text-align: center;">
<form name="guideform">
<select name="guidelinks" style="width:100%;" onChange="window.location=document.guideform.guidelinks.options[document.guideform.guidelinks.selectedIndex].value">
<option value="annotated.html">-- Choose --</option>
<!-- cmenu -->
</select>
</form>
</div>
<!-- cmenu.end -->
</div></div>
<div class="menu_box"><h2>API Dox</h2>
<div class="nav_list">
<ul>
<!-- gmenu -->
</ul></div></div>
</td>
</tr>
</table>
<span class="doNotDisplay">
<a href="http://www.kde.org/" accesskey="8">KDE Home</a> |
<a href="http://accessibility.kde.org/" accesskey="9">KDE Accessibility Home</a> |
<a href="http://www.kde.org/media/accesskeys.php" accesskey="0">Description of Access Keys</a>
</span>
<div style="height: 8px"></div>
<div id="footer">
<div id="footer_left">
Maintained by <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;groo&#116;&#64;kde&#46;or&#x67;">Adriaan de Groot</a>
and
<a href="&#109;a&#105;&#108;&#116;&#111;&#58;w&#105;nter&#116;&#64;kde&#46;or&#x67">Allen Winter</a>.
<br/>
KDE and K Desktop Environment are trademarks of <a href="http://www.kde.org/areas/kde-ev/" title="Homepage of the KDE non-profit Organization">KDE e.V.</a> |
<a href="http://www.kde.org/contact/impressum.php">Legal</a>
</div>
<div id="footer_right"><img src="/media/images/footer_right.png" style="margin: 0px" alt="" /></div>
</div>
<!--
WARNING: DO NOT SEND MAIL TO THE FOLLOWING EMAIL ADDRESS! YOU WILL
BE BLOCKED INSTANTLY AND PERMANENTLY!
<a href="mailto:aaaatrap-425acc3b5374943f@kde.org">Block me</a>
WARNING END
-->
</body>
</html>

@ -1,381 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html40/strict.dtd">
<HTML LANG="en-US">
<HEAD>
<TITLE>GNU General Public License</TITLE>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META HTTP-EQUIV="Content-Language" CONTENT="en-US">
<META NAME="description" CONTENT="GNU general public license (for inclusion in distributions)">
<META NAME="keywords" CONTENT="gnu, Gnu, GNU, license, licence, software, free software, software license, software licence, GNU general public license, GNU General Public License">
<META NAME="robots" CONTENT="none">
<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
<LINK REL="stylesheet" HREF="tde-default.css" TYPE="text/css">
</HEAD>
<BODY CLASS="license">
<H1>GNU General Public License</H1>
<P>Version 2, June 1991</P>
<P>Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA<BR>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.</P>
<H2>Preamble</H2>
<P>The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.</P>
<P>When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.</P>
<P>To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.</P>
<P>For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.</P>
<P>We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.</P>
<P>Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.</P>
<P>Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.</P>
<P>The precise terms and conditions for copying, distribution and
modification follow.</P>
<H2><A NAME="show-c">GNU General Public License<BR>
Terms And Conditions For Copying, Distribution And Modification</A></H2>
<P>0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".</P>
<P>Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.</P>
<P>1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.</P>
<P>You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.</P>
<P>2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:</P>
<OL STYLE="list-style-type: lower-alpha;">
<LI>
<P>You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.</P>
</LI>
<LI>
<P>You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.</P>
</LI>
<LI>
<P>If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)</P>
</LI>
</OL>
<P>These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.</P>
<P>Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.</P>
<P>In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.</P>
<P>3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:</P>
<OL STYLE="list-style-type: lower-alpha;">
<LI>
<P>Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,</P>
</LI>
<LI>
<P>Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,</P>
</LI>
<LI>
<P>Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)</P>
</LI>
</OL>
<P>The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.</P>
<P>If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.</P>
<P>4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.</P>
<P>5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.</P>
<P>6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.</P>
<P>7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.</P>
<P>If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.</P>
<P>It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.</P>
<P>This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.</P>
<P>8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.</P>
<P>9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.</P>
<P>Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.</P>
<P>10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.</P>
<H2><A NAME="show-w">No Warranty</A></H2>
<P>11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.</P>
<P>12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.</P>
<DIV STYLE="text-align: center;">END OF TERMS AND CONDITIONS</DIV>
<hr>
<h2>How to Apply These Terms to Your New Programs</h2>
<p>If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these
terms.</p>
<p>To do so, attach the following notices to the program. It is
safest to attach them to the start of each source file to most
effectively convey the exclusion of warranty; and each file should
have at least the "copyright" line and a pointer to where the full
notice is found.</p>
<pre> &lt;one line to give the program's name and a brief idea of what it does.&gt;
Copyright (C) 19yy &lt;name of author&gt;
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</pre>
<p>Also add information on how to contact you by electronic and paper
mail.</p>
<p>If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:</p>
<pre> Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.</pre>
<p>The hypothetical commands &quot;show w&quot; and &quot;show c&quot; should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than &quot;show w&quot; and &quot;show c&quot;; they could even be
mouse-clicks or menu items--whatever suits your program.</p>
<p>You should also get your employer (if you work as a programmer) or your
school, if any, to sign a &quot;copyright disclaimer&quot; for the program, if
necessary. Here is a sample; alter the names:</p>
<pre> Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
&lt;signature of Ty Coon&gt;, 1 April 1989
Ty Coon, President of Vice</pre>
<p>This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.</p>
</BODY>
</HTML>

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
<head>
<title>$title ($projectname)</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" comment "ICRAonline DE v2.0" l gen true for "http://www.kde.org" r (nz 1 vz 1 lz 1 oz 1 cb 1) "http://www.rsac.org/ratingsv01.html" l gen true for "http://www.kde.org" r (n 0 s 0 v 0 l 0))' />
<meta name="trademark" content="KDE e.V." />
<meta name="description" content="K Desktop Environment Homepage, KDE.org" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="robots" content="all" />
<link rel="shortcut icon" href="@topdir@/favicon.ico" />
<link rel="stylesheet" media="screen" type="text/css" title="APIDOX" href="doxygen.css" />
</head>
<body>
<div id="nav_header_top" align="right">
<a href="#content" class="doNotDisplay" accesskey="2">Skip to main content ::</a>
<a href="@topdir@"><img id="nav_header_logo" alt="Home" align="left" src="@topdir@/kde_gear_64.png" border="0" /></a>
<span class="doNotDisplay">::</span>
<div id="nav_header_title" align="left">KDE API Reference</div>
</div>
<div id="nav_header_bottom" align="right">
<span class="doNotDisplay">:: <a href="#navigation" accesskey="5">Skip to Link Menu</a><br/></span>
<div id="nav_header_bottom_right" style="text-align: left;">
/ <a href="@topdir@">API Reference</a>
<!-- pmenu $projectname -->
</div>
</div>
<table id="main" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td valign="top" class="menuheader" height="0"></td>
<td id="contentcolumn" valign="top" rowspan="2" >
<div id="content" style="padding-top: 0px;"><div style="width:100%; margin: 0px; padding: 0px;">
<a name="content"></a>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 493 B

@ -1,327 +0,0 @@
/*
KDE-wide default CSS for HTML documentation (all media types).
Copyright (C) 2000 Frederik Fouvry
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
Send comments, suggestions, etc. to Frederik Fouvry
<fouvry@sfs.nphil.uni-tuebingen.de>. */
/*
Important note: these setting may be overridden by localised CSS. Do not
add here any localization-sensitive style declarations.
Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/ */
/* Note: "should be inherit" means that in a proper browser inherit should work.
Somehow Netscape manages to interpret "inherit" as bright green.
Yuck. */
body {
background: white none;
color: black;
font-family: sans-serif;
padding: 0;
margin: 0;
}
.legalnotice, .copyright {
padding: 0;
margin: 0;
}
.abstract {
font-weight: bolder;
padding-right: 1em;
}
.toc, .list-of-tables {
padding-left: 1em;
}
.sect1, .chapter, .synopsis, .appendix, .preface, .article, .refsect1, .index, .glossary, .section {
padding: 1em;
}
.toc .chapter {
padding: 0em 0em 0em 1em;
}
.author {
color: rgb(82,80,82);
font-weight: bolder;
padding: 0;
margin: 0;
}
.othercredit {
line-height: 1em;
}
.chapter .sect1, .chapter .titlepage, .sect1 .titlepage, .article .titlepage {
padding: 0em;
}
.titlepage {
padding-left: 1em;
padding-right: 1em;
}
/* Links in Navigation */
.navLeft a:link, .navCenter a:link, .navRight a:link, .header a:link, .header a:visited, .bottom-nav a:link, .bottom-nav a:visited {
color: #41597A;
font-weight: bold;
}
/* Nice link colors for the main text */
:link {
color: #41597A;
}
:visited {
color: #597ba8;
}
.navLeft {
position: absolute;
left: 20px;
}
.navRight {
position: absolute;
right: 20px;
}
.navCenter {
text-align: center;
align: center;
}
.bannerBottomLeft {
position: absolute; left: 0px;
}
.bannerBottomRight {
position: absolute; right: 0px;
}
.header {
background: #3E91EB none;
border-bottom: 1px solid #206dcd;
border-top: 1px solid white;
color: white;
font-size: small;
height: 1.7em;
line-height: 1em;
margin: 0px;
padding-bottom: 0px;
padding-left: 1em;
padding-right: 0px;
padding-top: 0px;
vertical-align: middle;
}
.bottom-nav {
background-color: #3E91EB;
border-bottom: 1px solid #206dcd;
border-top: 1px solid white;
color: white;
font-size: small;
height: 1.7em;
line-height: 1em;
margin: 0px;
padding-bottom: 0px;
padding-left: 1em;
padding-right: 0px;
padding-top: 10px;
vertical-align: middle;
}
#logo {
background: url('kde_logo_bg.png') transparent repeat;
}
/* A little bit of padding makes the tables for keybindings etc much easier to read */
table {
padding: 5px;
}
dl {
margin-top: 0em;
margin-bottom: 0.5em;
}
dt {
margin-top: 1em;
}
div.toc dt {
margin-top: 0px;
}
div.screenshot {
margin-bottom: 1em;
margin-top: 1em;
}
div.informalexample {
border-style: dotted;
padding: 10px;
}
/* But no padding for navigation elements */
.toplogo, .navbackground {
padding: 0px;
}
table.programlisting
table.screen {
border-style: none;
background-color: rgb(224,224,224);
table-layout: auto; /* 100%? */
color: rgb(0,0,0); /* should be inherit */
}
/* Same as previous block, but more general (previous is HTML only)
Not all browsers understand this yet.
TABLE[class~=programlisting]
TABLE[class~=screen] { border-style: none;
background-color: rgb(224,224,224);
table-layout: auto;
color: inherit;
}
*/
p {
text-align: justify;
}
/* More specific settings */
/* Temporary patch: browsers break on bad HTML */
/* P, H1, H2, H3, H4, H5, TD, TH { font-family: Helvetica, Arial, sans-serif;
} */
p, h1, h2, h3, h4, h5, h6, td, th {
font-family: sans-serif;
}
/* Visual cues for GUI elements etc in the text */
.guimenu, .guimenuitem, .guisubmenu {
background-color: rgb(250,250,250);
color: rgb(0,0,0); /* should be inherit */
}
.guilabel, .interface, .guibutton {
background-color: rgb(250,250,250);
color: rgb(0,0,0); /* should be inherit */
}
.shortcut {
background-color: rgb(250,250,250);
color: rgb(0,0,0); /* should be inherit */
}
.shortcut .keycap {
background-color: rgb(250,250,250);
color: rgb(0,0,0); /* should be inherit */
}
.question {
font-weight: bolder;
}
.accel {
background-color: rgb(250,250,250);
color: rgb(0,0,0);
text-decoration: underline;
}
.option, .command {
background-color: rgb(255,255,255);
color: rgb(0,96,160);
font-weight: bold;
}
h1, h2, h3, h4, h5, h6 {
color: rgb(82,80,82);
background-color: transparent;
}
.arg, .parameter, .replaceable {
background-color: rgb(255,255,255);
color: rgb(0,128,64);
font-style: italic;
}
.screen, .programlisting {
background-color: rgb(250,250,250);
color: rgb(0,0,0); /* should be inherit */
border-style: dotted;
border-color: rgb(0,0,0);
border-width: thin;
padding: 5px;
}
/* This one is set in inches because the admonitions are set in inches
and they're more difficult to change. We can live with it in here,
for the meantime, it gives consistent margins */
.example {
margin-left: 0.5in;
margin-right: 0.5in;
}
div.mediaobject {
/* float: right; */
/* might make it much nicer. although someone has to
understand the rules ;-) You also don't want it to be
surrounded by text it doesn't refer to ... But that
may be among others a question of writing style. */
text-align: center; /* a bit of a hack: it should
position _images_ */
}
.caption {
margin: 0em 2em 3em 2em;
text-align: center;
}
.inlinemediaobject {
vertical-align: baseline;
padding-right: 1em;
padding-left: 1em;
}
/* An idea that could be nice: a search engine looking for specific
classes could display them in some conspicuous color. All that is
needed is an on the fly generated style element/style sheet. */
/* Only used in the hand-made HTML license texts */
body.license {
background-color: rgb(255,255,255);
text-align: justify;
color: rgb(0,0,0);
}
pre.license {
background-color: rgb(255,255,255);
font-family: monospace;
color: rgb(0,0,0);
}

@ -1,32 +0,0 @@
/*
KDE CSS for <**languagecountry**> HTML documentation (all media types).
Copyright (C) 2000 <**authorname**>
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
Send comments, suggestions, etc. to <**authorcontactdetails**>.
*/
/*
These settings will override tde-default.css.
Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/
Check out http://www.richinstyle.com/ where many of the declarations and
setup in the KDE CSS are obtained from. In fact, do not change anything
without checking so on those pages whether it is wise to do.
*/
:lg(**language**) { }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

@ -1,68 +0,0 @@
</div></div>
</td>
</tr>
<tr>
<td valign="top" id="leftmenu" width="25%">
<a name="navigation"></a>
<div class="menu_box"><h2>API Dox</h2>
<div class="nav_list">
<ul>
<!-- gmenu -->
</ul></div></div>
</td>
</tr>
</table>
<div class="copyrights">
This file is part of the documentation for $projectname $projectnumber.<br/>
Documentation copyright &copy; 1996-2005 the KDE developers.<br/>
Generated on $datetime by
<a href="http://www.doxygen.org/index.html">doxygen</a> $doxygenversion written
by <a href="mailto:dimitri@stack.nl">Dimitri van Heesch</a>, &copy;&nbsp;1997-2003
<p>
KDE's <a href="http://developer.kde.org/policies/documentationpolicy.html">Doxygen guidelines</a> are available online.
Questions about the reference manuals should be sent to
<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;groot&#64;kde&#46;or&#x67">Adriaan de Groot</a>
or
<a href="&#109;a&#105;&#108;&#116;&#111;&#58;w&#105;nter&#116;&#64;kde&#46;or&#x67">Allen Winter</a>.
</p>
</div>
<div style="clear:both; height: 1px;">&nbsp;</div>
<span class="doNotDisplay">
<a href="http://www.kde.org/" accesskey="8">KDE Home</a> |
<a href="http://accessibility.kde.org/" accesskey="9">KDE Accessibility Home</a> |
<a href="http://www.kde.org/media/accesskeys.php" accesskey="0">Description of Access Keys</a>
</span>
<div style="height: 8px"></div>
<div id="footer">
<div id="footer_left">
Maintained by <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;groot&#116;&#64;kde&#46;or&#x67>Adriaan de Groot</a>
and
<a href="&#109;a&#105;&#108;&#116;&#111;&#58;w&#105;nter&#116;&#64;kde&#46;or&#x67">Allen Winter</a>.
<br/>
KDE and K Desktop Environment are trademarks of <a href="http://www.kde.org/areas/kde-ev/" title="Homepage of the KDE non-profit Organization">KDE e.V.</a> |
<a href="http://www.kde.org/contact/impressum.php">Legal</a>
</div>
<div id="footer_right"><img src="/media/images/footer_right.png" style="margin: 0px" alt="" /></div>
</div>
<!--
WARNING: DO NOT SEND MAIL TO THE FOLLOWING EMAIL ADDRESS! YOU WILL
BE BLOCKED INSTANTLY AND PERMANENTLY!
<a href="mailto:aaaatrap-425acc3b5374943f@kde.org">Block me</a>
WARNING END
-->
</body>
</html>

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en_US" xml:lang="en_US">
<head>
<title>$projectname</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta http-equiv="pics-label" content='(pics-1.1 "http://www.icra.org/ratingsv02.html" comment "ICRAonline DE v2.0" l gen true for "http://www.kde.org" r (nz 1 vz 1 lz 1 oz 1 cb 1) "http://www.rsac.org/ratingsv01.html" l gen true for "http://www.kde.org" r (n 0 s 0 v 0 l 0))' />
<meta name="trademark" content="KDE e.V." />
<meta name="description" content="K Desktop Environment Homepage, KDE.org" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="robots" content="all" />
<link rel="shortcut icon" href="@topdir@/favicon.ico" />
<link rel="stylesheet" media="screen" type="text/css" title="APIDOX" href="doxygen.css" />
<style type="text/css">
<!--
hr { display: none; }
#content h2 { margin-left: 0px; }
table.mdTable { background-color: #f8f8f8; border: .2em solid #d7d7d7; }
td.mdRow { padding: 8px 20px; }
td.md { font-weight: bold; }
td.mdname1 { font-weight: bold; color: #602020; }
td.mdname { font-weight: bold; color: #602020; }
.copyrights { width: 80%; margin: 1ex 10%; color:#BCBCBC; }
.copyrights a { color: #9A9A9A; }
-->
</style>
</head>
<body>
<div id="nav_header_top" align="right">
<a href="#content" class="doNotDisplay" accesskey="2">Skip to main content ::</a>
<a href="@topdir@"><img id="nav_header_logo" alt="Home" align="left" src="@topdir@/kde_gear_64.png" border="0" /></a>
<span class="doNotDisplay">::</span>
<div id="nav_header_title" align="left">KDE API Reference</div>
</div>
<div id="nav_header_bottom" align="right">
<span class="doNotDisplay">:: <a href="#navigation" accesskey="5">Skip to Link Menu</a><br/></span>
<div id="nav_header_bottom_right" style="text-align: left;">
/ <a href="@topdir@">API Reference</a>
</div>
</div>
<table id="main" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td valign="top" class="menuheader" height="0"></td>
<td id="contentcolumn" valign="top" rowspan="2" >
<div id="content"><div style="width:100%;">
<a name="content"></a>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 233 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1000,7 +1000,7 @@ Yet there is one option here that is also relevant for saving single files:
</para></listitem></varlistentry>
<varlistentry><term><emphasis>File Encoding for Preprocessor Files:</emphasis></term><listitem><para>When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output.
</para></listitem></varlistentry>
<varlistentry><term><emphasis>Right To Left Language:</emphasis></term><listitem><para>Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options.
<varlistentry><term><emphasis>Right To Left Language:</emphasis></term><listitem><para>Some languages are written right to left. When this option is enabled, &kdiff3; draws the text from right to left in the diff input windows and in the merge output window. Note that if you start &kdiff3; with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by TQt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options.
</para></listitem></varlistentry>
</variablelist>
@ -2110,7 +2110,7 @@ following in the base directory of the &kdiff3; distribution:</para>
<replaceable>kde-dir</replaceable> specifies the directory
containing KDE on your system. If you are not sure, read the README-file for details.
</para>
<para>If you don't use KDE don't use <command>configure</command> but follow the instructions for Qt-only systems in the README file.</para>
<para>If you don't use KDE don't use <command>configure</command> but follow the instructions for TQt-only systems in the README file.</para>
<para>Since &kdiff3; uses <command>autoconf</command> and
<command>automake</command> you should have no trouble compiling it. Should you
run into problems please report them to the &kde; mailing lists.</para>
@ -2121,15 +2121,3 @@ run into problems please report them to the &kde; mailing lists.</para>
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = es

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1415,7 +1415,7 @@ Please at least include KDE, the KDE package it is in, the name
></term
><listitem
><para
>Algunos idiomas se escriben de derecha a izquierda. Cuando esta opción está activada, &kdiff3; dibuja el texto de derecha a izquierda en las ventanas de entrada de diff y en la ventana de la salida del fusionado. Tenga en cuenta que si inicia &kdiff3; con la opción de línea de órdenes «--reverse» toda la distribución se hará de derecha a izquierda también (ésta es una característica proporcionada por Qt). Este manual se escribió asumiendo que «Idioma de derecha a izquierda» o invertir distribución están desactivados. Por ello, algunas referencias a «izquierda» o «derecha» se reemplazarán por sus respectivas homólogas si utiliza estas opciones. </para
>Algunos idiomas se escriben de derecha a izquierda. Cuando esta opción está activada, &kdiff3; dibuja el texto de derecha a izquierda en las ventanas de entrada de diff y en la ventana de la salida del fusionado. Tenga en cuenta que si inicia &kdiff3; con la opción de línea de órdenes «--reverse» toda la distribución se hará de derecha a izquierda también (ésta es una característica proporcionada por TQt). Este manual se escribió asumiendo que «Idioma de derecha a izquierda» o invertir distribución están desactivados. Por ello, algunas referencias a «izquierda» o «derecha» se reemplazarán por sus respectivas homólogas si utiliza estas opciones. </para
></listitem
></varlistentry>
@ -2908,7 +2908,7 @@ Please at least include KDE, the KDE package it is in, the name
<para
>Sino utiliza KDE utilice <command
>configure</command
> pero siga las instrucciones para los sistemas que solo tienen Qt en el archivo README.</para>
> pero siga las instrucciones para los sistemas que solo tienen TQt en el archivo README.</para>
<para
>Puesto que &kdiff3; utiliza <command
>autoconf</command
@ -2922,15 +2922,3 @@ Please at least include KDE, the KDE package it is in, the name
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = et

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1038,7 +1038,7 @@ Võtmed:
></term
><listitem
><para
>Mõningaid keeli kirjutatakse paremalt vasakule. Selle valiku sisselülitamisel näitab KDiff3 võrdluse sisendakendes ja ühendamise väljundaknas teksti paremalt vasakule. Pane tähele, et kui käivitad KDiff3 käsurealt võtmega "--reverse", kasutab kogu rakendus paremalt vasakule paigutust (seda võimaldab Qt). Käesolev käsiraamat on kirjutatud eeldusel, et "Paremalt vasakule keeled" ega võti "reverse" ei ole kasutusel. Sestap tuleb nende kasutamisel mõningaid "vasakul" või "paremal" antud kirjeldusi lugeda lihtsalt selle teadmise valguses vastupidi. </para
>Mõningaid keeli kirjutatakse paremalt vasakule. Selle valiku sisselülitamisel näitab KDiff3 võrdluse sisendakendes ja ühendamise väljundaknas teksti paremalt vasakule. Pane tähele, et kui käivitad KDiff3 käsurealt võtmega "--reverse", kasutab kogu rakendus paremalt vasakule paigutust (seda võimaldab TQt). Käesolev käsiraamat on kirjutatud eeldusel, et "Paremalt vasakule keeled" ega võti "reverse" ei ole kasutusel. Sestap tuleb nende kasutamisel mõningaid "vasakul" või "paremal" antud kirjeldusi lugeda lihtsalt selle teadmise valguses vastupidi. </para
></listitem
></varlistentry>
@ -2411,15 +2411,3 @@ Võtmed:
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = fr

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -2306,15 +2306,3 @@ Options :
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

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
)

@ -5,7 +5,7 @@ following in the base directory of the <span class="application">KDiff3</span> d
</pre><p>
<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>kde-dir</code></em></span> specifies the directory
containing KDE on your system. If you are not sure, read the README-file for details.
</p><p>If you don't use KDE don't use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">configure</strong></span></span> but follow the instructions for Qt-only systems in the README file.</p><p>Since <span class="application">KDiff3</span> uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">autoconf</strong></span></span> and
</p><p>If you don't use KDE don't use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">configure</strong></span></span> but follow the instructions for TQt-only systems in the README file.</p><p>Since <span class="application">KDiff3</span> uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">autoconf</strong></span></span> and
<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">automake</strong></span></span> you should have no trouble compiling it. Should you
run into problems please report them to the <span class="acronym">KDE</span> mailing lists.</p></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="requirements.html">Prev</a></div><div style="position: absolute; right: 20px;"></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Requirements </div><div class="navRight"> </div><div class="navCenter"><a accesskey="u" href="installation.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br>
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>

@ -106,7 +106,7 @@ Yet there is one option here that is also relevant for saving single files:
</p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for A/B/C:</em></span></span></dt><dd><p> Adjust the file encoding for input files. This has an effect on how the special characters are interpreted. Since you can adjust each codec separately you can even compare and merge files that were saved using different codecs.
</p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for Merge Output and Saving:</em></span></span></dt><dd><p> When you have edited a file, then you can adjust which encoding will be used when saving to disk.
</p></dd><dt><span class="term"><span class="emphasis"><em>File Encoding for Preprocessor Files:</em></span></span></dt><dd><p>When you define preprocessors then they might not be able to operate on your codec. (e.g.: Your files are 16-bit-unicode and your preprocessor can only take 8-bit-ascii.) With this option you can define the encoding of preprocessor output.
</p></dd><dt><span class="term"><span class="emphasis"><em>Right To Left Language:</em></span></span></dt><dd><p>Some languages are written right to left. When this option is enabled, <span class="application">KDiff3</span> draws the text from right to left in the diff input windows and in the merge output window. Note that if you start <span class="application">KDiff3</span> with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by Qt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options.
</p></dd><dt><span class="term"><span class="emphasis"><em>Right To Left Language:</em></span></span></dt><dd><p>Some languages are written right to left. When this option is enabled, <span class="application">KDiff3</span> draws the text from right to left in the diff input windows and in the merge output window. Note that if you start <span class="application">KDiff3</span> with the command line option "--reverse" then all layouting will be done right to left too. (This is a feature provided by TQt.) This documentation was written assuming that "Right To Left Language" or reverse layout are disabled. So some references to "left" or "right" must be replaced by their respective counterpart if you use these options.
</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2567171"></a>Miscellaneous</h3></div></div></div><p>(These options and actions are available in menus or the buttonbar.)</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Show line numbers:</em></span></span></dt><dd><p> You can select if line numbers should be
shown for the input files.</p></dd><dt><span class="term"><span class="emphasis"><em>Show space and tabulator characters for differences:</em></span></span></dt><dd><p> Sometimes
the visible spaces and tabs are disturbing. You can turn this off.</p></dd><dt><span class="term"><span class="emphasis"><em>Show white space:</em></span></span></dt><dd><p> Turn this off to suppress
@ -135,4 +135,4 @@ Yet there is one option here that is also relevant for saving single files:
Currently only the KDE-version supports user-configurable keyboard-shortcuts.
(Menu Settings-&gt;Configure Shortcuts...)
</p></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="printing.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="preprocessors.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Printing </div><div class="navRight"> Preprocessor Commands</div><div class="navCenter"><a accesskey="u" href="documentation.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br>
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = it

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1052,7 +1052,7 @@ Opzioni:
></term
><listitem
><para
>Alcune lingue sono scritte sa destra a sinistra. Quando questa opzione è attivata KDiff3 scrive i testi da destra a sinistra nelle finestre per il confronto e per la fusione. Nota che se avvii KDiff3 da riga di comando con l'opzione "--reverse", anche tutta l'interfaccia grafica sarà scritta da destra a sinistra. Questa è una potenzialità fornita da Qt. Questa documentazione è stata scritta pensando che l'opzione "Lingue scritte da destra a sinistra" e l'aspetto grafico "reverse" non siano attivati. Altrimenti alcuni riferimenti a "destra" e "sinistra" dovranno essere scambiati per utilizzare correttamente queste opzioni. </para
>Alcune lingue sono scritte sa destra a sinistra. Quando questa opzione è attivata KDiff3 scrive i testi da destra a sinistra nelle finestre per il confronto e per la fusione. Nota che se avvii KDiff3 da riga di comando con l'opzione "--reverse", anche tutta l'interfaccia grafica sarà scritta da destra a sinistra. Questa è una potenzialità fornita da TQt. Questa documentazione è stata scritta pensando che l'opzione "Lingue scritte da destra a sinistra" e l'aspetto grafico "reverse" non siano attivati. Altrimenti alcuni riferimenti a "destra" e "sinistra" dovranno essere scambiati per utilizzare correttamente queste opzioni. </para
></listitem
></varlistentry>
@ -2428,15 +2428,3 @@ Opzioni:
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = nl

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1024,7 +1024,7 @@ Opties:
></term
><listitem
><para
>Sommige talen worden van rechts naar links geschreven. Als ieze optie is ingeschakeld, tekent KDiff3 de tekst van rechs naar links in de verschillenvensters en in het uitvoervenster. Merk op dat, aals u KDiff3 met de opdrachtregeloptie "--reverse" start, alle schermopmaak ook van rechts naar links gedaan wordt. (Dit is een optie die door Qt aangeboden wordt.) Deze documentatie is geschreven met de aanname dat "Rechts-naar-links-taal" of omgekeerde indeling uitgeschakeld zijn. Sommige verwijzingen naar "links" en "rechts" moeten dus omgedraaid worden als u die opties gebruikt. </para
>Sommige talen worden van rechts naar links geschreven. Als ieze optie is ingeschakeld, tekent KDiff3 de tekst van rechs naar links in de verschillenvensters en in het uitvoervenster. Merk op dat, aals u KDiff3 met de opdrachtregeloptie "--reverse" start, alle schermopmaak ook van rechts naar links gedaan wordt. (Dit is een optie die door TQt aangeboden wordt.) Deze documentatie is geschreven met de aanname dat "Rechts-naar-links-taal" of omgekeerde indeling uitgeschakeld zijn. Sommige verwijzingen naar "links" en "rechts" moeten dus omgedraaid worden als u die opties gebruikt. </para
></listitem
></varlistentry>
@ -2393,15 +2393,3 @@ Opties:
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = pt

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1428,7 +1428,7 @@ Opções:
></term
><listitem
><para
>Algumas línguas são escritas da direita para a esquerda. Quando esta opção está activa, o &kdiff3; desenha o texto da direita para a esquerda nas janelas de diferenças dos ficheiros de entrada e na janela do resultado da junção. Repare que, se iniciar o &kdiff3; com a opção da linha de comandos "--reverse", então toda a disposição será feita também da direita para a esquerda. (Esta é uma funcionalidade oferecida pelo Qt.) Esta documentação foi escrita a assumir que a "Língua da direita-para-a-esquerda" ou a disposição inversa estão desactivadas. Por isso, algumas das referências a "esquerda" ou "direita" deverão ser substituídas pela versão inversa, se usar estas opções. </para
>Algumas línguas são escritas da direita para a esquerda. Quando esta opção está activa, o &kdiff3; desenha o texto da direita para a esquerda nas janelas de diferenças dos ficheiros de entrada e na janela do resultado da junção. Repare que, se iniciar o &kdiff3; com a opção da linha de comandos "--reverse", então toda a disposição será feita também da direita para a esquerda. (Esta é uma funcionalidade oferecida pelo TQt.) Esta documentação foi escrita a assumir que a "Língua da direita-para-a-esquerda" ou a disposição inversa estão desactivadas. Por isso, algumas das referências a "esquerda" ou "direita" deverão ser substituídas pela versão inversa, se usar estas opções. </para
></listitem
></varlistentry>
@ -2947,7 +2947,7 @@ Opções:
<para
>Se não usar o KDE, não use o <command
>configure</command
>, mas siga sim as instruções dos sistemas apenas em Qt, no ficheiro README.</para>
>, mas siga sim as instruções dos sistemas apenas em TQt, no ficheiro README.</para>
<para
>Dado que o &kdiff3; usa o <command
>autoconf</command
@ -2961,15 +2961,3 @@ Opções:
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -1,4 +0,0 @@
KDE_DOCS = kdiff3
KDE_LANG = sv

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

@ -1415,7 +1415,7 @@ Please at least include KDE, the KDE package it is in, the name
></term
><listitem
><para
>Vissa språk skrivs från höger till vänster. När alternativet är aktiverat, ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i sammanfogningsfönstret. Observera att om du startar &kdiff3; med kommandoradsväljaren "--reverse" så visas all layout också från höger till vänster. (Det är en funktion som Qt tillhandahåller.) Denna dokumentation är skriven med antagandet att "Språk som läses från höger till vänster" eller omvänd layout inte är aktiverade. Vissa referenser till "vänster" eller "höger" måste ersättas av motsatsen om du använder alternativen. </para
>Vissa språk skrivs från höger till vänster. När alternativet är aktiverat, ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i sammanfogningsfönstret. Observera att om du startar &kdiff3; med kommandoradsväljaren "--reverse" så visas all layout också från höger till vänster. (Det är en funktion som TQt tillhandahåller.) Denna dokumentation är skriven med antagandet att "Språk som läses från höger till vänster" eller omvänd layout inte är aktiverade. Vissa referenser till "vänster" eller "höger" måste ersättas av motsatsen om du använder alternativen. </para
></listitem
></varlistentry>
@ -2910,7 +2910,7 @@ Please at least include KDE, the KDE package it is in, the name
<para
>Om du inte använder KDE, använd inte <command
>configure</command
> utan följ instruktionerna för system som bara använder Qt i filen README.</para>
> utan följ instruktionerna för system som bara använder TQt i filen README.</para>
<para
>Eftersom &kdiff3; använder <command
>autoconf</command
@ -2924,15 +2924,3 @@ Please at least include KDE, the KDE package it is in, the name
&documentation.index;
</book>
<!--
Local Variables:
mode: sgml
sgml-minimize-attributes:nil
sgml-general-insert-case:lower
sgml-indent-step:0
sgml-indent-data:nil
End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 164 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

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

@ -1,191 +0,0 @@
<?xml version = '1.0'?>
<tdevelop>
<general>
<author>Joachim Eibl</author>
<email>joachim dot eibl at gmx dot de</email>
<version>0.9.92</version>
<projectmanagement>KDevKDEAutoProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<keywords>
<keyword>C++</keyword>
<keyword>Code</keyword>
<keyword>Qt</keyword>
<keyword>KDE</keyword>
</keywords>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description/>
<ignoreparts/>
<secondaryLanguages/>
</general>
<kdevautoproject>
<general>
<activetarget>src/kdiff3</activetarget>
<useconfiguration>debug</useconfiguration>
</general>
<run>
<mainprogram>/daten/home/joachim/kdiff3-0.9.92a/debug/src/kdiff3</mainprogram>
<directoryradio>custom</directoryradio>
<customdirectory>/daten/home/joachim/kdiff3_testdir/</customdirectory>
<programargs/>
<terminal>true</terminal>
<autocompile>true</autocompile>
<envvars>
<envvar value="/home/joachim/kdiff3-0.9.92a/debug/src/.libs/libkdiff3part.so" name="LD_PRELOAD" />
</envvars>
</run>
<configurations>
<optimized>
<builddir>optimized</builddir>
<ccompiler>GccOptions</ccompiler>
<cxxcompiler>GppOptions</cxxcompiler>
<f77compiler>G77Options</f77compiler>
<cxxflags>-O2 -g0</cxxflags>
</optimized>
<debug>
<configargs>--enable-debug=full --prefix=/opt/trinity</configargs>
<builddir>debug</builddir>
<ccompiler>kdevgccoptions</ccompiler>
<cxxcompiler>kdevgppoptions</cxxcompiler>
<f77compiler>kdevpgf77options</f77compiler>
<cxxflags>-O0</cxxflags>
<topsourcedir/>
<cppflags/>
<ldflags/>
<ccompilerbinary/>
<cxxcompilerbinary/>
<f77compilerbinary/>
<cflags/>
<f77flags/>
<envvars/>
</debug>
</configurations>
<make>
<envvars>
<envvar value="1" name="WANT_AUTOCONF_2_5" />
<envvar value="1" name="WANT_AUTOMAKE_1_6" />
</envvars>
<abortonerror>true</abortonerror>
<numberofjobs>1</numberofjobs>
<dontact>false</dontact>
<makebin/>
<prio>0</prio>
<runmultiplejobs>false</runmultiplejobs>
</make>
</kdevautoproject>
<kdevfileview>
<groups>
<group pattern="*.cpp;*.cxx;*.h" name="Sources" />
<group pattern="*.ui" name="User Interface" />
<group pattern="*.png" name="Icons" />
<group pattern="*.po;*.ts" name="Translations" />
<group pattern="*" name="Others" />
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidenonlocation>false</hidenonlocation>
</groups>
<tree>
<hidepatterns></hidepatterns>
<hidenonprojectfiles>false</hidenonprojectfiles>
<showvcsfields>true</showvcsfields>
</tree>
</kdevfileview>
<kdevdoctreeview>
<ignoretocs>
<toc>gtk</toc>
<toc>gnustep</toc>
<toc>python</toc>
<toc>php</toc>
<toc>perl</toc>
</ignoretocs>
<projectdoc>
<userdocDir>doc/en/</userdocDir>
<apidocDir>debug/</apidocDir>
</projectdoc>
<ignoreqt_xml/>
<ignoredoxygen/>
<ignorekdocs/>
<ignoredevhelp/>
</kdevdoctreeview>
<kdevdebugger>
<general>
<dbgshell>libtool</dbgshell>
<programargs/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
</general>
<display>
<staticmembers>false</staticmembers>
<demanglenames>true</demanglenames>
<outputradix>10</outputradix>
</display>
</kdevdebugger>
<kdevfilecreate>
<filetypes/>
<useglobaltypes>
<type ext="ui" />
<type ext="cpp" />
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
<kdevcvs>
<cvsoptions>-f</cvsoptions>
<commitoptions/>
<addoptions/>
<logoptions/>
<updateoptions>-dP</updateoptions>
<removeoptions>-f</removeoptions>
<revertoptions>-C -d -P</revertoptions>
<diffoptions>-u3 -p</diffoptions>
<rshoptions/>
</kdevcvs>
<kdevcppsupport>
<codecompletion>
<includeGlobalFunctions>true</includeGlobalFunctions>
<includeTypes>true</includeTypes>
<includeEnums>true</includeEnums>
<includeTypedefs>false</includeTypedefs>
<automaticCodeCompletion>true</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<codeCompletionDelay>250</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<headerCompletionDelay>250</headerCompletionDelay>
</codecompletion>
<references/>
<creategettersetter>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
<inlineGet>true</inlineGet>
<inlineSet>true</inlineSet>
</creategettersetter>
<qt>
<used>true</used>
<version>3</version>
<root>/usr/lib/qt3</root>
</qt>
</kdevcppsupport>
<cppsupportpart>
<filetemplates>
<interfacesuffix>.h</interfacesuffix>
<implementationsuffix>.cpp</implementationsuffix>
</filetemplates>
</cppsupportpart>
<kdevdocumentation>
<projectdoc>
<docsystem/>
<docurl/>
<usermanualurl/>
</projectdoc>
</kdevdocumentation>
<ctagspart>
<customArguments/>
<customTagfilePath/>
</ctagspart>
</tdevelop>

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

@ -21,12 +21,12 @@
#include "kdiff3plugin.h"
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tdestandarddirs.h>
#include <tdeaction.h>
#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kurl.h>
#include <ksimpleconfig.h>
#include <tdesimpleconfig.h>
#include <tdemessagebox.h>
//#include <iostream>
@ -35,7 +35,7 @@ static TQStringList* s_pHistory=0;
class KDiff3PluginFactory : public KGenericFactory < KDiff3Plugin, KonqPopupMenu >
{
KSimpleConfig* m_pConfig;
TDESimpleConfig* m_pConfig;
public:
KDiff3PluginFactory( const char* instanceName = 0 )
: KGenericFactory< KDiff3Plugin, KonqPopupMenu >( instanceName )
@ -45,7 +45,7 @@ public:
{
//std::cout << "New History: " << instanceName << std::endl;
s_pHistory = new TQStringList;
m_pConfig = new KSimpleConfig( "kdiff3pluginrc", false );
m_pConfig = new TDESimpleConfig( "kdiff3pluginrc", false );
*s_pHistory = m_pConfig->readListEntry("HistoryStack");
}
}
@ -102,21 +102,21 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
{
int historyCount = s_pHistory ? s_pHistory->count() : 0;
s = i18n("Compare with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
pAction = new TDEAction ( s,0, this, TQT_SLOT(slotCompareWith()), actionCollection());
pAction = new TDEAction ( s,0, this, TQ_SLOT(slotCompareWith()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->insert (pAction);
s = i18n("Merge with %1").arg( historyCount>0 ? s_pHistory->front() : TQString() );
pAction = new TDEAction( s, 0, this, TQT_SLOT(slotMergeWith()), actionCollection());
pAction = new TDEAction( s, 0, this, TQ_SLOT(slotMergeWith()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>0 );
pActionMenu->insert (pAction);
s = i18n("Save '%1' for later").arg( ( m_list.front() ) );
pAction = new TDEAction ( s, 0, this, TQT_SLOT(slotSaveForLater()), actionCollection());
pAction = new TDEAction ( s, 0, this, TQ_SLOT(slotSaveForLater()), actionCollection());
pAction->setEnabled( m_list.count()>0 );
pActionMenu->insert(pAction);
pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQT_SLOT(slotMergeThreeWay()), actionCollection());
pAction = new TDEAction (i18n("3-way merge with base"), 0, this, TQ_SLOT(slotMergeThreeWay()), actionCollection());
pAction->setEnabled( m_list.count()>0 && historyCount>=2 );
pActionMenu->insert (pAction);
@ -127,26 +127,26 @@ KDiff3Plugin::KDiff3Plugin( KonqPopupMenu* pPopupmenu, const char *name, const T
pActionMenu->insert(pHistoryMenu);
for (TQStringList::iterator i = s_pHistory->begin(); i!=s_pHistory->end(); ++i)
{
pAction = new TDEAction( *i, "History", 0, this, TQT_SLOT(slotCompareWithHistoryItem()), actionCollection());
pAction = new TDEAction( *i, "History", 0, this, TQ_SLOT(slotCompareWithHistoryItem()), actionCollection());
pHistoryMenu->insert (pAction);
}
pAction = new TDEAction (i18n("Clear list"), 0, this, TQT_SLOT(slotClearList()), actionCollection());
pAction = new TDEAction (i18n("Clear list"), 0, this, TQ_SLOT(slotClearList()), actionCollection());
pActionMenu->insert (pAction);
pAction->setEnabled( historyCount>0 );
}
}
else if(m_list.count() == 2)
{
pAction = new TDEAction (i18n("Compare"), 0, this, TQT_SLOT(slotCompareTwoFiles()), actionCollection());
pAction = new TDEAction (i18n("Compare"), 0, this, TQ_SLOT(slotCompareTwoFiles()), actionCollection());
pActionMenu->insert (pAction);
}
else if ( m_list.count() == 3 )
{
pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQT_SLOT(slotCompareThreeFiles()), actionCollection());
pAction = new TDEAction (i18n("3 way comparison"), 0, this, TQ_SLOT(slotCompareThreeFiles()), actionCollection());
pActionMenu->insert (pAction);
}
pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQT_SLOT(slotAbout()), actionCollection());
pAction = new TDEAction (i18n("About KDiff3 menu plugin ..."), 0, this, TQ_SLOT(slotAbout()), actionCollection());
pActionMenu->insert (pAction);
addSeparator();
@ -165,7 +165,7 @@ void KDiff3Plugin::slotCompareWith()
TQStringList args;
args << s_pHistory->front();
args << m_list.front();
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}
@ -177,7 +177,7 @@ void KDiff3Plugin::slotCompareWithHistoryItem()
TQStringList args;
args << pAction->text();
args << m_list.front();
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}
@ -188,7 +188,7 @@ void KDiff3Plugin::slotCompareTwoFiles()
TQStringList args;
args << m_list.front();
args << m_list.back();
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}
@ -200,7 +200,7 @@ void KDiff3Plugin::slotCompareThreeFiles()
args << m_list[0];
args << m_list[1];
args << m_list[2];
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}
@ -212,7 +212,7 @@ void KDiff3Plugin::slotMergeWith()
args << s_pHistory->front();
args << m_list.front();
args << ( "-o" + m_list.front() );
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}
@ -225,7 +225,7 @@ void KDiff3Plugin::slotMergeThreeWay()
args << (*s_pHistory)[0];
args << m_list.front();
args << ("-o" + m_list.front());
kapp->tdeinitExec ("kdiff3", args);
tdeApp->tdeinitExec ("kdiff3", args);
}
}

@ -4,4 +4,4 @@ Type=Application
Name=Compare/Merge Files/Directories with KDiff3
Icon=kdiff3
X-TDE-ParentApp=konqueror
#DocPath=konq-plugins/kdiff3plugin/index.html
#X-DocPath=konq-plugins/kdiff3plugin/index.html

@ -27,7 +27,7 @@ class TQStringList;
class KDiff3Plugin : public KonqPopupMenuPlugin
{
Q_OBJECT
TQ_OBJECT
public:
KDiff3Plugin (KonqPopupMenu *, const char *name, const TQStringList & list);

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

2526
po/ka.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

2541
po/uk.po

File diff suppressed because it is too large Load Diff

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

@ -241,7 +241,8 @@ void SourceData::setData( const TQString& data )
}
FileAccess f( m_tempInputFileName );
bool bSuccess = f.writeFile( TQTextCodec::codecForName("UTF-8")->fromUnicode(data), data.length() );
TQCString cData = TQTextCodec::codecForName("UTF-8")->fromUnicode(data);
bool bSuccess = f.writeFile( cData, cData.length() );
if ( !bSuccess )
{
KMessageBox::error( m_pOptionDialog, i18n("Writing clipboard data to temp file failed.") );
@ -361,7 +362,6 @@ static bool convertFileEncoding( const TQString& fileNameIn, TQTextCodec* pCodec
return false;
TQTextStream inStream( &in );
inStream.setCodec( pCodecIn );
//inStream.setAutoDetectUnicode( false ); //not available in TQt3, will always detect UCS2
TQFile out( fileNameOut );
if ( ! out.open( IO_WriteOnly ) )
@ -379,7 +379,7 @@ static TQTextCodec* detectEncoding( const char* buf, long size, long& skipBytes
{
if (size>=2)
{
skipBytes = 0; // In TQt3 UTF-16LE can only be used if autodetected.
skipBytes = 0;
if (buf[0]=='\xFF' && buf[1]=='\xFE' )
return TQTextCodec::codecForName( "ISO-10646-UCS2" );// "UTF-16LE"

@ -118,7 +118,7 @@ struct Diff3Line
pFineAB=0; pFineBC=0; pFineCA=0;
}
bool operator==( const Diff3Line& d3l )
bool operator==( const Diff3Line& d3l ) const
{
return lineA == d3l.lineA && lineB == d3l.lineB && lineC == d3l.lineC
&& bAEqB == d3l.bAEqB && bAEqC == d3l.bAEqC && bBEqC == d3l.bBEqC;
@ -376,7 +376,7 @@ class MyPainter : public TQPainter
int m_fontWidth;
public:
MyPainter(const TQPaintDevice* pd, bool bRTL, int width, int fontWidth)
: TQPainter(const_cast<TQPaintDevice*>(TQT_TQPAINTDEVICE_CONST(pd)))
: TQPainter(pd)
{
if (bRTL)
{

@ -142,7 +142,7 @@ DiffTextWindow::DiffTextWindow(
{
d = new DiffTextWindowData(this);
d->m_pDiffTextWindowFrame = pParent;
setFocusPolicy( TQ_ClickFocus );
setFocusPolicy( TQWidget::ClickFocus );
setAcceptDrops( true );
d->m_pOptionDialog = pOptionDialog;
@ -398,7 +398,7 @@ void DiffTextWindow::focusInEvent(TQFocusEvent* e)
void DiffTextWindow::mousePressEvent ( TQMouseEvent* e )
{
if ( e->button() == Qt::LeftButton )
if ( e->button() == TQt::LeftButton )
{
int line;
int pos;
@ -458,7 +458,7 @@ void DiffTextWindow::mouseDoubleClickEvent( TQMouseEvent* e )
{
d->m_bSelectionInProgress = false;
d->m_lastKnownMousePos = e->pos();
if ( e->button() == Qt::LeftButton )
if ( e->button() == TQt::LeftButton )
{
int line;
int pos;
@ -847,8 +847,7 @@ void DiffTextWindowData::writeLine(
if ( m_pOptionDialog->m_bShowWhiteSpaceCharacters && m_pOptionDialog->m_bShowWhiteSpace)
{
p.fillRect( xOffset + fontWidth*outPos, yOffset+fontAscent,
fontWidth*spaces-1, fontDescent, c ); // QT3
//fontWidth*spaces-1, fontDescent, c ); // QT4
fontWidth*spaces-1, fontDescent, c );
}
}
else
@ -952,13 +951,13 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e )
int endLine = min2( d->m_firstLine + getNofVisibleLines()+2, getNofLines() );
//if ( invalidRect.size()==size() )
{ // double buffering, obsolete with TQt4
TQPainter painter(this); // Remove for TQt4
TQPixmap pixmap( invalidRect.size() );// Remove for TQt4
{
TQPainter painter(this);
TQPixmap pixmap( invalidRect.size() );
MyPainter p( TQT_TQPAINTDEVICE(&pixmap), d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') ); // For TQt4 change pixmap to this
MyPainter p( &pixmap, d->m_pOptionDialog->m_bRightToLeftLanguage, width(), fontMetrics().width('W') );
p.translate( -invalidRect.x(), -invalidRect.y() );// Remove for TQt4
p.translate( -invalidRect.x(), -invalidRect.y() );
p.setFont( font() );
p.TQPainter::fillRect( invalidRect, d->m_pOptionDialog->m_bgColor );
@ -967,7 +966,7 @@ void DiffTextWindow::paintEvent( TQPaintEvent* e )
// p.drawLine( m_invalidRect.x(), m_invalidRect.y(), m_invalidRect.right(), m_invalidRect.bottom() ); // For test only
p.end();
painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );// Remove for TQt4
painter.drawPixmap( invalidRect.x(), invalidRect.y(), pixmap );
}
// else
// { // no double buffering
@ -1578,8 +1577,8 @@ DiffTextWindowFrame::DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatu
d->m_pFileSelection = new TQLineEdit(d->m_pTopLineWidget);
d->m_pBrowseButton = new TQPushButton( "...",d->m_pTopLineWidget );
d->m_pBrowseButton->setFixedWidth( 30 );
connect(d->m_pBrowseButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked()));
connect(d->m_pFileSelection,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
connect(d->m_pBrowseButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked()));
connect(d->m_pFileSelection,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed()));
d->m_pLabel = new TQLabel("A:",d->m_pTopLineWidget);
d->m_pTopLine = new TQLabel(d->m_pTopLineWidget);
@ -1685,7 +1684,7 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
d->m_pLabel->setPalette( p );
d->m_pTopLine->setPalette( p );
}
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(d->m_pFileSelection) && e->type()==TQEvent::Drop)
if (o == d->m_pFileSelection && e->type()==TQEvent::Drop)
{
TQDropEvent* d = static_cast<TQDropEvent*>(e);
@ -1696,8 +1695,8 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
if ( lst.count() > 0 )
{
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus();
static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(o)->setFocus();
emit fileNameChanged( lst[0], pDTW->d->m_winIdx );
return true;
}
@ -1705,7 +1704,7 @@ bool DiffTextWindowFrame::eventFilter( TQObject* o, TQEvent* e )
/* The following lines work for TQt>4.1 but not for 4.0.x*/
/*if ( d->mimeData()->hasUrls() )
{
TQList<TQUrl> lst = d->mimeData()->urls();
TQPtrList<TQUrl> lst = d->mimeData()->urls();
if ( !lst.empty() )
{
static_cast<TQLineEdit*>(o)->setText( lst[0].toLocalFile() );

@ -29,7 +29,7 @@ class DiffTextWindowFrame;
class DiffTextWindow : public TQWidget
{
Q_OBJECT
TQ_OBJECT
public:
DiffTextWindow(
@ -113,7 +113,7 @@ class DiffTextWindowFrameData;
class DiffTextWindowFrame : public TQWidget
{
Q_OBJECT
TQ_OBJECT
public:
DiffTextWindowFrame( TQWidget* pParent, TQStatusBar* pStatusBar, OptionDialog* pOptionDialog, int winIdx );

@ -217,11 +217,7 @@ void DirectoryMergeWindow::fastFileComparison(
}
pp.setInformation( i18n("Comparing file..."), 0, false );
#ifdef USE_QT4
typedef qint64 t_FileSize;
#else // USE_QT4
typedef TQFile::Offset t_FileSize;
#endif // USE_QT4
t_FileSize fullSize = file1.size();
t_FileSize sizeLeft = fullSize;
@ -271,13 +267,13 @@ static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files)
DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader )
: TQListView( pParent )
{
connect( TQT_TQOBJECT(this), TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onDoubleClick(TQListViewItem*)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)),
TQT_TQOBJECT(this), TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) );
connect( TQT_TQOBJECT(this), TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)),
TQT_TQOBJECT(this), TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int)));
connect( TQT_TQOBJECT(this), TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(onSelectionChanged(TQListViewItem*)));
connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*)));
connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*)));
connect( this, TQ_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)),
this, TQ_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) );
connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)),
this, TQ_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int)));
connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(onSelectionChanged(TQListViewItem*)));
m_pOptions = pOptions;
m_pIconLoader = pIconLoader;
m_pDirectoryMergeInfo = 0;
@ -1584,7 +1580,7 @@ void DirectoryMergeWindow::onClick( int button, TQListViewItem* lvi, const TQPoi
if (!itemPath.isEmpty())
{
selectItemAndColumn( pDMI, c, button==Qt::RightButton );
selectItemAndColumn( pDMI, c, button==TQt::RightButton );
}
}
}
@ -2688,7 +2684,7 @@ DirectoryMergeInfo::DirectoryMergeInfo( TQWidget* pParent )
bool DirectoryMergeInfo::eventFilter(TQObject*o, TQEvent* e)
{
if ( e->type()==TQEvent::FocusIn && TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(m_pInfoList) )
if ( e->type()==TQEvent::FocusIn && o==m_pInfoList )
emit gotFocus();
return false;
}
@ -2921,51 +2917,51 @@ void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, TDEA
#include "xpm/showfilesonlyinc.xpm"
DirectoryMergeWindow* p = this;
m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, TQT_TQOBJECT(p), TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, TQT_TQOBJECT(p), TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current");
m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, TQT_TQOBJECT(pKDiff3App), TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current");
m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, TQT_TQOBJECT(p), TQT_SLOT(reload()), ac, "dir_rescan");
m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, TQT_TQOBJECT(p), TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files");
m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files");
m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a");
m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b");
m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c");
m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQ_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation");
m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQ_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item");
m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQ_SLOT(compareCurrentFile()), ac, "dir_compare_current");
m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQ_SLOT(slotMergeCurrentFile()), ac, "merge_current");
m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQ_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all");
m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQ_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all");
m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQ_SLOT(reload()), ac, "dir_rescan");
m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQ_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state");
m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQ_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state");
m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQ_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere");
m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQ_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere");
m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQ_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere");
m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQ_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere");
m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQ_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere");
// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQ_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories");
// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQ_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files");
m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQ_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files");
m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQ_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files");
m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQ_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a");
m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQ_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b");
m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQ_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c");
m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles );
m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge");
m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete");
m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, TQT_TQOBJECT(p), TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQ_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files");
m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQ_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files");
m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing");
m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQ_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a");
m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQ_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b");
m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQ_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c");
m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQ_SLOT(slotCurrentMerge()), ac, "dir_current_merge");
m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQ_SLOT(slotCurrentDelete()), ac, "dir_current_delete");
m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing");
m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQ_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" );
m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQ_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" );
m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQ_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a");
m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQ_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b");
m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQ_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b");
m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQ_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a");
m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQ_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b");
m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQ_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b");
}

@ -116,7 +116,7 @@ public:
class DirectoryMergeWindow : public TQListView
{
Q_OBJECT
TQ_OBJECT
public:
DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader );
@ -332,7 +332,7 @@ protected slots:
class DirectoryMergeInfo : public TQFrame
{
Q_OBJECT
TQ_OBJECT
public:
DirectoryMergeInfo( TQWidget* pParent );

@ -46,7 +46,14 @@
ProgressDialog* g_pProgressDialog=0;
FileAccess::FileAccess( const TQString& name, bool bWantToWrite )
FileAccess::FileAccess( const TQString& name, bool bWantToWrite ) :
m_workingDir(TQString::null)
{
setFile( name, bWantToWrite );
}
FileAccess::FileAccess( const TQString& workingDir, const TQString& name, bool bWantToWrite ) :
m_workingDir(workingDir)
{
setFile( name, bWantToWrite );
}
@ -111,7 +118,15 @@ void FileAccess::setFile( const TQString& name, bool bWantToWrite )
// 1. When the local file exists and the remote location is wanted nevertheless. (unlikely)
// 2. When the local file doesn't exist and should be written to.
bool bExistsLocal = TQDir().exists(name);
bool bExistsLocal = false;
if (!m_workingDir.isEmpty())
{
bExistsLocal = TQDir(m_workingDir).exists(name);
}
else
{
bExistsLocal = TQDir().exists(name);
}
if ( m_url.isLocalFile() || !m_url.isValid() || bExistsLocal ) // assuming that invalid means relative
{
TQString localName = name;
@ -119,7 +134,15 @@ void FileAccess::setFile( const TQString& name, bool bWantToWrite )
{
localName = m_url.path(); // I want the path without preceding "file:"
}
TQFileInfo fi( localName );
TQFileInfo fi;
if (!m_workingDir.isEmpty())
{
fi = TQFileInfo( m_workingDir, localName );
}
else
{
fi = TQFileInfo( localName );
}
#if defined(TQ_WS_WIN)
// On some windows machines in a network this takes very long.
// and it's not so important anyway.
@ -158,7 +181,15 @@ void FileAccess::setFile( const TQString& name, bool bWantToWrite )
TQString cmd = "cleartool get -to \"" + m_localCopy + "\" \"" + m_absFilePath + "\"";
::system( cmd.local8Bit() );
TQFileInfo fi( m_localCopy );
TQFileInfo fi;
if (!m_workingDir.isEmpty())
{
fi = TQFileInfo( m_workingDir, m_localCopy );
}
else
{
fi = TQFileInfo( m_localCopy );
}
#if defined(TQ_WS_WIN)
m_bReadable = true;//fi.isReadable();
m_bWritable = true;//fi.isWritable();
@ -623,7 +654,7 @@ bool FileAccessJobHandler::stat( int detail, bool bWantToWrite )
m_pFileAccess->m_statusText = TQString();
TDEIO::StatJob* pStatJob = TDEIO::stat( m_pFileAccess->m_url, ! bWantToWrite, detail, false );
connect( pStatJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotStatResult(TDEIO::Job*)));
connect( pStatJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotStatResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pStatJob, i18n("Getting file status: %1").arg(m_pFileAccess->prettyAbsPath()) );
@ -664,9 +695,9 @@ bool FileAccessJobHandler::get(void* pDestBuffer, long maxLength )
m_bSuccess = false;
m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQT_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), this, TQ_SLOT(slotGetData(TDEIO::Job*, const TQByteArray&)));
connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Reading file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess;
@ -700,9 +731,9 @@ bool FileAccessJobHandler::put(const void* pSrcBuffer, long maxLength, bool bOve
m_bSuccess = false;
m_pFileAccess->m_statusText = TQString();
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotPutJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQT_SLOT(slotPutData(TDEIO::Job*, TQByteArray&)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotPutJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), this, TQ_SLOT(slotPutData(TDEIO::Job*, TQByteArray&)));
connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Writing file: %1").arg(m_pFileAccess->prettyAbsPath()) );
return m_bSuccess;
@ -765,7 +796,7 @@ bool FileAccessJobHandler::mkDir( const TQString& dirName )
{
m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::mkdir( dirURL );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Making directory: %1").arg(dirName) );
return m_bSuccess;
@ -785,7 +816,7 @@ bool FileAccessJobHandler::rmDir( const TQString& dirName )
{
m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::rmdir( dirURL );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop(pJob, i18n("Removing directory: %1").arg(dirName));
return m_bSuccess;
@ -800,7 +831,7 @@ bool FileAccessJobHandler::removeFile( const TQString& fileName )
{
m_bSuccess = false;
TDEIO::SimpleJob* pJob = TDEIO::file_delete( KURL::fromPathOrURL(fileName), false );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob, i18n("Removing file: %1").arg(fileName) );
return m_bSuccess;
@ -815,7 +846,7 @@ bool FileAccessJobHandler::symLink( const TQString& linkTarget, const TQString&
{
m_bSuccess = false;
TDEIO::CopyJob* pJob = TDEIO::link( KURL::fromPathOrURL(linkTarget), KURL::fromPathOrURL(linkLocation), false );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
g_pProgressDialog->enterEventLoop( pJob,
i18n("Creating symbolic link: %1 -> %2").arg(linkLocation).arg(linkTarget) );
@ -844,8 +875,8 @@ bool FileAccessJobHandler::rename( const TQString& dest )
int permissions=-1;
m_bSuccess = false;
TDEIO::FileCopyJob* pJob = TDEIO::file_move( m_pFileAccess->m_url, kurl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob,
i18n("Renaming file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -881,8 +912,8 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
int permissions = (m_pFileAccess->isExecutable()?0111:0)+(m_pFileAccess->isWritable()?0222:0)+(m_pFileAccess->isReadable()?0444:0);
m_bSuccess = false;
TDEIO::FileCopyJob* pJob = TDEIO::file_copy ( m_pFileAccess->m_url, destUrl, permissions, bOverwrite, bResume, bShowProgress );
connect( pJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
connect( pJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(slotSimpleJobResult(TDEIO::Job*)));
connect( pJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pJob,
i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
@ -1332,16 +1363,16 @@ bool FileAccessJobHandler::listDir( t_DirectoryList* pDirList, bool bRecursive,
m_bSuccess = false;
if ( pListJob!=0 )
{
connect( pListJob, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
this, TQT_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) );
connect( pListJob, TQT_SIGNAL( result( TDEIO::Job* )),
this, TQT_SLOT( slotSimpleJobResult(TDEIO::Job*) ) );
connect( pListJob, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
this, TQ_SLOT( slotListDirProcessNewEntries( TDEIO::Job *, const TDEIO::UDSEntryList& )) );
connect( pListJob, TQ_SIGNAL( result( TDEIO::Job* )),
this, TQ_SLOT( slotSimpleJobResult(TDEIO::Job*) ) );
connect( pListJob, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)),
this, TQT_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) ));
connect( pListJob, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&)),
this, TQ_SLOT( slotListDirInfoMessage(TDEIO::Job*, const TQString&) ));
// This line makes the transfer via fish unreliable.:-(
//connect( pListJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
//connect( pListJob, TQ_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQ_SLOT(slotPercent(TDEIO::Job*, unsigned long)));
g_pProgressDialog->enterEventLoop( pListJob,
i18n("Listing directory: %1").arg(m_pFileAccess->prettyAbsPath()) );
@ -1475,7 +1506,7 @@ ProgressDialog::ProgressDialog( TQWidget* pParent )
hlayout->addStretch(1);
m_pAbortButton = new TQPushButton( i18n("&Cancel"), this);
hlayout->addWidget( m_pAbortButton );
connect( m_pAbortButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAbort()) );
connect( m_pAbortButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAbort()) );
m_progressDelayTimer = 0;
resize( 400, 100 );
@ -1682,7 +1713,7 @@ void ProgressDialog::hide()
killTimer( m_progressDelayTimer );
m_progressDelayTimer = 0;
// Calling TQDialog::hide() directly doesn't always work. (?)
TQTimer::singleShot( 100, this, TQT_SLOT(delayedHide()) );
TQTimer::singleShot( 100, this, TQ_SLOT(delayedHide()) );
}
void ProgressDialog::delayedHide()

@ -31,6 +31,7 @@ public:
FileAccess();
~FileAccess();
FileAccess( const TQString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported)
FileAccess( const TQString& workingDir, const TQString& name, bool bWantToWrite=false ); // name: local file or dirname or url (when supported)
void setFile( const TQString& name, bool bWantToWrite=false );
bool isValid() const;
@ -101,6 +102,7 @@ private:
bool m_bHidden;
long m_fileType; // for testing only
TQString m_workingDir;
TQString m_linkTarget;
TQString m_user;
TQString m_group;
@ -119,7 +121,7 @@ class t_DirectoryList : public std::list<FileAccess>
class FileAccessJobHandler : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
FileAccessJobHandler( FileAccess* pFileAccess );
@ -172,7 +174,7 @@ private slots:
class ProgressDialog : public TQDialog
{
Q_OBJECT
TQ_OBJECT
public:
ProgressDialog( TQWidget* pParent );

@ -469,7 +469,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
for (f = 0; f < 2; f++)
{
lin end = filevec[f].buffered_lines;
register char *discards = discarded[f];
char *discards = discarded[f];
for (i = 0; i < end; i++)
{
@ -479,7 +479,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
else if (discards[i] != 0)
{
/* We have found a nonprovisional discard. */
register lin j;
lin j;
lin length;
lin provisional = 0;
@ -511,7 +511,7 @@ void GnuDiff::discard_confusing_lines (struct file_data filevec[])
}
else
{
register lin consec;
lin consec;
lin minimum = 1;
lin tem = length >> 2;

@ -20,7 +20,7 @@
Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA. */
#if HAVE_CONFIG_H
# include <config.h>
#include "config.h"
#endif
#include <sys/types.h>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 234 B

@ -128,9 +128,9 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
// All default values must be set before calling readOptions().
m_pOptionDialog = new OptionDialog( m_pKDiff3Shell!=0, this );
connect( m_pOptionDialog, TQT_SIGNAL(applyClicked()), TQT_TQOBJECT(this), TQT_SLOT(slotRefresh()) );
connect( m_pOptionDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotRefresh()) );
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : tdeApp->config() );
// Option handling: Only when pParent==0 (no parent)
TDECmdLineArgs *args = isPart() ? 0 : TDECmdLineArgs::parsedArgs();
@ -243,7 +243,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
initStatusBar();
m_pFindDialog = new FindDialog( this );
connect( m_pFindDialog, TQT_SIGNAL(findNext()), TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()));
connect( m_pFindDialog, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotEditFindNext()));
autoAdvance->setChecked( m_pOptionDialog->m_bAutoAdvance );
showWhiteSpaceCharacters->setChecked( m_pOptionDialog->m_bShowWhiteSpaceCharacters );
@ -272,23 +272,23 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
slotRefresh();
m_pMainSplitter = this; //new TQSplitter(this);
m_pMainSplitter->setOrientation(Qt::Vertical );
m_pMainSplitter->setOrientation(TQt::Vertical );
// setCentralWidget( m_pMainSplitter );
m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter );
m_pDirectoryMergeSplitter->setOrientation(Qt::Horizontal );
m_pDirectoryMergeSplitter->setOrientation(TQt::Horizontal );
m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog,
TDEApplication::kApplication()->iconLoader() );
tdeApp->iconLoader() );
m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );
m_pDirectoryMergeWindow->setDirectoryMergeInfo( m_pDirectoryMergeInfo );
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(checkIfCanContinue(bool*)), TQT_TQOBJECT(this), TQT_SLOT(slotCheckIfCanContinue(bool*)));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(updateAvailabilities()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQT_SIGNAL(statusBarMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString&)));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(startDiffMerge(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)),
this, TQ_SLOT( slotFileOpen2(TQString,TQString,TQString,TQString,TQString,TQString,TQString,TotalDiffStatus*)));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(currentChanged(TQListViewItem*)), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(checkIfCanContinue(bool*)), this, TQ_SLOT(slotCheckIfCanContinue(bool*)));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(updateAvailabilities()), this, TQ_SLOT(slotUpdateAvailabilities()));
connect( m_pDirectoryMergeWindow, TQ_SIGNAL(statusBarMessage(const TQString&)), this, TQ_SLOT(slotStatusMsg(const TQString&)));
m_pDirectoryMergeWindow->initDirectoryMergeActions( TQT_TQOBJECT(this), actionCollection() );
m_pDirectoryMergeWindow->initDirectoryMergeActions( this, actionCollection() );
if ( args!=0 ) args->clear(); // Free up some memory.
@ -430,37 +430,37 @@ void KDiff3App::initActions( TDEActionCollection* ac )
{
if (ac==0) KMessageBox::error(0, "actionCollection==0");
fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), ac);
fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), ac);
fileOpen->setStatusText(i18n("Opens documents for comparison..."));
fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, TQT_TQOBJECT(this), TQT_SLOT(slotReload()), ac, "file_reload");
fileReload = new TDEAction(i18n("Reload"), /*TQIconSet(TQPixmap(reloadIcon)),*/ Key_F5, this, TQ_SLOT(slotReload()), ac, "file_reload");
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), ac);
fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), ac);
fileSave->setStatusText(i18n("Saves the merge result. All conflicts must be solved!"));
fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), ac);
fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), ac);
fileSaveAs->setStatusText(i18n("Saves the current document as..."));
filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), ac);
filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), ac);
filePrint->setStatusText(i18n("Print the differences"));
fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), ac);
fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), ac);
fileQuit->setStatusText(i18n("Quits the application"));
editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), ac);
editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), ac);
editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard"));
editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), ac);
editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), ac);
editCopy->setStatusText(i18n("Copies the selected section to the clipboard"));
editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), ac);
editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), ac);
editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position"));
editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotEditSelectAll()), ac);
editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotEditSelectAll()), ac);
editSelectAll->setStatusText(i18n("Select everything in current window"));
editFind = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), ac);
editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), ac);
editFind->setStatusText(i18n("Search for a string"));
editFindNext = KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), ac);
editFindNext = KStdAction::findNext(this, TQ_SLOT(slotEditFindNext()), ac);
editFindNext->setStatusText(i18n("Search again for the string"));
viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), ac);
viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), ac);
viewToolBar->setStatusText(i18n("Enables/disables the toolbar"));
viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), ac);
viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), ac);
viewStatusBar->setStatusText(i18n("Enables/disables the statusbar"));
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), ac);
TDEAction* pAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), ac );
KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), ac);
TDEAction* pAction = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), ac );
if ( isPart() )
pAction->setText(i18n("Configure KDiff3..."));
@ -483,70 +483,70 @@ void KDiff3App::initActions( TDEActionCollection* ac )
#include "xpm/showlinenumbers.xpm"
//#include "reload.xpm"
goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(slotGoCurrent()), ac, "go_current");
goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoTop()), ac, "go_top");
goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoBottom()), ac, "go_bottom");
goCurrent = new TDEAction(i18n("Go to Current Delta"), TQIconSet(TQPixmap(currentpos)), CTRL+Key_Space, this, TQ_SLOT(slotGoCurrent()), ac, "go_current");
goTop = new TDEAction(i18n("Go to First Delta"), TQIconSet(TQPixmap(upend)), 0, this, TQ_SLOT(slotGoTop()), ac, "go_top");
goBottom = new TDEAction(i18n("Go to Last Delta"), TQIconSet(TQPixmap(downend)), 0, this, TQ_SLOT(slotGoBottom()), ac, "go_bottom");
TQString omitsWhitespace = ".\n" + i18n("(Skips white space differences when \"Show White Space\" is disabled.)");
TQString includeWhitespace = ".\n" + i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)");
goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevDelta()), ac, "go_prev_delta");
goPrevDelta = new TDEAction(i18n("Go to Previous Delta"), TQIconSet(TQPixmap(up1arrow)), CTRL+Key_Up, this, TQ_SLOT(slotGoPrevDelta()), ac, "go_prev_delta");
goPrevDelta->setToolTip( goPrevDelta->text() + omitsWhitespace );
goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextDelta()), ac, "go_next_delta");
goNextDelta = new TDEAction(i18n("Go to Next Delta"), TQIconSet(TQPixmap(down1arrow)), CTRL+Key_Down, this, TQ_SLOT(slotGoNextDelta()), ac, "go_next_delta");
goNextDelta->setToolTip( goNextDelta->text() + omitsWhitespace );
goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict");
goPrevConflict = new TDEAction(i18n("Go to Previous Conflict"), TQIconSet(TQPixmap(up2arrow)), CTRL+Key_PageUp, this, TQ_SLOT(slotGoPrevConflict()), ac, "go_prev_conflict");
goPrevConflict->setToolTip( goPrevConflict->text() + omitsWhitespace );
goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextConflict()), ac, "go_next_conflict");
goNextConflict = new TDEAction(i18n("Go to Next Conflict"), TQIconSet(TQPixmap(down2arrow)), CTRL+Key_PageDown, this, TQ_SLOT(slotGoNextConflict()), ac, "go_next_conflict");
goNextConflict->setToolTip( goNextConflict->text() + omitsWhitespace );
goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict");
goPrevUnsolvedConflict = new TDEAction(i18n("Go to Previous Unsolved Conflict"), TQIconSet(TQPixmap(prevunsolved)), 0, this, TQ_SLOT(slotGoPrevUnsolvedConflict()), ac, "go_prev_unsolved_conflict");
goPrevUnsolvedConflict->setToolTip( goPrevUnsolvedConflict->text() + includeWhitespace );
goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict");
goNextUnsolvedConflict = new TDEAction(i18n("Go to Next Unsolved Conflict"), TQIconSet(TQPixmap(nextunsolved)), 0, this, TQ_SLOT(slotGoNextUnsolvedConflict()), ac, "go_next_unsolved_conflict");
goNextUnsolvedConflict->setToolTip( goNextUnsolvedConflict->text() + includeWhitespace );
chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseA()), ac, "merge_choose_a");
chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseB()), ac, "merge_choose_b");
chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseC()), ac, "merge_choose_c");
autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance");
showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters");
showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace");
showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers");
chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowAToggled()), ac, "win_show_a");
showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowBToggled()), ac, "win_show_b");
showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowWindowCToggled()), ac, "win_show_c");
winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next");
overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewNormal()), ac, "diff_overview_normal");
overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAB()), ac, "diff_overview_ab");
overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewAC()), ac, "diff_overview_ac");
overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOverviewBC()), ac, "diff_overview_bc");
wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap");
addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
chooseA = new TDEToggleAction(i18n("Select Line(s) From A"), TQIconSet(TQPixmap(iconA)), CTRL+Key_1, this, TQ_SLOT(slotChooseA()), ac, "merge_choose_a");
chooseB = new TDEToggleAction(i18n("Select Line(s) From B"), TQIconSet(TQPixmap(iconB)), CTRL+Key_2, this, TQ_SLOT(slotChooseB()), ac, "merge_choose_b");
chooseC = new TDEToggleAction(i18n("Select Line(s) From C"), TQIconSet(TQPixmap(iconC)), CTRL+Key_3, this, TQ_SLOT(slotChooseC()), ac, "merge_choose_c");
autoAdvance = new TDEToggleAction(i18n("Automatically Go to Next Unsolved Conflict After Source Selection"), TQIconSet(TQPixmap(autoadvance)), 0, this, TQ_SLOT(slotAutoAdvanceToggled()), ac, "merge_autoadvance");
showWhiteSpaceCharacters = new TDEToggleAction(i18n("Show Space && Tabulator Characters for Differences"), TQIconSet(TQPixmap(showwhitespacechars)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace_characters");
showWhiteSpace = new TDEToggleAction(i18n("Show White Space"), TQIconSet(TQPixmap(showwhitespace)), 0, this, TQ_SLOT(slotShowWhiteSpaceToggled()), ac, "diff_show_whitespace");
showLineNumbers = new TDEToggleAction(i18n("Show Line Numbers"), TQIconSet(TQPixmap(showlinenumbers)), 0, this, TQ_SLOT(slotShowLineNumbersToggled()), ac, "diff_showlinenumbers");
chooseAEverywhere = new TDEAction(i18n("Choose A Everywhere"), CTRL+SHIFT+Key_1, this, TQ_SLOT(slotChooseAEverywhere()), ac, "merge_choose_a_everywhere");
chooseBEverywhere = new TDEAction(i18n("Choose B Everywhere"), CTRL+SHIFT+Key_2, this, TQ_SLOT(slotChooseBEverywhere()), ac, "merge_choose_b_everywhere");
chooseCEverywhere = new TDEAction(i18n("Choose C Everywhere"), CTRL+SHIFT+Key_3, this, TQ_SLOT(slotChooseCEverywhere()), ac, "merge_choose_c_everywhere");
chooseAForUnsolvedConflicts = new TDEAction(i18n("Choose A for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedConflicts()), ac, "merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts = new TDEAction(i18n("Choose B for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedConflicts()), ac, "merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts = new TDEAction(i18n("Choose C for All Unsolved Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedConflicts()), ac, "merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts = new TDEAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), 0, this, TQ_SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()), ac, "merge_choose_c_for_unsolved_whitespace_conflicts");
autoSolve = new TDEAction(i18n("Automatically Solve Simple Conflicts"), 0, this, TQ_SLOT(slotAutoSolve()), ac, "merge_autosolve");
unsolve = new TDEAction(i18n("Set Deltas to Conflicts"), 0, this, TQ_SLOT(slotUnsolve()), ac, "merge_autounsolve");
mergeRegExp = new TDEAction(i18n("Run Regular Expression Auto Merge"), 0, this, TQ_SLOT(slotRegExpAutoMerge()),ac, "merge_regexp_automerge" );
mergeHistory = new TDEAction(i18n("Automatically Solve History Conflicts"), 0, this, TQ_SLOT(slotMergeHistory()), ac, "merge_versioncontrol_history" );
splitDiff = new TDEAction(i18n("Split Diff At Selection"), 0, this, TQ_SLOT(slotSplitDiff()), ac, "merge_splitdiff");
joinDiffs = new TDEAction(i18n("Join Selected Diffs"), 0, this, TQ_SLOT(slotJoinDiffs()), ac, "merge_joindiffs");
showWindowA = new TDEToggleAction(i18n("Show Window A"), 0, this, TQ_SLOT(slotShowWindowAToggled()), ac, "win_show_a");
showWindowB = new TDEToggleAction(i18n("Show Window B"), 0, this, TQ_SLOT(slotShowWindowBToggled()), ac, "win_show_b");
showWindowC = new TDEToggleAction(i18n("Show Window C"), 0, this, TQ_SLOT(slotShowWindowCToggled()), ac, "win_show_c");
winFocusNext = new TDEAction(i18n("Focus Next Window"), ALT+Key_Right, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next");
overviewModeNormal = new TDEToggleAction(i18n("Normal Overview"), 0, this, TQ_SLOT(slotOverviewNormal()), ac, "diff_overview_normal");
overviewModeAB = new TDEToggleAction(i18n("A vs. B Overview"), 0, this, TQ_SLOT(slotOverviewAB()), ac, "diff_overview_ab");
overviewModeAC = new TDEToggleAction(i18n("A vs. C Overview"), 0, this, TQ_SLOT(slotOverviewAC()), ac, "diff_overview_ac");
overviewModeBC = new TDEToggleAction(i18n("B vs. C Overview"), 0, this, TQ_SLOT(slotOverviewBC()), ac, "diff_overview_bc");
wordWrap = new TDEToggleAction(i18n("Word Wrap Diff Windows"), 0, this, TQ_SLOT(slotWordWrapToggled()), ac, "diff_wordwrap");
addManualDiffHelp = new TDEAction(i18n("Add Manual Diff Alignment"), TQt::CTRL+TQt::Key_Y, this, TQ_SLOT(slotAddManualDiffHelp()), ac, "diff_add_manual_diff_help");
clearManualDiffHelpList = new TDEAction(i18n("Clear All Manual Diff Alignments"), TQt::CTRL+TQt::SHIFT+TQt::Key_Y, this, TQ_SLOT(slotClearManualDiffHelpList()), ac, "diff_clear_manual_diff_help_list");
#ifdef _WIN32
new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false);
new TDEAction(i18n("Focus Next Window"), TQt::CTRL+TQt::Key_Tab, this, TQ_SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false);
#endif
winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, TQT_TQOBJECT(this), TQT_SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
winFocusPrev = new TDEAction(i18n("Focus Prev Window"), TQt::ALT+TQt::Key_Left, this, TQ_SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
winToggleSplitOrientation = new TDEAction(i18n("Toggle Split Orientation"), 0, this, TQ_SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirShowBoth()), ac, "win_dir_show_both");
dirShowBoth = new TDEToggleAction(i18n("Dir && Text Split Screen View"), 0, this, TQ_SLOT(slotDirShowBoth()), ac, "win_dir_show_both");
dirShowBoth->setChecked( true );
dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle");
dirViewToggle = new TDEAction(i18n("Toggle Between Dir && Text View"), 0, this, TQ_SLOT(slotDirViewToggle()), actionCollection(), "win_dir_view_toggle");
m_pMergeEditorPopupMenu = new TQPopupMenu( this );
chooseA->plug( m_pMergeEditorPopupMenu );
@ -593,7 +593,7 @@ void KDiff3App::saveOptions( TDEConfig* config )
bool KDiff3App::queryClose()
{
saveOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
saveOptions( isPart() ? m_pKDiff3Part->instance()->config() : tdeApp->config() );
if(m_bOutputModified)
{
@ -629,7 +629,7 @@ bool KDiff3App::queryClose()
/////////////////////////////////////////////////////////////////////
// TQT_SLOT IMPLEMENTATION
// TQ_SLOT IMPLEMENTATION
/////////////////////////////////////////////////////////////////////

@ -1,90 +1,14 @@
[Desktop Entry]
Encoding=UTF-8
Name=KDiff3
Name[hi]=के-डिफ3
Name[sv]=Kdiff3
Name[ta]=கேடிஃப்3
Name[xx]=xxKDiff3xx
GenericName=Diff/Patch Frontend
GenericName[ar]=واجهة أمامية لبرامج Diff/Patch
GenericName[bg]=Интерфейс на Diff/Patch
GenericName[bs]=Interfejs za Diff/Patch
GenericName[ca]=Interfície per a diff/patch
GenericName[cs]=Rozhraní pro Diff/Patch
GenericName[cy]=Blaen Gwahaniaethau/Clytiau
GenericName[da]=Forende for diff/patch
GenericName[de]=Graphische Oberfläche zu Diff/Patch
GenericName[el]=Σύστημα υποστήριξης χρήστη για τα Diff/Patch
GenericName[es]=Interfaz Diff/Patch
GenericName[et]=Võrdlemise ja liitmise rakendus
GenericName[fr]=Interface graphique à diff / patch
GenericName[ga]=Comhéadan Diff/Patch
GenericName[gl]=Interface para Diff/Patch
GenericName[hi]=डिफ/पैच फ्रन्टएण्ड
GenericName[hu]=Grafikus diff/patch
GenericName[is]=Diff/Patch viðmót
GenericName[it]=Interfaccia per diff/patch
GenericName[ja]=Diff/Patch フロントエンド
GenericName[lt]=Diff/Patch naudotojo sąsaja
GenericName[ms]=Bahagian Depan Beza/Tampal
GenericName[nb]=Endrings-/lappeprogram
GenericName[nl]=Een schil voor Diff/Patch
GenericName[pa]=Diff/Patch ਮੁੱਖ
GenericName[pl]=Interfejs do programów Diff/Patch
GenericName[pt]=Interface do Diff/Patch
GenericName[pt_BR]=Interface do Diff/Patch
GenericName[ru]=Графический интерфейс к Diff и Patch
GenericName[sk]=Rozhranie pre diff/patch
GenericName[sr]=Интерфејс за diff и patch
GenericName[sr@Latn]=Interfejs za diff i patch
GenericName[sv]=Jämförelse- och programfixgränssnitt
GenericName[ta]= Diff/Patch Frontend
GenericName[tg]=Интерфейси графикӣ ба Diff ва Patch
GenericName[tr]=Diff/Patch Arayüzü
GenericName[uk]=Інтерфейс до diff/patch
GenericName[xx]=xxDiff/Patch Frontendxx
GenericName[zh_CN]=Diff/Patch 前端
GenericName[zu]=Diff/PatchIsiqalo sokugcina
Comment=A File And Directory Comparison And Merge Tool
Exec=kdiff3 %i %m -caption "%c"
Icon=kdiff3
Type=Application
Categories=Qt;TDE;Development;
X-DocPath=kdiff3/index.html
Comment=A File And Directory Comparison And Merge Tool
Comment[ar]=أداة مقارنة و دمج ملفات و دلائل (مجلًدات )
Comment[bg]=Инструмент за сравняване и сливане на файлове и директории
Comment[bs]=Alat za upoređivanje i spajanje datoteka i direktorija
Comment[ca]=Una eina per a comparar i fusionar fitxers o directoris
Comment[cs]=Nástroj pro porovnávání a slučování souborů a adresářů
Comment[da]=Et indfletningsværktøj for filer og mapper
Comment[de]=Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern
Comment[el]=Ένα εργαλείο σύγκρισης και συγχώνευσης αρχείων και καταλόγων
Comment[es]=Una herramienta para mezclar y comparar archivos y directorios
Comment[et]=Failide ja kataloogide võrdlemise ja liitmise tööriist
Comment[fr]=Un outil de comparaison et de fusion de fichiers et dossiers
Comment[ga]=Uirlis a chuireann comhaid agus comhadlanna i gcomparáid agus a chumascann iad más gá
Comment[gl]=Comparazón e Unificazón de Ficheiros e Cartafoles
Comment[hi]=एक फाइल तथा डिरेक्ट्री तुलना तथा विलीन उपकरण
Comment[hu]=Segédprogram fájlok, könyvtárak összehasonlításához
Comment[is]=Skráa og möppu samanburðar og sameiningartól
Comment[it]=Uno strumento di confronto e unione di file e directory
Comment[ja]=ファイル/ディレクトリの比較/統合ツール
Comment[ka]=ფაილთა და საქაღალდეთა შედარების და შერწყმის ხელსაწყო
Comment[ms]=Perbandingan Fail Dan Direktori Dan Alatan Gabungan
Comment[nb]=Et verktøy for å sammenlikne og slå sammen filer og mapper
Comment[nl]=Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen
Comment[pa]=ਇੱਕ ਫਾਇਲ ਅਤੇ ਡਾਇਰੈਕਟਰੀ ਤੁਲਨਾ ਅਤੇ ਮਿਲਾਨ ਸੰਦ ਹੈ
Comment[pl]=Narzędzie do porównywania oraz łączenia plików i katalogów
Comment[pt]=Uma Ferramenta de Comparação e Junção de Ficheiros e Pastas
Comment[pt_BR]=Uma Ferramenta de Comparação e Junção de Arquivos e Diretórios
Comment[ru]=Утилита сравнения и объединения файлов и каталогов
Comment[sk]=Nástroj pre porovnanie a spájanie súborov a priečinkov
Comment[sr]=Алат за поређење и стапање фајлова и директоријума
Comment[sr@Latn]=Alat za poređenje i stapanje fajlova i direktorijuma
Comment[sv]=Ett jämförelseverktyg för fil- och katalogjämförelser
Comment[tg]=Асбоби баробаркунӣ ва пайванди файлҳо ва каталогҳо
Comment[tr]=Bir Dosya Ve Klasör Karşılaştırma Ve Birleştirme Aracı
Comment[uk]=Засіб-утиліта для порівняння і поєднання файлів та каталогів
Comment[xx]=xxA File And Directory Comparison And Merge Toolxx
Comment[zh_CN]=一个文件和目录的比较及合并工具
Terminal=false

@ -18,12 +18,12 @@
#ifndef KDIFF3_H
#define KDIFF3_H
#include "diff.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif
#include "diff.h"
// include files for TQt
#include <tqdialog.h>
#include <tqsplitter.h>
@ -62,17 +62,17 @@ class DirectoryMergeInfo;
class ReversibleScrollBar : public TQScrollBar
{
Q_OBJECT
TQ_OBJECT
bool* m_pbRightToLeftLanguage;
int m_realVal;
public:
ReversibleScrollBar( Qt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage )
ReversibleScrollBar( TQt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage )
: TQScrollBar( o, pParent )
{
m_pbRightToLeftLanguage=pbRightToLeftLanguage;
m_realVal=0;
connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)));
connect( this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int)));
}
void setAgain(){ setValue(m_realVal); }
public slots:
@ -96,7 +96,7 @@ signals:
class KDiff3App : public TQSplitter
{
Q_OBJECT
TQ_OBJECT
public:

@ -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
}

@ -19,7 +19,7 @@
#include "kdiff3_part.h"
#include <kinstance.h>
#include <tdeinstance.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
@ -52,9 +52,9 @@ KDiff3Part::KDiff3Part( TQWidget *parentWidget, const char *widgetName,
setWidget(m_widget);
// create our actions
//KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
//KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
//KStdAction::save(this, TQT_SLOT(save()), actionCollection());
//KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
//KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection());
//KStdAction::save(this, TQ_SLOT(save()), actionCollection());
setXMLFile("kdiff3_part.rc");
@ -69,7 +69,7 @@ KDiff3Part::~KDiff3Part()
{
if ( m_widget!=0 && ! m_bIsShell )
{
m_widget->saveOptions( m_widget->isPart() ? instance()->config() : kapp->config() );
m_widget->saveOptions( m_widget->isPart() ? instance()->config() : tdeApp->config() );
}
}
@ -98,7 +98,7 @@ void KDiff3Part::setModified(bool /*modified*/)
*/
}
static void getNameAndVersion( const TQString& str, const TQString& lineStart, TQString& fileName, TQString& version )
static void getNameAndVersion( const TQString& workingDir, const TQString& str, const TQString& lineStart, TQString& fileName, TQString& version )
{
if ( str.left( lineStart.length() )==lineStart && fileName.isEmpty() )
{
@ -110,7 +110,12 @@ static void getNameAndVersion( const TQString& str, const TQString& lineStart, T
while (pos2>pos && str[pos2]!=' ' && str[pos2]!='\t') --pos2;
fileName = str.mid( pos, pos2-pos );
std::cerr << "KDiff3: " << fileName.latin1() << std::endl;
if ( FileAccess(fileName).exists() ) break;
FileAccess fa(workingDir, fileName);
if (fa.exists())
{
fileName = fa.absFilePath();
break;
}
--pos2;
}
@ -135,6 +140,8 @@ bool KDiff3Part::openFile()
// our example widget is text-based, so we use TQTextStream instead
// of a raw TQDataStream
TQFileInfo fileinfo(m_file);
TQString workingDir = fileinfo.dirPath(true);
TQTextStream stream(&file);
TQString str;
TQString fileName1;
@ -144,8 +151,8 @@ bool KDiff3Part::openFile()
while (!stream.eof() && (fileName1.isEmpty() || fileName2.isEmpty()) )
{
str = stream.readLine() + "\n";
getNameAndVersion( str, "---", fileName1, version1 );
getNameAndVersion( str, "+++", fileName2, version2 );
getNameAndVersion( workingDir, str, "---", fileName1, version1 );
getNameAndVersion( workingDir, str, "+++", fileName2, version2 );
}
file.close();
@ -156,8 +163,8 @@ bool KDiff3Part::openFile()
return false;
}
FileAccess f1(fileName1);
FileAccess f2(fileName2);
FileAccess f1(workingDir, fileName1);
FileAccess f2(workingDir, fileName2);
if ( f1.exists() && f2.exists() && fileName1!=fileName2 )
{
@ -296,7 +303,7 @@ TDEInstance* KDiff3PartFactory::instance()
}
extern "C"
{
{ TDE_EXPORT
void* init_libkdiff3part()
{
return new KDiff3PartFactory;

@ -37,7 +37,7 @@ class KDiff3App;
*/
class KDiff3Part : public KParts::ReadOnlyPart
{
Q_OBJECT
TQ_OBJECT
public:
/**
@ -84,7 +84,7 @@ class TDEAboutData;
class KDiff3PartFactory : public KParts::Factory
{
Q_OBJECT
TQ_OBJECT
public:
KDiff3PartFactory();

@ -55,7 +55,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
{
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
m_part = static_cast<KParts::ReadWritePart *>(factory->create(TQT_TQOBJECT(this),
m_part = static_cast<KParts::ReadWritePart *>(factory->create(this,
"kdiff3_part", "KParts::ReadWritePart" ));
if (m_part)
@ -68,7 +68,7 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
if (bCompleteInit)
((KDiff3App*)m_part->widget())->completeInit();
connect(((KDiff3App*)m_part->widget()), TQT_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQT_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&)));
connect(((KDiff3App*)m_part->widget()), TQ_SIGNAL(createNewInstance(const TQString&, const TQString&, const TQString&)), this, TQ_SLOT(slotNewInstance(const TQString&, const TQString&, const TQString&)));
}
}
else
@ -79,11 +79,11 @@ KDiff3Shell::KDiff3Shell(bool bCompleteInit)
"This usually happens due to an installation problem. "
"Please read the README-file in the source package for details.")
);
//kapp->quit();
//tdeApp->quit();
::exit(-1); //kapp->quit() doesn't work here yet.
::exit(-1); //tdeApp->quit() doesn't work here yet.
// we return here, cause kapp->quit() only means "exit the
// we return here, cause tdeApp->quit() only means "exit the
// next time we enter the event loop...
return;
@ -164,8 +164,8 @@ void KDiff3Shell::optionsConfigureToolbars()
// use the standard toolbar editor
KEditToolbar dlg(factory());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()),
this, TQT_SLOT(applyNewToolbarConfig()));
connect(&dlg, TQ_SIGNAL(newToolbarConfig()),
this, TQ_SLOT(applyNewToolbarConfig()));
dlg.exec();
}

@ -21,7 +21,7 @@
#define _KDIFF3SHELL_H_
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif
#include <tdeapplication.h>
@ -38,7 +38,7 @@ class TDEToggleAction;
*/
class KDiff3Shell : public KParts::MainWindow
{
Q_OBJECT
TQ_OBJECT
public:
/**

@ -1,17 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Name=KDiff3Part
Name[cs]=Komponenta KDiff3
Name[fr]=Composant KDiff3
Name[hi]=के-डिफ3पार्ट
Name[nb]=KDiff3-del
Name[pt_BR]=Componente KDiff3
Name[sv]=Kdiff3-del
Name[ta]=கேடிஃப்3 பகுதி
Name[tg]=ҚисмиKDiff3
Name[uk]=Комопнент KDiff3
Name[xx]=xxKDiff3Partxx
Name[zh_CN]=KDiff3 组件
MimeType=text/x-diff
X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-Library=libkdiff3part

@ -5,7 +5,7 @@ I want to be able to compile and use KDiff3 without KDE too.
Since KDiff3 is a KDE program, which uses many KDE-classes and
functions there must be some replacement.
In many cases this is just the corresponding Qt-class, but often
In many cases this is just the corresponding TQt-class, but often
I wrote something myself. For several very KDE-specific functions
there is no real replacement, but only stub functions that allow
the program to compile and link.
@ -21,7 +21,7 @@ kreplacements.cpp.
The *.moc-files are dummies. The new KDE-philosophy seems to be
that *.moc-files are directly included into the sources.
The Qt-philosophy still is to generate moc*.cpp files which will
The TQt-philosophy still is to generate moc*.cpp files which will
be compiled seperately. With these dummy-moc-files both versions
can be compiled.

@ -172,9 +172,9 @@ KDialogBase::KDialogBase( int, const TQString& caption, int, int, TQWidget* pare
setOkButton();
setDefaultButton();
connect( this, TQT_SIGNAL( defaultButtonPressed() ), this, TQT_SLOT(slotDefault()) );
connect( this, TQT_SIGNAL( helpButtonPressed() ), this, TQT_SLOT(slotHelp()));
connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() ));
connect( this, TQ_SIGNAL( defaultButtonPressed() ), this, TQ_SLOT(slotDefault()) );
connect( this, TQ_SIGNAL( helpButtonPressed() ), this, TQ_SLOT(slotHelp()));
connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotApply() ));
}
KDialogBase::~KDialogBase()
@ -336,7 +336,7 @@ TDEMainWindow::TDEMainWindow( TQWidget* parent, const char* name )
m_pToolBar = new TDEToolBar(this);
memberList = new TQList<TDEMainWindow>;
memberList = new TQPtrList<TDEMainWindow>;
memberList->append(this);
}
@ -352,8 +352,8 @@ TDEActionCollection* TDEMainWindow::actionCollection()
void TDEMainWindow::createGUI()
{
KStdAction::help(this, TQT_SLOT(slotHelp()), actionCollection());
KStdAction::about(this, TQT_SLOT(slotAbout()), actionCollection());
KStdAction::help(this, TQ_SLOT(slotHelp()), actionCollection());
KStdAction::about(this, TQ_SLOT(slotAbout()), actionCollection());
KStdAction::aboutTQt(actionCollection());
}
@ -480,10 +480,10 @@ void TDEAction::init(TQObject* receiver, const char* slot, TDEActionCollection*
if( slot!=0 )
{
if (!bToggle)
connect(this, TQT_SIGNAL(activated()), receiver, slot);
connect(this, TQ_SIGNAL(activated()), receiver, slot);
else
{
connect(this, TQT_SIGNAL(toggled(bool)), receiver, slot);
connect(this, TQ_SIGNAL(toggled(bool)), receiver, slot);
}
}
@ -696,7 +696,7 @@ TDEAction* KStdAction::about( TQWidget* parent, const char* slot, TDEActionColle
TDEAction* KStdAction::aboutTQt( TDEActionCollection* actionCollection )
{
TDEMainWindow* p = actionCollection->m_pMainWindow;
TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQT_SLOT(aboutTQt()), actionCollection, "about_qt", false, false );
TDEAction* a = new TDEAction( i18n("About")+" TQt", 0, tqApp, TQ_SLOT(aboutTQt()), actionCollection, "about_qt", false, false );
if(p) a->addTo( p->helpMenu );
return a;
}
@ -733,7 +733,7 @@ TDEFontChooser::TDEFontChooser( TQWidget* pParent, const TQString& /*name*/, boo
m_pParent = pParent;
TQVBoxLayout* pLayout = new TQVBoxLayout( this );
m_pSelectFont = new TQPushButton(i18n("Select Font"), this );
connect(m_pSelectFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectFont()));
connect(m_pSelectFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectFont()));
pLayout->addWidget(m_pSelectFont);
m_pLabel = new TQLabel( "", this );
@ -788,7 +788,7 @@ void TDEFontChooser::slotSelectFont()
KColorButton::KColorButton(TQWidget* parent)
: TQPushButton(parent)
{
connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked()));
connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked()));
}
TQColor KColorButton::color()
@ -978,12 +978,12 @@ bool TDECmdLineArgs::isSet(const TQString& s)
}
///////////////////
TDEApplication* kapp;
TDEApplication* tdeApp;
TDEApplication::TDEApplication()
: TQApplication( s_argc,s_argv )
{
kapp = this;
tdeApp = this;
int nofOptions=0;
int nofArgs=0;
@ -1119,9 +1119,9 @@ bool TDEApplication::isRestored()
return false;
}
TDEApplication* TDEApplication::kApplication()
TDEApplication* TDEApplication::tdeApplication()
{
return kapp;
return tdeApp;
}
TDEIconLoader* TDEApplication::iconLoader()
@ -1152,7 +1152,7 @@ TDEActionCollection* KParts::Part::actionCollection()
TDEApplication* KParts::Part::instance()
{
return kapp;
return tdeApp;
}

@ -87,7 +87,7 @@ typedef TQPopupMenu TDEPopupMenu;
class KDialogBase : public TQTabDialog
{
Q_OBJECT
TQ_OBJECT
public:
KDialogBase( int, const TQString& caption, int, int, TQWidget* parent, const char* name,
@ -171,7 +171,7 @@ namespace KParts
class TDEMainWindow : public TQMainWindow
{
Q_OBJECT
TQ_OBJECT
private:
KStatusBar m_statusBar;
@ -200,7 +200,7 @@ public:
void createGUI();
void createGUI(KParts::ReadWritePart*){createGUI();}
TQList<TDEMainWindow>* memberList;
TQPtrList<TDEMainWindow>* memberList;
public slots:
void slotHelp();
void slotAbout();
@ -219,7 +219,7 @@ public:
class TDEAction : public TQAction
{
Q_OBJECT
TQ_OBJECT
public:
TDEAction(const TQString& text, const TQIconSet& icon, int accel, TQObject* receiver, const char* slot, TDEActionCollection* actionCollection, const char* name, bool bToggle=false, bool bMenu=true);
@ -272,7 +272,7 @@ public:
class TDEFontChooser : public TQWidget
{
Q_OBJECT
TQ_OBJECT
TQFont m_font;
TQPushButton* m_pSelectFont;
@ -288,7 +288,7 @@ private slots:
class KColorButton : public TQPushButton
{
Q_OBJECT
TQ_OBJECT
TQColor m_color;
public:
@ -381,17 +381,17 @@ class TDEApplication : public TQApplication
TDEIconLoader m_iconLoader;
public:
TDEApplication();
static TDEApplication* kApplication();
static TDEApplication* tdeApplication();
TDEIconLoader* iconLoader();
TDEConfig* config();
bool isRestored();
};
extern TDEApplication* kapp;
extern TDEApplication* tdeApp;
class KLibFactory : public TQObject
{
Q_OBJECT
TQ_OBJECT
public:
TQObject* create(TQObject*,const TQString&,const TQString&);
@ -499,7 +499,7 @@ namespace KParts
class Factory : public KLibFactory
{
Q_OBJECT
TQ_OBJECT
public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 234 B

@ -19,7 +19,7 @@
#include <tdeaboutdata.h>
#include <tdelocale.h>
#include "kdiff3_shell.h"
#include <kstandarddirs.h>
#include <tdestandarddirs.h>
#include "version.h"
#include <tqtextcodec.h>
#include <tqfile.h>

@ -50,7 +50,7 @@ MergeResultWindow::MergeResultWindow(
)
: TQWidget( pParent, 0, WRepaintNoErase )
{
setFocusPolicy( TQ_ClickFocus );
setFocusPolicy( TQWidget::ClickFocus );
m_firstLine = 0;
m_firstColumn = 0;
@ -84,7 +84,7 @@ MergeResultWindow::MergeResultWindow(
m_cursorYPos=0;
m_bCursorOn = true;
m_bCursorUpdate = false;
connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotCursorUpdate() ) );
connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotCursorUpdate() ) );
m_cursorTimer.start( 500 /*ms*/, true /*single shot*/ );
m_selection.reset();
@ -1761,7 +1761,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent* )
if ( size() != m_pixmap.size() )
m_pixmap.resize(size());
MyPainter p(TQT_TQPAINTDEVICE(&m_pixmap), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
MyPainter p(&m_pixmap, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
p.setFont( font() );
p.TQPainter::fillRect( rect(), m_pOptionDialog->m_bgColor );
@ -1843,7 +1843,7 @@ void MergeResultWindow::paintEvent( TQPaintEvent* )
if ( m_bCursorOn && hasFocus() && m_cursorYPos>=m_firstLine )
{
MyPainter painter(TQT_TQPAINTDEVICE(this), m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
MyPainter painter(this, m_pOptionDialog->m_bRightToLeftLanguage, width(), fontWidth);
int topLineYOffset = 0;
int xOffset = fontWidth * leftInfoWidth;
@ -1929,9 +1929,9 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e )
int pos;
convertToLinePos( e->x(), e->y(), line, pos );
bool bLMB = e->button() == Qt::LeftButton;
bool bMMB = e->button() == Qt::MidButton;
bool bRMB = e->button() == Qt::RightButton;
bool bLMB = e->button() == TQt::LeftButton;
bool bMMB = e->button() == TQt::MidButton;
bool bRMB = e->button() == TQt::RightButton;
if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection
{
@ -1999,7 +1999,7 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e )
void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e )
{
if ( e->button() == Qt::LeftButton )
if ( e->button() == TQt::LeftButton )
{
int line;
int pos;
@ -2033,7 +2033,7 @@ void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e )
void MergeResultWindow::mouseReleaseEvent ( TQMouseEvent * e )
{
if ( e->button() == Qt::LeftButton )
if ( e->button() == TQt::LeftButton )
{
killTimer(m_delayedDrawTimer);
m_delayedDrawTimer = 0;
@ -3068,7 +3068,7 @@ WindowTitleWidget::WindowTitleWidget(OptionDialog* pOptionDialog, TQWidget* pPar
//m_pBrowseButton = new TQPushButton("...");
//pHLayout->addWidget( m_pBrowseButton, 0 );
//connect( m_pBrowseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowseButtonClicked()));
//connect( m_pBrowseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowseButtonClicked()));
m_pModifiedLabel = new TQLabel(i18n("[Modified]"),this);
pHLayout->addWidget( m_pModifiedLabel );
@ -3199,7 +3199,7 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e )
m_pEncodingLabel->setPalette( p );
m_pEncodingSelector->setPalette( p );
}
if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pFileNameLineEdit) && e->type()==TQEvent::Drop)
if (o == m_pFileNameLineEdit && e->type()==TQEvent::Drop)
{
TQDropEvent* d = static_cast<TQDropEvent*>(e);
@ -3210,8 +3210,8 @@ bool WindowTitleWidget::eventFilter( TQObject* o, TQEvent* e )
if ( lst.count() > 0 )
{
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus();
static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(o)->setFocus();
return true;
}
}

@ -28,7 +28,7 @@ class TQPainter;
class Overview : public TQWidget
{
Q_OBJECT
TQ_OBJECT
public:
Overview( TQWidget* pParent, OptionDialog* pOptions );
@ -96,7 +96,7 @@ enum e_MergeSrcSelector
class MergeResultWindow : public TQWidget
{
Q_OBJECT
TQ_OBJECT
public:
MergeResultWindow(
@ -426,7 +426,7 @@ class TQComboBox;
class TQLabel;
class WindowTitleWidget : public TQWidget
{
Q_OBJECT
TQ_OBJECT
private:
TQLabel* m_pLabel;

@ -263,7 +263,7 @@ public:
{
m_pVar = pVar;
m_defaultVal = defaultVal;
TQIntValidator* v = new TQIntValidator(TQT_TQOBJECT(this));
TQIntValidator* v = new TQIntValidator(this);
v->setRange( rangeMin, rangeMax );
setValidator( v );
}
@ -847,7 +847,7 @@ void OptionDialog::setupMergePage( void )
);
++line;
TQGroupBox* pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Automatic Merge Regular Expression"), page);
TQGroupBox* pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Automatic Merge Regular Expression"), page);
gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line;
{
@ -873,7 +873,7 @@ void OptionDialog::setupMergePage( void )
++line;
}
pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Version Control History Merging"), page);
pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Version Control History Merging"), page);
gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line;
{
@ -922,7 +922,7 @@ void OptionDialog::setupMergePage( void )
//int year = newHistoryEntry.cap(4).toInt();
//TQString time = newHistoryEntry.cap(5);
//TQString name = newHistoryEntry.cap(6);
TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(Qt::ISODate) +" "+ time + " " + branch + " " + name;
TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(TQt::ISODate) +" "+ time + " " + branch + " " + name;
label = new TQLabel( i18n("History entry start sort key order:"), page );
gbox->addWidget( label, line, 0 );
@ -936,7 +936,7 @@ void OptionDialog::setupMergePage( void )
"See the documentation for details.");
TQToolTip::add( label, s_historyEntryStartSortKeyOrderToolTip );
m_pHistorySortKeyOrderLineEdit->setEnabled(false);
connect( m_pHistoryMergeSorting, TQT_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQT_SLOT(setEnabled(bool)));
connect( m_pHistoryMergeSorting, TQ_SIGNAL(toggled(bool)), m_pHistorySortKeyOrderLineEdit, TQ_SLOT(setEnabled(bool)));
++line;
m_pHistoryAutoMerge = new OptionCheckBox( i18n("Merge version control history on merge start"), false, "RunHistoryAutoMergeOnMergeStart", &m_bRunHistoryAutoMergeOnMergeStart, page, this );
@ -954,7 +954,7 @@ void OptionDialog::setupMergePage( void )
TQPushButton* pButton = new TQPushButton( i18n("Test your regular expressions"), page );
gbox->addWidget( pButton, line, 0 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHistoryMergeRegExpTester()));
connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHistoryMergeRegExpTester()));
++line;
label = new TQLabel( i18n("Irrelevant merge command:"), page );
@ -1117,7 +1117,7 @@ void OptionDialog::setupDirectoryMergePage( void )
TQToolTip::add( pWhiteSpaceDiffsEqual, i18n(
"If files differ only by white space consider them equal.\n"
"This is only active when full analysis is chosen." ) );
connect(pFullAnalysis, TQT_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQT_SLOT(setEnabled(bool)));
connect(pFullAnalysis, TQ_SIGNAL(toggled(bool)), pWhiteSpaceDiffsEqual, TQ_SLOT(setEnabled(bool)));
pWhiteSpaceDiffsEqual->setEnabled(false);
++line;
@ -1418,10 +1418,10 @@ static char* countryMap[]={
gbox->addWidget( m_pEncodingPPComboBox, line, 1 );
++line;
connect(m_pSameEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged()));
connect(m_pEncodingAComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEncodingChanged()));
connect(m_pAutoDetectUnicodeA, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged()));
connect(m_pAutoSelectOutEncoding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEncodingChanged()));
connect(m_pSameEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pEncodingAComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pAutoDetectUnicodeA, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
connect(m_pAutoSelectOutEncoding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEncodingChanged()));
OptionCheckBox* pRightToLeftLanguage = new OptionCheckBox( i18n("Right To Left Language"), false, "RightToLeftLanguage", &m_bRightToLeftLanguage, page, this );
gbox->addMultiCellWidget( pRightToLeftLanguage, line, line, 0, 1 );
@ -1468,14 +1468,14 @@ void OptionDialog::setupIntegrationPage( void )
"Integrate with Rational ClearCase from IBM.\n"
"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n"
"(Only enabled when ClearCase \"bin\" directory is in the path.)"));
connect(pIntegrateWithClearCase, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotIntegrateWithClearCase()) );
connect(pIntegrateWithClearCase, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotIntegrateWithClearCase()) );
pIntegrateWithClearCase->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
TQPushButton* pRemoveClearCaseIntegration = new TQPushButton( i18n("Remove ClearCase Integration"), page);
gbox->addWidget( pRemoveClearCaseIntegration, line, 1 );
TQToolTip::add( pRemoveClearCaseIntegration, i18n(
"Restore the old \"map\" file from before doing the Clearcase integration."));
connect(pRemoveClearCaseIntegration, TQT_SIGNAL(clicked()),this, TQT_SLOT(slotRemoveClearCaseIntegration()) );
connect(pRemoveClearCaseIntegration, TQ_SIGNAL(clicked()),this, TQ_SLOT(slotRemoveClearCaseIntegration()) );
pRemoveClearCaseIntegration->setEnabled( integrateWithClearCase( "existsClearCase", "" )!=0 );
++line;

@ -48,7 +48,7 @@ enum e_LineEndStyle
class OptionDialog : public KDialogBase
{
Q_OBJECT
TQ_OBJECT
public:

@ -533,7 +533,7 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF
}
}
TQTimer::singleShot( 10, this, TQT_SLOT(slotAfterFirstPaint()) );
TQTimer::singleShot( 10, this, TQ_SLOT(slotAfterFirstPaint()) );
if ( bVisibleMergeResultWindow && m_pMergeResultWindow )
{
@ -638,22 +638,22 @@ void KDiff3App::initView()
TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0);
TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget );
pVSplitter->setOrientation( Qt::Vertical );
pVSplitter->setOrientation( TQt::Vertical );
pVLayout->addWidget( pVSplitter );
TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter );
TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 );
m_pDiffWindowSplitter = new TQSplitter( pDiffWindowFrame );
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical );
pDiffHLayout->addWidget( m_pDiffWindowSplitter );
m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog );
pDiffHLayout->addWidget(m_pOverview);
connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) );
//connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint()));
connect( m_pOverview, TQ_SIGNAL(setLine(int)), this, TQ_SLOT(setDiff3Line(int)) );
//connect( m_pOverview, TQ_SIGNAL(afterFirstPaint()), this, TQ_SLOT(slotAfterFirstPaint()));
m_pDiffVScrollBar = new TQScrollBar( Qt::Vertical, pDiffWindowFrame );
m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame );
pDiffHLayout->addWidget( m_pDiffVScrollBar );
m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 );
@ -662,9 +662,9 @@ void KDiff3App::initView()
m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow();
m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow();
m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow();
connect(m_pDiffTextWindowFrame1, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame2, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame3, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame1, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame2, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
connect(m_pDiffTextWindowFrame3, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int)));
// Merge window
m_pMergeWindowFrame = new TQWidget( pVSplitter );
@ -679,7 +679,7 @@ void KDiff3App::initView()
m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() );
pMergeVLayout->addWidget( m_pMergeResultWindow, 1 );
m_pMergeVScrollBar = new TQScrollBar( Qt::Vertical, m_pMergeWindowFrame );
m_pMergeVScrollBar = new TQScrollBar( TQt::Vertical, m_pMergeWindowFrame );
pMergeHLayout->addWidget( m_pMergeVScrollBar );
autoAdvance->setEnabled(true);
@ -693,67 +693,67 @@ void KDiff3App::initView()
m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
TQHBoxLayout* pHScrollBarLayout = new TQHBoxLayout( pVLayout );
m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage );
m_pHScrollBar = new ReversibleScrollBar( TQt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage );
pHScrollBarLayout->addWidget( m_pHScrollBar );
m_pCornerWidget = new TQWidget( m_pMainWidget );
pHScrollBarLayout->addWidget( m_pCornerWidget );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pOverview, TQT_SLOT(setFirstLine(int)));
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow1, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow1, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow1, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int)));
connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pOverview, TQ_SLOT(setFirstLine(int)));
connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow1, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow1, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow1, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow1->installEventFilter( this );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow2, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow2, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow2, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int)));
connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow2, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow2, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow2, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow2->installEventFilter( this );
connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow3, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow3, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow3, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int)));
connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstColumn(int)));
connect( m_pDiffTextWindow3, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart()));
connect( m_pDiffTextWindow3, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd()));
connect( m_pDiffTextWindow3, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int)));
m_pDiffTextWindow3->installEventFilter( this );
MergeResultWindow* p = m_pMergeResultWindow;
connect( m_pMergeVScrollBar, TQT_SIGNAL(valueChanged(int)), p, TQT_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), p, TQT_SLOT(setFirstColumn(int)));
connect( p, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollMergeResultWindow(int,int)));
connect( p, TQT_SIGNAL(sourceMask(int,int)), this, TQT_SLOT(sourceMask(int,int)));
connect( p, TQT_SIGNAL( resizeSignal() ),this, TQT_SLOT(resizeMergeResultWindow()));
connect( p, TQT_SIGNAL( selectionEnd() ), this, TQT_SLOT( slotSelectionEnd() ) );
connect( p, TQT_SIGNAL( newSelection() ), this, TQT_SLOT( slotSelectionStart() ) );
connect( p, TQT_SIGNAL( modifiedChanged(bool) ), this, TQT_SLOT( slotOutputModified(bool) ) );
connect( p, TQT_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQT_SLOT( slotSetModified(bool) ) );
connect( p, TQT_SIGNAL( updateAvailabilities() ), this, TQT_SLOT( slotUpdateAvailabilities() ) );
connect( p, TQT_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQT_SLOT(showPopupMenu(const TQPoint&)));
connect( p, TQT_SIGNAL( noRelevantChangesDetected() ), this, TQT_SLOT(slotNoRelevantChangesDetected()));
connect( m_pMergeVScrollBar, TQ_SIGNAL(valueChanged(int)), p, TQ_SLOT(setFirstLine(int)));
connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), p, TQ_SLOT(setFirstColumn(int)));
connect( p, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollMergeResultWindow(int,int)));
connect( p, TQ_SIGNAL(sourceMask(int,int)), this, TQ_SLOT(sourceMask(int,int)));
connect( p, TQ_SIGNAL( resizeSignal() ),this, TQ_SLOT(resizeMergeResultWindow()));
connect( p, TQ_SIGNAL( selectionEnd() ), this, TQ_SLOT( slotSelectionEnd() ) );
connect( p, TQ_SIGNAL( newSelection() ), this, TQ_SLOT( slotSelectionStart() ) );
connect( p, TQ_SIGNAL( modifiedChanged(bool) ), this, TQ_SLOT( slotOutputModified(bool) ) );
connect( p, TQ_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQ_SLOT( slotSetModified(bool) ) );
connect( p, TQ_SIGNAL( updateAvailabilities() ), this, TQ_SLOT( slotUpdateAvailabilities() ) );
connect( p, TQ_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQ_SLOT(showPopupMenu(const TQPoint&)));
connect( p, TQ_SIGNAL( noRelevantChangesDetected() ), this, TQ_SLOT(slotNoRelevantChangesDetected()));
sourceMask(0,0);
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQT_SLOT(setFastSelectorRange(int,int)));
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQT_SLOT(setFastSelectorRange(int,int)));
connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQT_SLOT(setFastSelectorRange(int,int)));
connect(m_pDiffTextWindow1, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow2, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow3, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow1, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow2, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow3, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask()));
connect(m_pDirectoryMergeInfo, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask()));
connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQ_SLOT(setFastSelectorRange(int,int)));
connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQ_SLOT(setFastSelectorRange(int,int)));
connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQ_SLOT(setFastSelectorRange(int,int)));
connect(m_pDiffTextWindow1, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow2, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow3, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int)));
connect(m_pDiffTextWindow1, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow2, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDiffTextWindow3, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect(m_pDirectoryMergeInfo, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask()));
connect( m_pDiffTextWindow1, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(resizeDiffTextWindow(int,int)));
connect( m_pDiffTextWindow1, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(resizeDiffTextWindow(int,int)));
// The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one.
connect( m_pDiffTextWindow2, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap()));
connect( m_pDiffTextWindow3, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap()));
connect( m_pDiffTextWindow2, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap()));
connect( m_pDiffTextWindow3, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap()));
m_pDiffTextWindow1->setFocus();
m_pMainWidget->setMinimumSize(50,50);
@ -837,7 +837,7 @@ void KDiff3App::resizeEvent(TQResizeEvent* e)
bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pMergeResultWindow) )
if( o == m_pMergeResultWindow )
{
if ( e->type() == TQEvent::KeyPress )
{ // key press
@ -929,9 +929,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{
raise();
TQString filename = stringList.first();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFilename( filename );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFilename( filename );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFilename( filename );
if ( o == m_pDiffTextWindow1 ) m_sd1.setFilename( filename );
else if ( o == m_pDiffTextWindow2 ) m_sd2.setFilename( filename );
else if ( o == m_pDiffTextWindow3 ) m_sd3.setFilename( filename );
init();
}
#else
@ -941,9 +941,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
{
raise();
FileAccess fa( urlList.first().url() );
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setFileAccess( fa );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setFileAccess( fa );
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setFileAccess( fa );
if ( o == m_pDiffTextWindow1 ) m_sd1.setFileAccess( fa );
else if ( o == m_pDiffTextWindow2 ) m_sd2.setFileAccess( fa );
else if ( o == m_pDiffTextWindow3 ) m_sd3.setFileAccess( fa );
init();
}
#endif
@ -955,9 +955,9 @@ bool KDiff3App::eventFilter( TQObject* o, TQEvent* e )
if ( bDecodeSuccess && canContinue() )
{
raise();
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow1) ) m_sd1.setData(text);
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow2) ) m_sd2.setData(text);
else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pDiffTextWindow3) ) m_sd3.setData(text);
if ( o == m_pDiffTextWindow1 ) m_sd1.setData(text);
else if ( o == m_pDiffTextWindow2 ) m_sd2.setData(text);
else if ( o == m_pDiffTextWindow3 ) m_sd3.setData(text);
init();
}
}
@ -995,7 +995,7 @@ void KDiff3App::slotFileOpen()
TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName() ),
m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(),
TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? TQString("") : m_outputFilename ),
TQT_SLOT(slotConfigure()), m_pOptionDialog );
TQ_SLOT(slotConfigure()), m_pOptionDialog );
/*OpenDialog d(this,
m_sd1.isFromBuffer() ? TQString("") : m_sd1.getAliasName(),
@ -1003,7 +1003,7 @@ void KDiff3App::slotFileOpen()
m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName(),
!m_outputFilename.isEmpty(),
m_bDefaultFilename ? TQString("") : m_outputFilename,
TQT_SLOT(slotConfigure()), m_pOptionDialog );*/
TQ_SLOT(slotConfigure()), m_pOptionDialog );*/
int status = d.exec();
if ( status == TQDialog::Accepted )
{
@ -1296,7 +1296,7 @@ void KDiff3App::choose( int choice )
if ( autoAdvance->isChecked() )
{
m_bTimerBlock = true;
TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQT_SLOT( slotGoNextUnsolvedConflict() ) );
TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQ_SLOT( slotGoNextUnsolvedConflict() ) );
}
}
}
@ -1434,7 +1434,7 @@ void KDiff3App::slotRefresh()
}
if ( m_pDiffWindowSplitter!=0 )
{
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical );
m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical );
}
if ( m_pDirectoryMergeWindow )
{
@ -1447,11 +1447,11 @@ void KDiff3App::slotSelectionStart()
//editCopy->setEnabled( false );
//editCut->setEnabled( false );
const TQObject* s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
if (m_pDiffTextWindow1 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow1)) m_pDiffTextWindow1->resetSelection();
if (m_pDiffTextWindow2 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow2)) m_pDiffTextWindow2->resetSelection();
if (m_pDiffTextWindow3 && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pDiffTextWindow3)) m_pDiffTextWindow3->resetSelection();
if (m_pMergeResultWindow && TQT_BASE_OBJECT_CONST(s)!=TQT_BASE_OBJECT(m_pMergeResultWindow)) m_pMergeResultWindow->resetSelection();
const TQObject* s = sender();
if (m_pDiffTextWindow1 && s!=m_pDiffTextWindow1) m_pDiffTextWindow1->resetSelection();
if (m_pDiffTextWindow2 && s!=m_pDiffTextWindow2) m_pDiffTextWindow2->resetSelection();
if (m_pDiffTextWindow3 && s!=m_pDiffTextWindow3) m_pDiffTextWindow3->resetSelection();
if (m_pMergeResultWindow && s!=m_pMergeResultWindow) m_pMergeResultWindow->resetSelection();
}
void KDiff3App::slotSelectionEnd()
@ -2032,10 +2032,10 @@ void KDiff3App::slotWinToggleSplitterOrientation()
if ( m_pDiffWindowSplitter!=0 )
{
m_pDiffWindowSplitter->setOrientation(
m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical
m_pDiffWindowSplitter->orientation()==TQt::Vertical ? TQt::Horizontal : TQt::Vertical
);
m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal;
m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==TQt::Horizontal;
}
}

@ -57,10 +57,10 @@ OpenDialog::OpenDialog(
m_pLineA->setEditText( KURL(n1).prettyURL() );
m_pLineA->setMinimumSize( 200, m_pLineA->size().height() );
TQPushButton * button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileA() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileA() ) );
TQPushButton * button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirA() ) );
connect( m_pLineA, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) );
connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirA() ) );
connect( m_pLineA, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 0, 0 );
h->addWidget( m_pLineA, 0, 1 );
@ -73,10 +73,10 @@ OpenDialog::OpenDialog(
m_pLineB->setEditText( KURL(n2).prettyURL() );
m_pLineB->setMinimumSize( 200, m_pLineB->size().height() );
button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileB() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileB() ) );
button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirB() ) );
connect( m_pLineB, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) );
connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirB() ) );
connect( m_pLineB, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 1, 0 );
h->addWidget( m_pLineB, 1, 1 );
@ -89,10 +89,10 @@ OpenDialog::OpenDialog(
m_pLineC->setEditText( KURL(n3).prettyURL() );
m_pLineC->setMinimumSize( 200, m_pLineC->size().height() );
button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectFileC() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectFileC() ) );
button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectDirC() ) );
connect( m_pLineC, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(inputFilenameChanged() ) );
connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectDirC() ) );
connect( m_pLineC, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(inputFilenameChanged() ) );
h->addWidget( label, 2, 0 );
h->addWidget( m_pLineC, 2, 1 );
@ -120,7 +120,7 @@ OpenDialog::OpenDialog(
m->insertItem( i18n("Swap %1<->Output").arg("A"), id++ );
m->insertItem( i18n("Swap %1<->Output").arg("B"), id++ );
m->insertItem( i18n("Swap %1<->Output").arg("C"), id++ );
connect( m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSwapCopyNames(int)));
connect( m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwapCopyNames(int)));
button->setPopup(m);
@ -132,13 +132,13 @@ OpenDialog::OpenDialog(
m_pLineOut->setEditText( KURL(outputName).prettyURL() );
m_pLineOut->setMinimumSize( 200, m_pLineOut->size().height() );
button = new TQPushButton( i18n("File..."), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputName() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputName() ) );
button2 = new TQPushButton( i18n("Dir..."), this );
connect( button2, TQT_SIGNAL(clicked()), this, TQT_SLOT( selectOutputDir() ) );
connect( m_pMerge, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(internalSlot(int)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), m_pLineOut, TQT_SLOT(setEnabled(bool)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), button, TQT_SLOT(setEnabled(bool)) );
connect( this, TQT_SIGNAL(internalSignal(bool)), button2, TQT_SLOT(setEnabled(bool)) );
connect( button2, TQ_SIGNAL(clicked()), this, TQ_SLOT( selectOutputDir() ) );
connect( m_pMerge, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(internalSlot(int)) );
connect( this, TQ_SIGNAL(internalSignal(bool)), m_pLineOut, TQ_SLOT(setEnabled(bool)) );
connect( this, TQ_SIGNAL(internalSignal(bool)), button, TQ_SLOT(setEnabled(bool)) );
connect( this, TQ_SIGNAL(internalSignal(bool)), button2, TQ_SLOT(setEnabled(bool)) );
m_pMerge->setChecked( !bMerge );
m_pMerge->setChecked( bMerge );
@ -156,18 +156,18 @@ OpenDialog::OpenDialog(
TQHBoxLayout* l = new TQHBoxLayout( v, 5 );
button = new TQPushButton( i18n("Configure..."), this );
connect( button, TQT_SIGNAL(clicked()), pParent, slotConfigure );
connect( button, TQ_SIGNAL(clicked()), pParent, slotConfigure );
l->addWidget( button, 1 );
l->addStretch(1);
button = new TQPushButton( i18n("&OK"), this );
button->setDefault( true );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( accept() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( accept() ) );
l->addWidget( button, 1 );
button = new TQPushButton( i18n("&Cancel"), this );
connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT( reject() ) );
connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT( reject() ) );
l->addWidget( button,1 );
TQSize sh = sizeHint();
@ -200,8 +200,8 @@ bool OpenDialog::eventFilter(TQObject* o, TQEvent* e)
if ( lst.count() > 0 )
{
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setText( lst[0] );
static_cast<TQLineEdit*>(TQT_TQWIDGET(o))->setFocus();
static_cast<TQLineEdit*>(o)->setText( lst[0] );
static_cast<TQLineEdit*>(o)->setFocus();
}
return true;
@ -376,11 +376,11 @@ FindDialog::FindDialog(TQWidget* pParent)
TQPushButton* pButton = new TQPushButton( i18n("&Search"), this );
layout->addWidget( pButton, line, 0 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
pButton = new TQPushButton( i18n("&Cancel"), this );
layout->addWidget( pButton, line, 1 );
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
hide();
}
@ -399,7 +399,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, autoMergeRegExpToolTip );
m_pAutoMergeRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pAutoMergeRegExpEdit,line,1);
connect( m_pAutoMergeRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pAutoMergeRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Example auto merge line:"), this);
@ -407,7 +407,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, i18n("For auto merge test copy a line as used in your files.") );
m_pAutoMergeExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pAutoMergeExampleEdit,line,1);
connect( m_pAutoMergeExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pAutoMergeExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Match result:"), this);
@ -426,7 +426,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historyStartRegExpToolTip );
m_pHistoryStartRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryStartRegExpEdit,line,1);
connect( m_pHistoryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pHistoryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Example history start line (with leading comment):"), this);
@ -436,7 +436,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
"including the leading comment.") );
m_pHistoryStartExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryStartExampleEdit,line,1);
connect( m_pHistoryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pHistoryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Match result:"), this);
@ -455,7 +455,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historyEntryStartRegExpToolTip );
m_pHistoryEntryStartRegExpEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryEntryStartRegExpEdit,line,1);
connect( m_pHistoryEntryStartRegExpEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pHistoryEntryStartRegExpEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("History sort key order:"), this);
@ -463,7 +463,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQToolTip::add( l, historySortKeyOrderToolTip );
m_pHistorySortKeyOrderEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistorySortKeyOrderEdit,line,1);
connect( m_pHistorySortKeyOrderEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pHistorySortKeyOrderEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Example history entry start line (without leading comment):"), this);
@ -473,7 +473,7 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
++line;
m_pHistoryEntryStartExampleEdit = new TQLineEdit(this);
pGrid->addWidget(m_pHistoryEntryStartExampleEdit,line,1);
connect( m_pHistoryEntryStartExampleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotRecalc()));
connect( m_pHistoryEntryStartExampleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotRecalc()));
++line;
l = new TQLabel(i18n("Match result:"), this);
@ -492,11 +492,11 @@ RegExpTester::RegExpTester( TQWidget* pParent, const TQString& autoMergeRegExpTo
TQPushButton* pButton = new TQPushButton(i18n("OK"), this);
pGrid->addWidget(pButton,line,0);
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
pButton = new TQPushButton(i18n("Cancel"), this);
pGrid->addWidget(pButton,line,1);
connect( pButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
connect( pButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()));
resize( 800, sizeHint().height() );
}
@ -557,7 +557,7 @@ void RegExpTester::slotRecalc()
if ( ! bSuccess )
{
m_pHistoryEntryStartMatchResult->setText( i18n("Opening and closing parentheses don't match in regular expression.") );
m_pHistorySortKeyResult->setText( i18n("") );
m_pHistorySortKeyResult->setText( "" );
return;
}
TQRegExp historyEntryStartRegExp = m_pHistoryEntryStartRegExpEdit->text();
@ -572,7 +572,7 @@ void RegExpTester::slotRecalc()
else
{
m_pHistoryEntryStartMatchResult->setText( i18n("Match failed.") );
m_pHistorySortKeyResult->setText( i18n("") );
m_pHistorySortKeyResult->setText( "" );
}
}

@ -32,7 +32,7 @@ class TQLabel;
class OpenDialog : public TQDialog
{
Q_OBJECT
TQ_OBJECT
public:
OpenDialog(
@ -69,7 +69,7 @@ signals:
class FindDialog : public TQDialog
{
Q_OBJECT
TQ_OBJECT
public:
FindDialog(TQWidget* pParent);
@ -93,7 +93,7 @@ public:
class RegExpTester : public TQDialog
{
Q_OBJECT
TQ_OBJECT
private:
TQLineEdit* m_pAutoMergeRegExpEdit;

@ -1,4 +0,0 @@
doc
kdiff3plugin
po
src

@ -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,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,48 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Emanoil Kotsev <deloptes@gmail.com>, 2020.
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: 2020-07-12 20:05+0000\n"
"Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
"Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-desktop-files/bg/>\n"
"Language: bg\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 4.1.1\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 "Сравни/Обедини файлове/директории с kdiff3"
#. Name
#: src/kdiff3.desktop:3
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 "KDiff3Part"

@ -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: el\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: 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,45 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Slávek Banko <slavek.banko@axis.cz>, 2025.
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: Automatically generated\n"
"Language-Team: none\n"
"Language: es_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 ""
#. 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: 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,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: fr\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 "Composant KDiff3"
#. GenericName
#: src/kdiff3.desktop:5
msgid "Diff/Patch Frontend"
msgstr "Interface graphique à diff / patch"
#. Comment
#: src/kdiff3.desktop:7
msgid "A File And Directory Comparison And Merge Tool"
msgstr "Un outil de comparaison et de fusion de fichiers et dossiers"
#. Name
#: src/kdiff3part.desktop:3
msgid "KDiff3Part"
msgstr "Composant KDiff3"

@ -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,48 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Michele Calgaro <michele.calgaro@yahoo.it>, 2021.
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: 2021-08-27 12:46+0000\n"
"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-desktop-files/it/>\n"
"Language: it\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 4.8\n"
#. Name
#: kdiff3plugin/kdiff3_plugin.desktop:4
msgid "Compare/Merge Files/Directories"
msgstr "Confronta/Unisci File/Directory"
#. Name
#: kdiff3plugin/kdiff3plugin.desktop:4
msgid "Compare/Merge Files/Directories with KDiff3"
msgstr "Confronta/Unisci File/Directory con KDiff3"
#. Name
#: src/kdiff3.desktop:3
msgid "KDiff3"
msgstr "KDiff3"
#. 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 "KDiff3Part"

@ -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,48 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
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: 2024-11-03 20:11+0000\n"
"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-desktop-files/ka/>\n"
"Language: ka\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 4.17\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 "შეადარეთ/შეაერთეთ ფაილები/საქაღალდეები KDiff3-ით"
#. Name
#: src/kdiff3.desktop:3
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 "KDiff3Part"

@ -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,48 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Heimen Stoffels <vistausss@fastmail.com>, 2025.
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: 2025-03-30 11:44+0000\n"
"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
"applications/kdiff3-desktop-files/nl/>\n"
"Language: nl\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 4.17\n"
#. Name
#: kdiff3plugin/kdiff3_plugin.desktop:4
msgid "Compare/Merge Files/Directories"
msgstr "Mappen en bestanden vergelijken/samenvoegen"
#. Name
#: kdiff3plugin/kdiff3plugin.desktop:4
msgid "Compare/Merge Files/Directories with KDiff3"
msgstr "Mappen en bestanden vergelijken/samenvoegen met KDiff3"
#. Name
#: src/kdiff3.desktop:3
msgid "KDiff3"
msgstr "KDiff3"
#. 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 "KDiff3Part"

@ -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,49 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Marek W <coronzon88@gmail.com>, 2021.
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: 2021-10-18 21:31+0000\n"
"Last-Translator: Marek W <coronzon88@gmail.com>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-desktop-files/pl/>\n"
"Language: pl\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%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.8.1\n"
#. Name
#: kdiff3plugin/kdiff3_plugin.desktop:4
msgid "Compare/Merge Files/Directories"
msgstr "Porównaj/Scal Pliki/Katalogi"
#. Name
#: kdiff3plugin/kdiff3plugin.desktop:4
msgid "Compare/Merge Files/Directories with KDiff3"
msgstr "Porównaj/Scal Pliki/Katalogi używając KDiff3"
#. Name
#: src/kdiff3.desktop:3
msgid "KDiff3"
msgstr "KDiff3"
#. 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 "Komponent 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: 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.
# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
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: 2021-12-17 22:00+0000\n"
"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
"weblate/projects/applications/kdiff3-desktop-files/pt_BR/>\n"
"Language: pt_BR\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 4.9.1\n"
#. Name
#: kdiff3plugin/kdiff3_plugin.desktop:4
msgid "Compare/Merge Files/Directories"
msgstr "Comparar/Juntar arquivos/Diretórios"
#. Name
#: kdiff3plugin/kdiff3plugin.desktop:4
msgid "Compare/Merge Files/Directories with KDiff3"
msgstr "Comparar/Juntar arquivos/Diretórios com KDiff3"
#. Name
#: src/kdiff3.desktop:3
msgid "KDiff3"
msgstr "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,49 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Andrei Stepanov <adem4ik@gmail.com>, 2023.
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: 2023-11-29 11:13+0000\n"
"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-desktop-files/ru/>\n"
"Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\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 "Сравнить/объединить файлы или каталоги через KDiff3"
#. Name
#: src/kdiff3.desktop:3
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 "KDiff3Part"

@ -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: tg\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: tr\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 Arayüzü"
#. Comment
#: src/kdiff3.desktop:7
msgid "A File And Directory Comparison And Merge Tool"
msgstr "Bir Dosya Ve Klasör Karşılaştırma Ve Birleştirme Aracı"
#. 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: uk\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,48 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
# Xiao Wenming <xwmde@163.com>, 2022.
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: 2022-09-10 04:56+0000\n"
"Last-Translator: Xiao Wenming <xwmde@163.com>\n"
"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
"weblate/projects/applications/kdiff3-desktop-files/zh_Hans/>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.13.1\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 "使用KDiff3比较/合并文件/目录"
#. Name
#: src/kdiff3.desktop:3
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 ""

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2007-01-17 11:52+0200\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Тройно сливане с основата"
msgid "Compare with ..."
msgstr "Сравняване с ..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Сравняване"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Тройно сравняване"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Относно приставката за KDiff3 ..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Страница в Интернет: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -75,9 +92,9 @@ msgid ""
msgstr ""
"Използване на разширението на контекстното меню:\n"
"За нормално сравняване на два файла, натиснете \"Сравняване\".\n"
"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи в "
"подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за втория "
"файл.\n"
"За тройно сливане първо запишете основния файл, после това, което трябва да се "
"слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
"Ако другият файл е някъде другаде, запазете първият за по-късно. Ще се появи "
"в подменюто \"Сравняване с...\". Тогава използвайте \"Сравняване с\" за "
"втория файл.\n"
"За тройно сливане първо запишете основния файл, после това, което трябва да "
"се слее и натиснете \"Тройно сливане с основата\" на третия файл.\n"
"Същото важи и за сливането и сравняването на директории."

@ -1,14 +1,27 @@
msgid ""
msgstr ""
"Project-Id-Version: all2.po\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2004-09-20 15:44+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
"Language-Team: br <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -35,32 +48,36 @@ msgstr ""
msgid "Compare with ..."
msgstr ""
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr ""
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -4,16 +4,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2007-01-25 19:57+0100\n"
"Last-Translator: Klára Cihlářová <koty@seznam.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..."
msgstr "Porovnat s..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Porovnat"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2006-11-19 16:31-0500\n"
"Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Trevejs sammenfletning med basis"
msgid "Compare with ..."
msgstr "Sammenlign med..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Sammenlign"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Trevejs sammenligning"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menuplugin..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hjemmeside: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -75,10 +92,10 @@ msgid ""
msgstr ""
"Brug af udvidelsen med sammenhængsafhængig menu:\n"
"For nem sammenligning af to markerede filer, vælg \"Sammenlign\".\n"
"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. Den "
"ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med\" for "
"den anden fil.\n"
"Hvis den andre fil findes et andet sted, \"Gem\" den første fil til senere. "
"Den ses i undermenuen \"Sammenlign med...\". Brug derefter \"Sammenlign med"
"\" for den anden fil.\n"
"For en trevejs sammenfletning, \"Gem\" først basisfilen, derefter grenen at "
"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden gren "
"som bruges som mål.\n"
"sammenflette, og vælg \"Trevejs sammenfletning med basis\" for den anden "
"gren som bruges som mål.\n"
"Det samme gælder også for mappesammenligning og sammenfletning."

@ -6,15 +6,29 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2007-01-29 22:54+0100\n"
"Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2019-11-23 12:55+0000\n"
"Last-Translator: Chris <xchrisx@uber.space>\n"
"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/de/>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.9.1\n"
#. 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)"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
@ -42,19 +56,23 @@ msgstr "3-Wege-Vergleich mit Base"
msgid "Compare with ..."
msgstr "Vergleichen mit ..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Liste löschen"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Vergleich"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-Wege-Vergleich"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Über das KDiff3 Menü-Modul ..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -64,13 +82,13 @@ msgstr ""
"KDiff3 Internetseite: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -79,13 +97,13 @@ msgstr ""
"Verwendung der Kontextmenü-Erweiterung:\n"
"Für einen einfachen Vergleich zweier ausgewählter Dateien wählen Sie "
"\"Vergleichen\".\n"
"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste Datei "
"zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
"Wenn sich die andere Datei woanders befindet, \"Speichern\" Sie die erste "
"Datei zur späteren Verwendung. Sie wird im Untermenü \"Vergleichen mit ...\" "
"erscheinen. Anschließend verwenden Sie mit der zweiten Datei die Funktion "
"\"Vergleichen mit\".\n"
"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die "
"Basis-Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit "
"der zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
"Um eine 3-Wege-Zusammenführung durchzuführen, \"Speichern\" Sie die Basis-"
"Datei, dann die zusammenzuführende Verzweigung und dann wählen Sie mit der "
"zweiten Verzweigung die Funktion \"3-Wege-Zusammenführung mit Basis\". Das "
"Ziel der Zusammenführung ist die zuletzt gewählte Verzweigung.\n"
"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen von "
"Ordnern."
"Auf die gleiche Weise funktioniert auch das Vergleichen und Zusammenführen "
"von Ordnern."

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2006-11-19 17:37+0200\n"
"Last-Translator: Spiros Georgaras <sngeorgaras@otenet.gr>\n"
"Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Τριπλή συγχώνευση με βάση"
msgid "Compare with ..."
msgstr "Σύγκριση με..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Σύγκριση"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "τριπλή σύγκριση"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Σχετικά με το πρόσθετο μενού του KDiff3..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Ιστοσελίδα του KDiff3: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -75,10 +92,10 @@ msgid ""
msgstr ""
"Χρήση της επέκτασης μενού:\n"
"Για απλή σύγκριση 3 επιλεγμένων αρχείων επιλέξτε το \"Σύγκριση\".\n"
"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο για "
"αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
"Αν το δεύτερο αρχείο βρίσκεται κάπου αλλού, \"Αποθηκεύστε\" το πρώτο αρχείο "
"για αργότερα. Θα εμφανιστεί στο υπομενού \"Σύγκριση με...\". Στη συνέχεια "
"χρησιμοποιήστε το \"Σύγκριση με\" στο δεύτερο αρχείο.\n"
"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον προς "
"συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο κλάδο, ο "
"οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
"Για να κάνετε τριπλή συγχώνευση \"Αποθηκεύστε\" το αρχείο βάσης, και τον "
"προς συγχώνευση κλάδο και επιλέξτε \"Τριπλή συγχώνευση με βάση\" στον άλλο "
"κλάδο, ο οποίος θα χρησιμοποιηθεί ως προορισμός.\n"
"Τα παραπάνω ισχύουν για για τη σύγκριση και συγχώνευση καταλόγων."

@ -0,0 +1,89 @@
# SOME DESCRIPTIVE TITLE.
# Slávek Banko <slavek.banko@axis.cz>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: es_AR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr ""
#: kdiff3plugin.cpp:104
#, c-format
msgid "Compare with %1"
msgstr ""
#: kdiff3plugin.cpp:109
#, c-format
msgid "Merge with %1"
msgstr ""
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr ""
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr ""
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr ""
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr ""
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
"Same also applies to directory comparison and merge."
msgstr ""

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2006-12-07 02:19+0200\n"
"Last-Translator: Marek Laane <bald@starman.ee>\n"
"Language-Team: Estonian <kde-et@linux.ee>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Kolme faili ühendamine baasiga"
msgid "Compare with ..."
msgstr "Võrdle failiga..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Võrdle"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Kolme faili võrdlemine"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menüüplugina info..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -60,13 +77,13 @@ msgstr ""
"KDiff3 menüüplugin: autoriõigus (C) 2006 Joachim Eibl\n"
"KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -77,7 +94,7 @@ msgstr ""
"Kui teine fail asub kuskil mujal, \"salvesta\" esimene fail hilisemaks "
"kasutamiseks. See ilmub alammenüüsse \"Võrdle failiga...\" Seejärel kasuta "
"teise faili jaoks käsku \"Võrdle failiga\".\n"
"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel ühendatav "
"variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, mida kasutatakse "
"sihtfailina.\n"
"Kolme faili ühendamiseks \"salvesta\" kõigepealt baasfail, seejärel "
"ühendatav variant ja vali \"Kolme faili ühendamine baasiga\" variandiga, "
"mida kasutatakse sihtfailina.\n"
"Sama käib kataloogide võrdlemise ja ühendamise kohta."

@ -1,14 +1,27 @@
msgid ""
msgstr ""
"Project-Id-Version: extragear-utils/kdiff3_plugin.po\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2006-11-19 07:45-0500\n"
"Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -35,19 +48,23 @@ msgstr ""
msgid "Compare with ..."
msgstr "Cuir i gcomparáid le ..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Cuir i gComparáid"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparáid trí bhealach"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -57,13 +74,13 @@ msgstr ""
"Leathanach Baile KDiff3: http://kdiff3.sourceforge.net/\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -4,19 +4,33 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2006-11-22 07:28+0100\n"
"Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\n"
"Language-Team: Italian <kde-i18n-it@kde.org>\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2019-05-30 18:15+0000\n"
"Last-Translator: stefano <ifx@lazytux.it>\n"
"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/it/>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 3.6.1\n"
#. 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 "idefix"
#. 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 "ifx@lazytux.it"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
msgstr "Kdiff3"
#: kdiff3plugin.cpp:104
#, c-format
@ -40,36 +54,40 @@ msgstr "Fusione a tre con base"
msgid "Compare with ..."
msgstr "Confronta con..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "pulisci lista"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Confronta"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Confronto a tre"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Informazioni sul plugin KDiff3 per menu..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"Plugin KDiff3 per menu: Copyright 2006 Joachim Eibl\n"
"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">"
"kdiff3.sourceforge.net</a>\n"
"Pagina Web di KDiff3: <a href=\"http://kdiff3.sourceforge.net\">kdiff3."
"sourceforge.net</a>\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -77,8 +95,9 @@ msgid ""
msgstr ""
"Usare l'estensione del menu contestuale:\n"
"Per un semplice confronto di due file selezionati scegli \"Confronta\".\n"
"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà nel "
"sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo file.\n"
"Se l'altro file è da qualche altra parte, \"Memorizza\" il primo. Apparirà "
"nel sottomenu \"Confronta con...\". Poi usa \"Confronta con\" sul secondo "
"file.\n"
"Per una fusione a tre, prima \"Memorizza\" il file di base, poi il ramo da "
"fondere, e scegli \"Fusione a tre con base\" sul ramo di destinazione.\n"
"Lo stesso vale per il confronto e la fusione tra cartelle."

@ -0,0 +1,102 @@
# SOME DESCRIPTIVE TITLE.
# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2024-11-09 08:10+0000\n"
"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/ka/>\n"
"Language: ka\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 4.17\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 "თემური დოღონაძე"
#. 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 "temuri.doghonadze@gmail.com"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
#: kdiff3plugin.cpp:104
#, c-format
msgid "Compare with %1"
msgstr "%1-სთან შედარება"
#: kdiff3plugin.cpp:109
#, c-format
msgid "Merge with %1"
msgstr "%1-სთან შერწყმა"
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr "'%1'-ის შენახვა"
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr "3-მხრივი შერწყმა ბაზით"
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr "შედარება რასთან..."
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "სიის გასუფთავება"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "შედარება"
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-მხრივი შედარება"
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3-ის მენიუს დამატების შესახებ ..."
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"KDiff3 მენიუს დამატება: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3-ის ვებგვერდი: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp: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 ""
"კონტექსტური მენიუს გაფართოების გამოყენება:\n"
"2 ფაილის მარტივად შესადარებლად აირჩიეთ \"შედარება\"\n"
"თუ სხვა ფაილი სადმე სხვაგანაა, \"შენახვა\" ჯერ პირველ ფაილს შეინახავს. ის "
"გამოჩნდება \"შედარება ფაილთან...\" ქვემენუში. შემდეგ გამოიყენეთ \"შედარება "
"რასთან\" მეორე ფაილზე.\n"
"სამმხრივი შერწყმისთვის ჯერ \"შეინახეთ\" საბაზისო ფაილი, შემდეგ ბრენჩი "
"შესარწყმელად და აირჩიეთ \"სამმხრივი შერწყმა საბაზისოსთან\" სხვა ბრენჩზე, "
"რომელიც სამიზნედ იქნება გამოყენებული.\n"
"იგივე ეხება საქაღალდეების შედარებასა და შერწყმას."

@ -1,22 +1,35 @@
# translation of kdiff3_plugin.po to Slovak
# SOME DESCRIPTIVE TITLE.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Richard Fric <Richard.Fric@kdemail.net>, 2006.
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2006-11-19 16:30+0100\n"
"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
"Language-Team: Slovak <sk@li.org>\n"
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+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=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
msgstr ""
#: kdiff3plugin.cpp:104
#, c-format
@ -40,32 +53,36 @@ msgstr ""
msgid "Compare with ..."
msgstr ""
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr ""
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr ""
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -1,18 +1,33 @@
# translation of kdiff3_plugin.po to Dutch
#
# Rinse de Vries <rinsedevries@kde.nl>, 2006.
# Heimen Stoffels <vistausss@fastmail.com>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2006-11-27 00:11+0100\n"
"Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-03-30 11:44+0000\n"
"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
"Language-Team: Dutch <https://mirror.git.trinitydesktop.org/weblate/projects/"
"applications/kdiff3-plugin/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.17\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 ",Heimen Stoffels"
#. 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 ",vistausss@fastmail.com"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
@ -30,58 +45,62 @@ msgstr "Samenvoegen met %1"
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr "'%1' voor later gebruik opslaan"
msgstr "%1 opslaan voor later gebruik"
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr "3-weg samenvoeging met basis"
msgstr "3-wegsamenvoeging met basis"
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr "Vergelijken met..."
msgstr "Vergelijken met…"
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Lijst wissen"
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Vergelijken"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-weg vergelijking"
msgstr "3-wegvergelijking"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Info over KDiff3-menuplugin..."
msgstr "Over KDiff3-menuplug-in…"
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"KDif3-menuplugin: Copyright (C) 2006 Joachim Eibl\n"
"KDif3-menuplug-in: copyright (C) 2006 Joachim Eibl\n"
"KDiff3-website: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
"Same also applies to directory comparison and merge."
msgstr ""
"De contextmenu-extensie gebruiken:\n"
"Gebruik van de rechtermuisknopextensie:\n"
"Voor eenvoudige vergelijking van 2 geselecteerde bestanden, kies "
"\"Vergelijken\".\n"
"Als het bestand ergens anders staat, sla dan het eerste bestand voor later "
"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". Gebruik "
"daarna \"Vergelijken met\" voor het tweede bestand.\n"
"gebruik op. Het zal verschijnen in het submenu \"Vergelijken met...\". "
"Gebruik daarna \"Vergelijken met\" voor het tweede bestand.\n"
"Voor een 3-weg samenvoeging, sla eerst het basisbestand op, daarna de tak om "
"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de tak "
"die gebruikt zal worden als bestemming.\n"
"mee samen te voegen en kies daarna \"3-weg samenvoeging met basis\" op de "
"tak die gebruikt zal worden als bestemming.\n"
"Bovenstaande is ook van toepassing op het vergelijken en samenvoegen van "
"directories."

@ -0,0 +1,107 @@
# SOME DESCRIPTIVE TITLE.
# Jan Stolarek <jan.stolarek@mailbox.org>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-03-24 23:32+0000\n"
"Last-Translator: Jan Stolarek <jan.stolarek@mailbox.org>\n"
"Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/pl/>\n"
"Language: pl\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%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.17\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 "Jan Stolarek"
#. 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 "jan.stolarek@mailbox.org"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
#: kdiff3plugin.cpp:104
#, c-format
msgid "Compare with %1"
msgstr "Porównaj z %1"
#: kdiff3plugin.cpp:109
#, c-format
msgid "Merge with %1"
msgstr "Scal z %1"
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr "Zapamiętaj %1 na później"
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr "Scalenie trójstronne z plikiem bazowym"
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr "Porównaj z ..."
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Wyczyść listę"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Porównaj"
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Porównanie trójstronne"
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "O pluginie menu do KDiff3 ..."
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"Plugin Menu do KDiff3 : Copyright (C) 2006 Joachim Eibl\n"
"Strona domowa KDiff3: 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 ""
"Korzystanie z rozszerzenia menu kontekstowego:\n"
"W celu porównania dwóch plików w tym samym katalogu zaznacz je i wybierz "
"\"Porównaj\".\n"
"Jeśli pliki do porównania znajdują się w różnych katalogach, kliknij "
"pierwszy z nich i wybierz \"Zapamiętaj <nazwa_pliku> na później\". Od tej "
"pory plik będzie dostępny w menu jako \"Porównaj z <nazwa_pliku>\". Kliknij "
"drugi plik do porównania i wybierz \"Porównaj z <nazwa_pliku>\".\n"
"W przypadku trójstronnego scalania (3-way merge) zapamiętaj plik który "
"posłuży za bazę. Potem zapamiętaj plik do scalenia z pierwszej gałęzi. Na "
"koniec wybierz plik do scalenia z drugiej gałęzi i kliknij \"Scalenie "
"trójstronne z plikiem bazowym\". Trzeci plik będzie jednocześnie plikiem "
"docelowym.\n"
"Porównywanie i scalanie katalogów działa identycznie."

@ -1,15 +1,31 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2006-11-19 14:49+0000\n"
"Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
"Language-Team: pt <kde-i18n-pt@kde.org>\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2020-01-05 23:45+0000\n"
"Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
"Language-Team: Portuguese <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/pt/>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.10\n"
"X-POFile-SpellExtra: Eibl Joachim KDiff\n"
#. 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 "Hugo Carvalho"
#. 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 "hugokarvalho@hotmail.com"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -36,19 +52,23 @@ msgstr "Junção de 3-vias com a base"
msgid "Compare with ..."
msgstr "Comparar com ..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Limpar lista"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Comparar"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparação de 3 vias"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Acerca do 'plugin' do menu do KDiff3 ..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -58,13 +78,13 @@ msgstr ""
"Página Web do KDiff3: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -77,6 +97,6 @@ msgstr ""
"ficheiro para mais tarde. Este irá aparecer no submenu \"Comparar Com ...\". "
"Depois, use o \"Comparar Com\" no segundo ficheiro.\n"
"Para uma junção de 3 vias, primeiro escolha \"Gravar\" o ficheiro de base, "
"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" na "
"outra ramificação que será usada como destino.\n"
"depois a ramificação a juntar e finalmente \"junção de 3 vias com a base\" "
"na outra ramificação que será usada como destino.\n"
"O mesmo se aplica também à comparação e junção de pastas."

@ -1,18 +1,33 @@
# translation of kdiff3_plugin.po to Brazilian Portuguese
#
# Diniz Bortolotto <diniz.bb@gmail.com>, 2006.
# Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>, 2021.
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"PO-Revision-Date: 2006-11-26 22:39-0200\n"
"Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2021-12-17 22:00+0000\n"
"Last-Translator: Sebastião Guerra <sebastiao.luiz.guerra@gmail.com>\n"
"Language-Team: Portuguese (Brazil) <https://mirror.git.trinitydesktop.org/"
"weblate/projects/applications/kdiff3-plugin/pt_BR/>\n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.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 "Sebastião Guerra"
#. 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 "sebastiao.luiz.guerra@gmail.com"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
@ -40,19 +55,23 @@ msgstr "Mesclagem de 3-vias com a base"
msgid "Compare with ..."
msgstr "Comparar com ..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Limpar lista"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Comparar"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Comparação de 3 vias"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Sobre KDiff3 menu plugin ..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -62,13 +81,13 @@ msgstr ""
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -76,9 +95,9 @@ msgid ""
msgstr ""
"Usando a extensão menu de contexto:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -0,0 +1,105 @@
# SOME DESCRIPTIVE TITLE.
# Andrei Stepanov <adem4ik@gmail.com>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-06-28 04:16+0000\n"
"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/kdiff3-plugin/ru/>\n"
"Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.18.2\n"
#. 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 "adem4ik@gmail.com"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
#: kdiff3plugin.cpp:104
#, c-format
msgid "Compare with %1"
msgstr "Сравнить с %1"
#: kdiff3plugin.cpp:109
#, c-format
msgid "Merge with %1"
msgstr "Объединить с %1"
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr "Сохранить «%1» на потом"
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr "3-стороннее слияние с базой"
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr "Сравнить с…"
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "Очистить список"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Сравнить"
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3-стороннее сравнение"
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "О модуле меню KDiff3…"
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"Модуль меню KDiff3: Авторское право (C) 2006 Йоахим Эйбл\n"
"Домашняя страница KDiff3: 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 ""
"Использование расширения контекстного меню:\n"
"Для простого сравнения двух выбранных файлов выберите «Сравнить».\n"
"Если другой файл находится в другом месте, «Сохраните» первый файл на потом. "
"Он появится в подменю «Сравнить с…». Затем используйте «Сравнить с» для "
"второго файла.\n"
"Для трёхстороннего слияния сначала «Сохраните» базовый файл, затем ветвь для "
"объединения и выберите «3-стороннее слияние с базой» в другой ветви, которая "
"будет использоваться в качестве конечной.\n"
"То же самое относится и к сравнению каталогов и слиянию."

@ -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ý."

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2006-11-19 20:10+0100\n"
"Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "Kdiff3"
@ -39,19 +52,23 @@ msgstr "Trevägs sammanfogning med bas"
msgid "Compare with ..."
msgstr "Jämför med..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Jämför"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "Trevägs jämförelse"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "Om Kdiff3-menyinsticksprogram..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"Kdiff3 hemsida: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"
@ -76,9 +93,9 @@ msgstr ""
"Användning av utökningen med sammanhangsberoende meny:\n"
"För enkel jämförelse av två markerade filer, välj \"Jämför\".\n"
"Om den andra filen finns någon annanstans, \"Spara\" den först filen till "
"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med\" "
"för den andra filen.\n"
"senare. Den syns i undermenyn \"Jämför med...\". Använd därefter \"Jämför med"
"\" för den andra filen.\n"
"För en trevägs sammanfogning, \"Spara\" först basfilen, därefter grenen att "
"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen som "
"används som mål.\n"
"sammanfoga, och välj \"Trevägs sammanfogning med bas\" för den andra grenen "
"som används som mål.\n"
"Detsamma gäller också för katalogjämförelse och sammanfogning."

@ -4,15 +4,28 @@
msgid ""
msgstr ""
"Project-Id-Version: kdiff3_plugin\n"
"POT-Creation-Date: 2006-11-19 08:46+0100\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2007-01-21 21:58+0200\n"
"Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
"Language-Team: Türkçe <yerellestirme@kde.org.tr>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
#. 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 ""
#. 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 ""
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
@ -39,19 +52,23 @@ msgstr "Temel ile 3-yollu birleştirme"
msgid "Compare with ..."
msgstr "Karşılaştır..."
#: kdiff3plugin.cpp:137
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr ""
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "Karşılaştır"
#: kdiff3plugin.cpp:142
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr "3 yollu karşılaştırma"
#: kdiff3plugin.cpp:145
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "KDiff3 menü eklentisi hakkında ..."
#: kdiff3plugin.cpp:240
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
@ -61,13 +78,13 @@ msgstr ""
"KDiff3 ana sayfası: http://kdiff3.sourceforge.net\n"
"\n"
#: kdiff3plugin.cpp:242
#: kdiff3plugin.cpp:252
msgid ""
"Using the contextmenu extension:\n"
"For simple comparison of two selected 2 files choose \"Compare\".\n"
"If the other file is somewhere else \"Save\" the first file for later. It will "
"appear in the \"Compare With ...\" submenu. Then use \"Compare With\" on second "
"file.\n"
"If the other file is somewhere else \"Save\" the first file for later. It "
"will appear in the \"Compare With ...\" submenu. Then use \"Compare With\" "
"on second file.\n"
"For a 3-way merge first \"Save\" the base file, then the branch to merge and "
"choose \"3-way merge with base\" on the other branch which will be used as "
"destination.\n"

@ -0,0 +1,94 @@
# SOME DESCRIPTIVE TITLE.
# Xiao Wenming <xwmde@163.com>, 2022.
# Toad114514 <xiaolan2332021@163.com>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2020-05-11 04:19+0200\n"
"PO-Revision-Date: 2025-01-27 17:12+0000\n"
"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n"
"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
"weblate/projects/applications/kdiff3-plugin/zh_Hans/>\n"
"Language: zh_Hans\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 4.17\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 "您的名字"
#. 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 "您的电子邮件"
#: kdiff3plugin.cpp:97
msgid "KDiff3"
msgstr "KDiff3"
#: kdiff3plugin.cpp:104
#, c-format
msgid "Compare with %1"
msgstr "与%1比较"
#: kdiff3plugin.cpp:109
#, c-format
msgid "Merge with %1"
msgstr "与%1合并"
#: kdiff3plugin.cpp:114
msgid "Save '%1' for later"
msgstr "一会再保存 '%1'"
#: kdiff3plugin.cpp:119
msgid "3-way merge with base"
msgstr ""
#: kdiff3plugin.cpp:125
msgid "Compare with ..."
msgstr "与 ... 比较 ..."
#: kdiff3plugin.cpp:134
msgid "Clear list"
msgstr "清除列表"
#: kdiff3plugin.cpp:141
msgid "Compare"
msgstr "比较"
#: kdiff3plugin.cpp:146
msgid "3 way comparison"
msgstr ""
#: kdiff3plugin.cpp:149
msgid "About KDiff3 menu plugin ..."
msgstr "关于 KDiff3 菜单插件 …"
#: kdiff3plugin.cpp:250
msgid ""
"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
"KDiff3 homepage: http://kdiff3.sourceforge.net\n"
"\n"
msgstr ""
"KDiff3 菜单插件: 版权所有 (C) 2006 Joachim Eibl\n"
"KDiff3 主页: 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 ""
Loading…
Cancel
Save