diff --git a/ChangeLog b/ChangeLog old mode 100755 new mode 100644 diff --git a/README b/README index cf0a1c4..97e2c57 100644 --- a/README +++ b/README @@ -11,7 +11,7 @@ KDiff3 is a program that - 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 KDE-KIO (ftp, sftp, http, fish, smb) +- 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.) @@ -222,7 +222,7 @@ Requirements & Installation: 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 KIO-support stick to the + If you need KDE-specific features like TDEIO-support stick to the normal version 0.9.91. Build-instructions (Unix or Mac): diff --git a/acinclude.m4 b/acinclude.m4 index 23739c3..9340080 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2070,35 +2070,35 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEABC, "-ltdeabc") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-ltdednssd") - AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") + AC_SUBST(LIB_TDEDNSSD, "-ltdednssd") + AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest") # these are for backward compatibility - AC_SUBST(LIB_KSYCOCA, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdeio") AC_SUBST(LIB_TDEFILE, "-ltdeio") elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDEIO, "-ltdeio") + AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_TDEFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_TDEHTML, "-ltdehtml") - AC_SUBST(LIB_KSPELL, "-ltdespell") - AC_SUBST(LIB_KPARTS, "-ltdeparts") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/doc/da/index.docbook b/doc/da/index.docbook index 10c0757..2884f2f 100644 --- a/doc/da/index.docbook +++ b/doc/da/index.docbook @@ -80,7 +80,7 @@ Do NOT change these in the translation. --> > tilbyder netværksgennemsigtighed via KIO,tilbyder netværksgennemsigtighed via TDEIO, kpart kio +>tdeio netværksgennemsigtighed Netværksgennemsigtighed via KIO.Netværksgennemsigtighed via TDEIO. Diverse emner Netværksgennemsigtighed via KIO +>Netværksgennemsigtighed via TDEIO I/O-slaver diff --git a/doc/de/index.docbook b/doc/de/index.docbook index 1192e87..cb442c8 100644 --- a/doc/de/index.docbook +++ b/doc/de/index.docbook @@ -97,7 +97,7 @@ Do NOT change these in the translation. --> > ist mit Hilfe von KIO Netzwerktransparent,ist mit Hilfe von TDEIO Netzwerktransparent, kpart kio +>tdeio netzwerktransparent Netzwerktransparenz durch KIO.Netzwerktransparenz durch TDEIO. Verschiedene Themen Netzwerktransparenz via KIO +>Netzwerktransparenz via TDEIO KIO-Slaves +>TDEIO-Slaves KDE unterstützt Netzwerktransparenz mit Hilfe von KIO-Slaves. KDiff3 benutzt dies zum Einlesen von Dateien und Ordnern. Auf diese Weise können Sie Dateien und Ordner zum Öffnen angeben, die sich auf lokalen oder entfernten Rechnern befinden. KDE unterstützt Netzwerktransparenz mit Hilfe von TDEIO-Slaves. KDiff3 benutzt dies zum Einlesen von Dateien und Ordnern. Auf diese Weise können Sie Dateien und Ordner zum Öffnen angeben, die sich auf lokalen oder entfernten Rechnern befinden. Beispiel: @@ -2093,7 +2093,7 @@ Options: Die erste Kommandozeile vergleicht eine lokale Datei mit einer auf einem FTP-Server. Die zweite Kommandozeile vergleicht einen Ordner innerhalb eines komprimierten Archivs mit einem lokalen Ordner. Weitere interessante KIO-Slaves sind: +>Weitere interessante TDEIO-Slaves sind: Fähigkeiten von KIO-Slaves +>Fähigkeiten von TDEIO-Slaves Netzwerktransparenz hat auch einen Nachteil: Nicht alle Ressourcen haben die gleichen Fähigkeiten. Compilation and Installation
Compilation and Installation
Installation

Compilation and Installation

In order to compile and install KDiff3 on a system with KDE, type the +Compilation and Installation

Compilation and Installation
Installation

Compilation and Installation

In order to compile and install KDiff3 on a system with KDE, type the following in the base directory of the KDiff3 distribution:

% ./configure --prefix=kde-dir
 % make
 % make install
diff --git a/doc/en/credits.html b/doc/en/credits.html
index ed7c389..36f86e4 100644
--- a/doc/en/credits.html
+++ b/doc/en/credits.html
@@ -1,4 +1,4 @@
-Chapter 6. Credits and License
Credits and License
Chapter 6. Credits and License

+Chapter 6. Credits and License
Credits and License
Chapter 6. Credits and License

 KDiff3 - File and Directory Comparison and Merge Tool
 

 Program copyright 2002-2007 Joachim Eibl 
diff --git a/doc/en/dirmerge.html b/doc/en/dirmerge.html
index e862018..995a580 100644
--- a/doc/en/dirmerge.html
+++ b/doc/en/dirmerge.html
@@ -1,4 +1,4 @@
-Chapter 3. Directory Comparison and Merge with KDiff3
Directory Comparison and Merge with KDiff3
Chapter 3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge

+Chapter 3. Directory Comparison and Merge with KDiff3
Directory Comparison and Merge with KDiff3
Chapter 3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge

    Often programmers must modify many files in a directory to achieve their
    purpose. For this KDiff3 also lets you compare and merge complete directories
    recursively!
diff --git a/doc/en/dirmergeoptions.html b/doc/en/dirmergeoptions.html
index 5a4aa6c..2e40cd7 100644
--- a/doc/en/dirmergeoptions.html
+++ b/doc/en/dirmergeoptions.html
@@ -1,4 +1,4 @@
-Options for Comparing and Merging Directories
Options for Comparing and Merging Directories
Directory Comparison and Merge with KDiff3
Options for Comparing and Merging Directories

+Options for Comparing and Merging Directories
Options for Comparing and Merging Directories
Directory Comparison and Merge with KDiff3
Options for Comparing and Merging Directories

    The KDiff3-preferences (menu "Settings"->"Configure KDiff3") has
    a section called "Directory Merge" with these options:
 
Recursive Directories:
 Select whether to search directories
diff --git a/doc/en/dirmergevisible.html b/doc/en/dirmergevisible.html
index 5e530b2..8a6687c 100644
--- a/doc/en/dirmergevisible.html
+++ b/doc/en/dirmergevisible.html
@@ -1,4 +1,4 @@
-Directory Merge Visible Information
Directory Merge Visible Information
Directory Comparison and Merge with KDiff3
Directory Merge Visible Information

+Directory Merge Visible Information
Directory Merge Visible Information
Directory Comparison and Merge with KDiff3
Directory Merge Visible Information

    While reading the directories a message-box appears that informs you of
    the progress. If you abort the directory scan, then only files that have
    been  compared until then will be listed.
diff --git a/doc/en/documentation.html b/doc/en/documentation.html
index 304bfe6..969cf42 100644
--- a/doc/en/documentation.html
+++ b/doc/en/documentation.html
@@ -1,4 +1,4 @@
-Chapter 2. File Comparison And Merge
File Comparison And Merge
Chapter 2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
+Chapter 2. File Comparison And Merge
File Comparison And Merge
Chapter 2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
    kdiff3 file1 file2
 
Merging 2 files: 
    kdiff3 file1 file2 -m
diff --git a/doc/en/dothemerge.html b/doc/en/dothemerge.html
index 8951356..3d965d5 100644
--- a/doc/en/dothemerge.html
+++ b/doc/en/dothemerge.html
@@ -1,4 +1,4 @@
-Doing A Directory Merge
Doing A Directory Merge
Directory Comparison and Merge with KDiff3
Doing A Directory Merge

+Doing A Directory Merge
Doing A Directory Merge
Directory Comparison and Merge with KDiff3
Doing A Directory Merge

    You can either merge the currently selected item (file or directory), or all items.
    When you have made all your operation choices (in all subdirectories too)
    then you can start the merge.
diff --git a/doc/en/faq.html b/doc/en/faq.html
index 78df594..5e170e9 100644
--- a/doc/en/faq.html
+++ b/doc/en/faq.html
@@ -1,4 +1,4 @@
-Chapter 5. Questions and Answers
Questions and Answers
Chapter 5. Questions and Answers
This document may have been updated since your installation.
+Chapter 5. Questions and Answers
Questions and Answers
Chapter 5. Questions and Answers
This document may have been updated since your installation.
 You can find the latest version at http://docs.kde.org/development/en/extragear-utils/.
5.1. 
    Why is it called "KDiff3"?
 
5.2. 
diff --git a/doc/en/features.html b/doc/en/features.html
index 6007450..598ac5f 100644
--- a/doc/en/features.html
+++ b/doc/en/features.html
@@ -1,4 +1,4 @@
-More Features
More Features
Introduction
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
By using the possiblities of a graphical color display KDiff3 shows
+More Features
More Features
Introduction
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
By using the possiblities of a graphical color display KDiff3 shows
    exactly what the difference is. When you have to do many code-reviews, you will like this.
 
 See White-Space Differences At One Glance
Spaces and tabs that differ appear visibly. When lines differ only
    in  the  amount of white space this can be seen at one look in the summary
@@ -18,5 +18,5 @@
    You can  also select more than one source. Since this output window is an
    editor even  conflicts which need further corrections can be solved here without
    requiring  another tool.
-
And ...
  • Fast navigation via buttons.
  • A mouse-click into a summary column sync's all windows to show the same position.
  • Select and copy from any window and paste into the merge result window.
  • Overview column that shows where the changes and conflicts are.
  • The colors are adjustable to your specific preferences.
  • Adjustable Tab size.
  • Option to insert spaces instead of tabs.
  • Open files comfortably via dialog or specify files on the command line.
  • Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
  • Show the line numbers for each line. 
  • Paste clipboard or drag text into a diff input window.
  • Networktransparency via KIO.
  • Can be used as diff-viewer in KDevelop 3.
  • Word-wrap for long lines.
  • Support for Unicode, UTF-8 and other codecs.
  • Support for right to left languages.
  • ...
Screenshots and Features 
 File Comparison And Merge
Up


Would you like to make a comment or contribute an update to this page?

+
And ...
  • Fast navigation via buttons.
  • A mouse-click into a summary column sync's all windows to show the same position.
  • Select and copy from any window and paste into the merge result window.
  • Overview column that shows where the changes and conflicts are.
  • The colors are adjustable to your specific preferences.
  • Adjustable Tab size.
  • Option to insert spaces instead of tabs.
  • Open files comfortably via dialog or specify files on the command line.
  • Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
  • Show the line numbers for each line. 
  • Paste clipboard or drag text into a diff input window.
  • Networktransparency via TDEIO.
  • Can be used as diff-viewer in KDevelop 3.
  • Word-wrap for long lines.
  • Support for Unicode, UTF-8 and other codecs.
  • Support for right to left languages.
  • ...
Screenshots and Features 
 File Comparison And Merge
Up


Would you like to make a comment or contribute an update to this page?

         Send feedback to the KDE Docs Team

\ No newline at end of file
diff --git a/doc/en/find.html b/doc/en/find.html
index b38c6fe..330cfbe 100644
--- a/doc/en/find.html
+++ b/doc/en/find.html
@@ -1,4 +1,4 @@
-Finding Strings
Finding Strings
File Comparison And Merge
Finding Strings

+Finding Strings
Finding Strings
File Comparison And Merge
Finding Strings

    You can search for a string in any text-window of KDiff3. The "Find ..."-command
    (Ctrl-F) in the Edit-menu opens a dialog that lets you specify the string
    to search for. You can also select the windows which should be searched.
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 50425ed..a5dc316 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -56,7 +56,7 @@ Do NOT change these in the translation. -->
 shows the differences line by line and character by character(!),
 provides an automatic merge-facility,
 has an editor for comfortable solving of merge-conflicts,
-provides networktransparency via KIO,
+provides networktransparency via TDEIO,
 has options to highlight or hide changes in white-space or comments,
 supports Unicode, UTF-8 and other file encodings,
 prints differences,
@@ -87,7 +87,7 @@ Please at least include KDE, the KDE package it is in, the name
 in-line-differences
 synchronise
 kpart
-kio
+tdeio
 networktransparent
 editor
 white space
@@ -219,7 +219,7 @@ This screenshot shows &kdiff3; during a directory merge:
    Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)
    Show the line numbers for each line. 
    Paste clipboard or drag text into a diff input window.
-   Networktransparency via KIO.
+   Networktransparency via TDEIO.
    Can be used as diff-viewer in KDevelop 3.
    Word-wrap for long lines.
    Support for Unicode, UTF-8 and other codecs.
@@ -1795,10 +1795,10 @@ So this is what this program can do for you: &kdiff3; ...
 
 Miscellaneous Topics
 
-Networktransparency via KIO
-KIO-Slaves
+Networktransparency via TDEIO
+TDEIO-Slaves
 
-KDE supports networktransparency via KIO-slaves. &kdiff3; uses this
+KDE supports networktransparency via TDEIO-slaves. &kdiff3; uses this
 for reading input files and for scanning directories.
 This means that you can specify files and directories on local and
 remote resources via URLs.
@@ -1813,7 +1813,7 @@ Example:
 The first line compares a local file with a file on an FTP-server. The second line
 compares a directory within an compressed archive with a local directory.
 
-Other KIO-slaves that are interesting are:
+Other TDEIO-slaves that are interesting are:
 
 
 Files from the WWW (http:),
@@ -1850,7 +1850,7 @@ Other things that are possible, but probably less useful are:
 
 
 
-Capabilities of KIO-Slaves
+Capabilities of TDEIO-Slaves
 
    Networktransparency has one drawback: Not all ressources have the same cababilities.
 
diff --git a/doc/en/index.html b/doc/en/index.html
index 404e0af..04a04f6 100644
--- a/doc/en/index.html
+++ b/doc/en/index.html
@@ -1,16 +1,16 @@
 The KDiff3 Handbook
The KDiff3 Handbook
The KDiff3 Handbook
Joachim Eibl 
Revision 0.9.92 (2007-31-03)
Copyright © 2002-2007 Joachim Eibl
Permission is granted to copy, distribute and/or modify this
+">
The KDiff3 Handbook
The KDiff3 Handbook
Joachim Eibl 
Revision 0.9.92 (2007-31-03)
Copyright © 2002-2007 Joachim Eibl
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 in the section entitled "GNU Free Documentation License".

    KDiff3 is a file and directory diff and merge tool which
-
  • compares and merges two or three text input files or directories,
  • shows the differences line by line and character by character(!),
  • provides an automatic merge-facility,
  • has an editor for comfortable solving of merge-conflicts,
  • provides networktransparency via KIO,
  • has options to highlight or hide changes in white-space or comments,
  • supports Unicode, UTF-8 and other file encodings,
  • prints differences,
  • supports version control keyword and history merging.

+
  • compares and merges two or three text input files or directories,
  • shows the differences line by line and character by character(!),
  • provides an automatic merge-facility,
  • has an editor for comfortable solving of merge-conflicts,
  • provides networktransparency via TDEIO,
  • has options to highlight or hide changes in white-space or comments,
  • supports Unicode, UTF-8 and other file encodings,
  • prints differences,
  • supports version control keyword and history merging.

 

    This document describes KDiff3-version 0.9.92.
-
Table of Contents
1. Introduction
Yet Another Diff Frontend?
Screenshots and Features
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
 See White-Space Differences At One Glance
 Triple-Diff
 Comfortable Merge Of Two Or Three Input Files
And ...
2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
Merging 2 files: 
Comparing 3 files: 
Merging 3 files: 
Special case: Files with the same name 
Commandline for starting a directory comparison or merge: 
Other command line options
Ignorable command line options
Open-Dialog
Paste and Drop Input
Comparing Files And Interpreting The Information In The Input Windows
Info Line
Coloring
Summary Column
Overview Column
Manually Aligning Lines
Manually Joining and Splitting Diff Sections
Merging And The Merge Output Editor Window
The Summary Column
Setting The Current Group And Synchronising Merge And Diff View Position
Choosing Inputs A, B or C For Current Conflict And Editing
Choosing Input A, B, or C for All Conflicts
Automatic Merge of Version Control Keywords and History (Log)
Navigation And Editing
Auto-Advance
Select, Copy And Paste
Saving
Finding Strings
Printing
Options
Font
Colors
Editor Settings
Diff Settings
Merge Settings
Directory Merge
Regional and Language Options
Miscellaneous
Configuring Keyboard-Shortcuts
Preprocessor Commands
sed Basics
Examples For sed-Use In KDiff3
Order Of Preprocessor Execution
Warning
3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge
Starting Directory Comparison Or Merge
Compare/Merge two directories: 
Compare/Merge three directories: 
Directory Merge Visible Information
The Name Column
The Columns A/B/C and the Coloring Scheme
The Operation Column
The Status Column
Statistics Columns
Selecting Listed Files
Doing A Directory Merge
Options for Comparing and Merging Directories
Other Functions in Directory Merge Window
Split/Full Screen Mode
Comparing or Merging a Single File
Comparing or Merging Files with Different Names
4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves
How To Write URLs
Capabilities of KIO-Slaves
Using KDiff3 as a KPart
5. Questions and Answers
6. Credits and License
A. Installation
How to obtain KDiff3
Requirements
Compilation and Installation
 
 Introduction
 


Would you like to make a comment or contribute an update to this page?

+
Table of Contents
1. Introduction
Yet Another Diff Frontend?
Screenshots and Features
More Features
 Line-By-Line And Char-By-Char Diff-Viewer
 See White-Space Differences At One Glance
 Triple-Diff
 Comfortable Merge Of Two Or Three Input Files
And ...
2. File Comparison And Merge
Command-Line Options
Comparing 2 files: 
Merging 2 files: 
Comparing 3 files: 
Merging 3 files: 
Special case: Files with the same name 
Commandline for starting a directory comparison or merge: 
Other command line options
Ignorable command line options
Open-Dialog
Paste and Drop Input
Comparing Files And Interpreting The Information In The Input Windows
Info Line
Coloring
Summary Column
Overview Column
Manually Aligning Lines
Manually Joining and Splitting Diff Sections
Merging And The Merge Output Editor Window
The Summary Column
Setting The Current Group And Synchronising Merge And Diff View Position
Choosing Inputs A, B or C For Current Conflict And Editing
Choosing Input A, B, or C for All Conflicts
Automatic Merge of Version Control Keywords and History (Log)
Navigation And Editing
Auto-Advance
Select, Copy And Paste
Saving
Finding Strings
Printing
Options
Font
Colors
Editor Settings
Diff Settings
Merge Settings
Directory Merge
Regional and Language Options
Miscellaneous
Configuring Keyboard-Shortcuts
Preprocessor Commands
sed Basics
Examples For sed-Use In KDiff3
Order Of Preprocessor Execution
Warning
3. Directory Comparison and Merge with KDiff3
Introduction into Directory Comparison and Merge
Starting Directory Comparison Or Merge
Compare/Merge two directories: 
Compare/Merge three directories: 
Directory Merge Visible Information
The Name Column
The Columns A/B/C and the Coloring Scheme
The Operation Column
The Status Column
Statistics Columns
Selecting Listed Files
Doing A Directory Merge
Options for Comparing and Merging Directories
Other Functions in Directory Merge Window
Split/Full Screen Mode
Comparing or Merging a Single File
Comparing or Merging Files with Different Names
4. Miscellaneous Topics
Networktransparency via TDEIO
TDEIO-Slaves
How To Write URLs
Capabilities of TDEIO-Slaves
Using KDiff3 as a KPart
5. Questions and Answers
6. Credits and License
A. Installation
How to obtain KDiff3
Requirements
Compilation and Installation
 
 Introduction
 


Would you like to make a comment or contribute an update to this page?

         Send feedback to the KDE Docs Team

\ No newline at end of file
diff --git a/doc/en/installation.html b/doc/en/installation.html
index f0e4823..03ae311 100644
--- a/doc/en/installation.html
+++ b/doc/en/installation.html
@@ -1,4 +1,4 @@
-Appendix A. Installation
Installation
Appendix A. Installation
Table of Contents
How to obtain KDiff3
Requirements
Compilation and Installation
How to obtain KDiff3

+Appendix A. Installation
Installation
Appendix A. Installation
Table of Contents
How to obtain KDiff3
Requirements
Compilation and Installation
How to obtain KDiff3

 You can download the latest version of KDiff3 from its homepage http://kdiff3.sourceforge.net.
 

 KDiff3 is also available for other platforms. See the homepage for details.
diff --git a/doc/en/interpretinginformation.html b/doc/en/interpretinginformation.html
index e33035b..3cf531e 100644
--- a/doc/en/interpretinginformation.html
+++ b/doc/en/interpretinginformation.html
@@ -1,4 +1,4 @@
-Comparing Files And Interpreting The Information In The Input Windows
Comparing Files And Interpreting The Information In The Input Windows
File Comparison And Merge
Comparing Files And Interpreting The Information In The Input Windows
Info Line

+Comparing Files And Interpreting The Information In The Input Windows
Comparing Files And Interpreting The Information In The Input Windows
File Comparison And Merge
Comparing Files And Interpreting The Information In The Input Windows
Info Line

    At the top of each text window is its "info line". The info lines of
    the input windows contain a letter "A", "B" or "C", the editable filename,
    a button for browsing, and the line number of the first visible line in the window. 
diff --git a/doc/en/introduction.html b/doc/en/introduction.html
index f766dc1..8a2b5e9 100644
--- a/doc/en/introduction.html
+++ b/doc/en/introduction.html
@@ -1,4 +1,4 @@
-Chapter 1. Introduction
Introduction
Chapter 1. Introduction
Yet Another Diff Frontend?

+Chapter 1. Introduction
Introduction
Chapter 1. Introduction
Yet Another Diff Frontend?

 Several graphical diff tools exist. Why choose KDiff3? Let me say, why I wrote it.
 

 KDiff3 started because I had to do a difficult merge. Merging is necessary when several
diff --git a/doc/en/kdiff3.1 b/doc/en/kdiff3.1
index 3b9c492..6f2d26b 100644
--- a/doc/en/kdiff3.1
+++ b/doc/en/kdiff3.1
@@ -27,7 +27,7 @@ an integrated editor for comfortable solving of merge-conflicts
 .IP "   \(bu" 6 
 supports Unicode, UTF-8 and other codecs 
 .IP "   \(bu" 6 
-supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.) 
+supports TDEIO on KDE (allows accessing ftp, sftp, fish, smb etc.) 
 .IP "   \(bu" 6 
 Printing of differences 
 .IP "   \(bu" 6 
diff --git a/doc/en/kpart.html b/doc/en/kpart.html
index 92d1f65..685897c 100644
--- a/doc/en/kpart.html
+++ b/doc/en/kpart.html
@@ -1,4 +1,4 @@
-Using KDiff3 as a KPart
Using KDiff3 as a KPart
Miscellaneous Topics
Using KDiff3 as a KPart

+Using KDiff3 as a KPart
Using KDiff3 as a KPart
Miscellaneous Topics
Using KDiff3 as a KPart

 KDiff3 is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
 

 It's main use is as difference-viewer in KDevelop. KDevelop always starts the
diff --git a/doc/en/merging.html b/doc/en/merging.html
index 712d9b1..fab4a3b 100644
--- a/doc/en/merging.html
+++ b/doc/en/merging.html
@@ -1,4 +1,4 @@
-Merging And The Merge Output Editor Window
Merging And The Merge Output Editor Window
File Comparison And Merge
Merging And The Merge Output Editor Window

+Merging And The Merge Output Editor Window
Merging And The Merge Output Editor Window
File Comparison And Merge
Merging And The Merge Output Editor Window

    The merge output editor window (below the diff input windows) also has an info line at the top showing "Output:", the
    filename   and "[Modified]" if you edited something. Usually it will contain
    some text  through the automatic merge facilities, but often it will also
diff --git a/doc/en/misc.html b/doc/en/misc.html
index 7aa1fb5..2b315ee 100644
--- a/doc/en/misc.html
+++ b/doc/en/misc.html
@@ -1,5 +1,5 @@
-Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Chapter 4. Miscellaneous Topics
Networktransparency via KIO
KIO-Slaves

-KDE supports networktransparency via KIO-slaves. KDiff3 uses this
+Chapter 4. Miscellaneous Topics
Miscellaneous Topics
Chapter 4. Miscellaneous Topics
Networktransparency via TDEIO
TDEIO-Slaves

+KDE supports networktransparency via TDEIO-slaves. KDiff3 uses this
 for reading input files and for scanning directories.
 This means that you can specify files and directories on local and
 remote resources via URLs.
@@ -13,7 +13,7 @@ Example:
 
The first line compares a local file with a file on an FTP-server. The second line
 compares a directory within an compressed archive with a local directory.
 

-Other KIO-slaves that are interesting are:
+Other TDEIO-slaves that are interesting are:
 
  • Files from the WWW (http:),
  • Files from the FTP (ftp:),
  • Encrypted file transfer (fish:, sftp:),
  • Windows-ressources (smb:),
  • Local files (file:),

 Other things that are possible, but probably less useful are:
 
  • Man-pages (man:),
  • Info-pages (info:),
How To Write URLs

@@ -27,7 +27,7 @@ Other things that are possible, but probably less useful are:
    E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23".
 
  • 
    When URLs don't work as expected, try to open them in Konqueror first.
-
    • Capabilities of KIO-Slaves
    
+
    Capabilities of TDEIO-Slaves
    
    Networktransparency has one drawback: Not all ressources have the same cababilities.
 
    
    Sometimes this is due to the file system of the server, sometimes due to the protocol.
diff --git a/doc/en/navigation.html b/doc/en/navigation.html
index e1810d1..0235f7f 100644
--- a/doc/en/navigation.html
+++ b/doc/en/navigation.html
@@ -1,4 +1,4 @@
-Navigation And Editing
    Navigation And Editing
    File Comparison And Merge
    Navigation And Editing
    
+Navigation And Editing
    Navigation And Editing
    File Comparison And Merge
    Navigation And Editing
    
    Much navigation will be done with the scroll bars and the mouse but
    you  can also navigate with the keys. If you click into either window then
    you  can use the cursor buttons left, right, up, down, page up, page down,
diff --git a/doc/en/opendialog.html b/doc/en/opendialog.html
index 7ea7588..61e3838 100644
--- a/doc/en/opendialog.html
+++ b/doc/en/opendialog.html
@@ -1,4 +1,4 @@
-Open-Dialog
    Open-Dialog
    File Comparison And Merge
    Open-Dialog
    
+Open-Dialog
    Open-Dialog
    File Comparison And Merge
    Open-Dialog
    
    Since many input files must be selectable, the program has a special open dialog:
 
    
    The open dialog allows to edit the filenames by hand, selecting a file
diff --git a/doc/en/options.html b/doc/en/options.html
index 5c74e13..474af7f 100644
--- a/doc/en/options.html
+++ b/doc/en/options.html
@@ -1,4 +1,4 @@
-Options
    Options
    File Comparison And Merge
    Options
    
+Options
    Options
    File Comparison And Merge
    Options
    
    Options and the recent-file-list will be saved when you exit the program,
    and reloaded when you start it. (Menu Settings->Configure KDiff3 ...)
 
    Font
    
diff --git a/doc/en/other.html b/doc/en/other.html
index 84b9b10..76703ce 100644
--- a/doc/en/other.html
+++ b/doc/en/other.html
@@ -1,4 +1,4 @@
-Other Functions in Directory Merge Window
    Other Functions in Directory Merge Window
    Directory Comparison and Merge with KDiff3
    Other Functions in Directory Merge Window
    Split/Full Screen Mode
    
+Other Functions in Directory Merge Window
    Other Functions in Directory Merge Window
    Directory Comparison and Merge with KDiff3
    Other Functions in Directory Merge Window
    Split/Full Screen Mode
    
    Usually the directory merge list view remains visible while a single file
    is compared or merged. With the mouse you can move the the splitter bar that
    separates the file list from the text-diff windows. If you don't want this,
diff --git a/doc/en/pasteinput.html b/doc/en/pasteinput.html
index 98a9109..8c0a0d2 100644
--- a/doc/en/pasteinput.html
+++ b/doc/en/pasteinput.html
@@ -1,4 +1,4 @@
-Paste and Drop Input
    Paste and Drop Input
    File Comparison And Merge
    Paste and Drop Input
    
+Paste and Drop Input
    Paste and Drop Input
    File Comparison And Merge
    Paste and Drop Input
    
    Sometimes you want to compare parts of a text that is not an own file. KDiff3 also
    allows you to paste text from the clipboard into the diff input window that has the focus.
    The diff analysis happens immediately then.
diff --git a/doc/en/preprocessors.html b/doc/en/preprocessors.html
index 0bea10b..fb8214e 100644
--- a/doc/en/preprocessors.html
+++ b/doc/en/preprocessors.html
@@ -1,4 +1,4 @@
-Preprocessor Commands
    Preprocessor Commands
    File Comparison And Merge
    Preprocessor Commands
    
+Preprocessor Commands
    Preprocessor Commands
    File Comparison And Merge
    Preprocessor Commands
    
 KDiff3 supports two preprocessor options.
 
    
 
    Preprocessor-Command:
    
diff --git a/doc/en/printing.html b/doc/en/printing.html
index a541345..04596ff 100644
--- a/doc/en/printing.html
+++ b/doc/en/printing.html
@@ -1,4 +1,4 @@
-Printing
    Printing
    File Comparison And Merge
    Printing
    
+Printing
    Printing
    File Comparison And Merge
    Printing
    
    KDiff3 supports printing for textfile differences. The "Print..."-command (Ctrl-P) 
    in the File-menu opens a dialog that allows you to select the printer and to adjust
    other options.
diff --git a/doc/en/requirements.html b/doc/en/requirements.html
index 1c4c7f0..c556889 100644
--- a/doc/en/requirements.html
+++ b/doc/en/requirements.html
@@ -1,4 +1,4 @@
-Requirements
    Requirements
    Installation
    Requirements
    
+Requirements
    Requirements
    Installation
    Requirements
    
    In order to successfully use all features of KDiff3, you need KDE >3.1.
 
    
    For information about how to run KDiff3 on other platforms without KDE please see the
diff --git a/doc/en/saving.html b/doc/en/saving.html
index 87e9a99..3d648fd 100644
--- a/doc/en/saving.html
+++ b/doc/en/saving.html
@@ -1,4 +1,4 @@
-Saving
    Saving
    File Comparison And Merge
    Saving
    
+Saving
    Saving
    File Comparison And Merge
    Saving
    
    Saving will only be allowed, when all conflicts were solved. If the file
    already exists and the "Backup files"-option is enabled then the existing
    file will be renamed with an ".orig"-extension, but if such a file exists
diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html
index a63712d..23fdf40 100644
--- a/doc/en/screenshots.html
+++ b/doc/en/screenshots.html
@@ -1,4 +1,4 @@
-Screenshots and Features
    Screenshots and Features
    Introduction
    Screenshots and Features
    This screenshot shows the difference between two text files
    (Using an early version of KDiff3):
    
+Screenshots and Features
    Screenshots and Features
    Introduction
    Screenshots and Features
    This screenshot shows the difference between two text files
    (Using an early version of KDiff3):
    
    3-way-merging is fully supported. This is useful if two people change code independently.
    The original file (the base) is used to help KDiff3 to automatically select the correct
    changes.
diff --git a/doc/en/selections.html b/doc/en/selections.html
index 58dc620..06c456d 100644
--- a/doc/en/selections.html
+++ b/doc/en/selections.html
@@ -1,4 +1,4 @@
-Select, Copy And Paste
    Select, Copy And Paste
    File Comparison And Merge
    Select, Copy And Paste
    
+Select, Copy And Paste
    Select, Copy And Paste
    File Comparison And Merge
    Select, Copy And Paste
    
    The input windows don't show a cursor, so selections must be made
    with   the mouse by clicking with the left mouse button at the start, holding
    down   the mousebutton and moving to the end, where you release the mouse
diff --git a/doc/en/startingdirmerge.html b/doc/en/startingdirmerge.html
index 6029dc5..fc5e84f 100644
--- a/doc/en/startingdirmerge.html
+++ b/doc/en/startingdirmerge.html
@@ -1,4 +1,4 @@
-Starting Directory Comparison Or Merge
    Starting Directory Comparison Or Merge
    Directory Comparison and Merge with KDiff3
    Starting Directory Comparison Or Merge
    
+Starting Directory Comparison Or Merge
    Starting Directory Comparison Or Merge
    Directory Comparison and Merge with KDiff3
    Starting Directory Comparison Or Merge
    
    This is very similar to the single file merge and comparison. You just
    have  to specify directories on the command line or in the file-open
    dialog.
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
index 981ba5e..6119a6f 100644
--- a/doc/es/index.docbook
+++ b/doc/es/index.docbook
@@ -94,7 +94,7 @@ Do NOT change these in the translation. -->
 >
 Proporciona transparencia de red a través de KIO.Proporciona transparencia de red a través de TDEIO.
 kpart
 kio
+>tdeio
 transparencia de red
 
    Transferencia de red a través de KIO.Transferencia de red a través de TDEIO.
    Temas variados
 
 Transferencia de red a través de KIO
+>Transferencia de red a través de TDEIO
 KIO-Slaves
+>TDEIO-Slaves
 KDE soporta transparencia de red a través de los KIO-slaves. &kdiff3; lo utiliza para leer los archivos de entrada y para explorar directorios. Esto significa que puede especificar archivos y directorios locales y en recursos remotos a través de URLs. KDE soporta transparencia de red a través de los TDEIO-slaves. &kdiff3; lo utiliza para leer los archivos de entrada y para explorar directorios. Esto significa que puede especificar archivos y directorios locales y en recursos remotos a través de URLs. Ejemplo: 
@@ -2535,7 +2535,7 @@ Please at least include KDE, the KDE package it is in, the name
 La primera línea compara un archivo local con un archivo en un servidor FTP. La segunda línea compara un directorio con un archivo comprimido con un directorio local. Otros KIO-slaves interesantes son: 
+>Otros TDEIO-slaves interesantes son: 
 
 Capacidades de los KIO-Slaves.
+>Capacidades de los TDEIO-Slaves.
 La transparencia de red tiene un inconveniente: No todos los recursos tienen las mismas capacidades. 
 >
 pakub tänu KIO moodulitele võrguläbipaistvustpakub tänu TDEIO moodulitele võrguläbipaistvust
 kpart
 kio
+>tdeio
 võrguläbipaistvus
 
    Võrguläbipaistvus KIO moodulite vahendusel.Võrguläbipaistvus TDEIO moodulite vahendusel.
    Mitmesugused teemad
 
 Võrguläbipaistvus KIO vahendusel
+>Võrguläbipaistvus TDEIO vahendusel
 KIO moodulid
+>TDEIO moodulid
 KDE toetab võrguläbipaistvust oma KIO moodulite abil. KDiff3 kasutab neid sisendfailide lugemiseks ja kataloogide läbiuurimiseks. See tähendab, et võid faile ja katalooge määrata URL-e kasutades nii kohalikul kui võrgumasinal. KDE toetab võrguläbipaistvust oma TDEIO moodulite abil. KDiff3 kasutab neid sisendfailide lugemiseks ja kataloogide läbiuurimiseks. See tähendab, et võid faile ja katalooge määrata URL-e kasutades nii kohalikul kui võrgumasinal. Näide: 
@@ -2087,7 +2087,7 @@ Võtmed:
 Esimene rida võrdleb kohalikku faili failiga FTP serveril. Teine rida võrdleb kataloogi arhiivifailis kohaliku kataloogiga. Muud huvipakkuvad KIO moodulid: 
+>Muud huvipakkuvad TDEIO moodulid: 
 
 KIO moodulite võimalused
+>TDEIO moodulite võimalused
 Võrguläbipaistvusel on üks puudus: mitte kõik ressurssid ei paku ühesuguseid võimalusi. 
 >
 proposant une transparence réseau via KIOproposant une transparence réseau via TDEIO
 kpart
 kio
+>tdeio
 transparence réseau
 
    Transparence réseau via KIO.Transparence réseau via TDEIO.
    Sujets divers
 
 Transparence réseau via KIO
+>Transparence réseau via TDEIO
 KIO-Slaves
+>TDEIO-Slaves
 KDE supporte la transparence réseau via KIO. KDiff3 utilise cela pour lire les fichiers en entrée ou scanner les dossiers. Cela signifie que vous pouvez spécifier des fichiers et des dossiers locaux ou distants via des URL. KDE supporte la transparence réseau via TDEIO. KDiff3 utilise cela pour lire les fichiers en entrée ou scanner les dossiers. Cela signifie que vous pouvez spécifier des fichiers et des dossiers locaux ou distants via des URL. Exemple : 
@@ -2045,7 +2045,7 @@ Options :
 
 Possibilités des KIO-Slaves
+>Possibilités des TDEIO-Slaves
 La transparence réseau à un inconvénient : Toutes les ressources n'ont les mêmes possibilités. 
 >
 rende trasparente la rete con l'uso di KIO,rende trasparente la rete con l'uso di TDEIO,
 kpart
 kio
+>tdeio
 networktransparent
 
    Trasparenza di rete tramite KIO.Trasparenza di rete tramite TDEIO.
    Argomenti vari
 
 Trasparenza di rete con KIO
+>Trasparenza di rete con TDEIO
 Gli slave KIO
+>Gli slave TDEIO
 KDE supporta la trasparenza di rete tramite gli slave KIO. KDiff3 utilizza questo metodo per leggere i file in ingresso e per la scansione delle directory. Questo significa che è possibile specificare file e directory in locale o in remoto tramite URL. KDE supporta la trasparenza di rete tramite gli slave TDEIO. KDiff3 utilizza questo metodo per leggere i file in ingresso e per la scansione delle directory. Questo significa che è possibile specificare file e directory in locale o in remoto tramite URL. Esempio: 
@@ -2101,7 +2101,7 @@ Opzioni:
 La prima riga confronta un file locale con un file su un server FTP. La seconda riga confronta una directory all'interno di un un archivio compresso con una directory locale. Altri slave KIO interessanti sono: 
+>Altri slave TDEIO interessanti sono: 
 
 Possibilità di KIO-Slaves
+>Possibilità di TDEIO-Slaves
 La trasparenza della rete ha uno svantaggio. Non tutte le risorse hanno le stesse possibilità. 
 >
 netwerktransparantie via KIO biedt,netwerktransparantie via TDEIO biedt,
 kpart
 kio
+>tdeio
 netwerktransparant
 
    Netwerktransparantie via KIO.Netwerktransparantie via TDEIO.
    Diverse onderwerpen
 
 Netwerktransparantie via KIO
+>Netwerktransparantie via TDEIO
 KIO-slaves
+>TDEIO-slaves
 KDE biedt netwerktransparantie via KIO-slaves. KDiff3 gebruikt dit om invoerbestanden en mappen te lezen. Dit betekent dat u bestanden en mappen op lokale en externe bronnen kunt opgeven via URL-adressen. KDE biedt netwerktransparantie via TDEIO-slaves. KDiff3 gebruikt dit om invoerbestanden en mappen te lezen. Dit betekent dat u bestanden en mappen op lokale en externe bronnen kunt opgeven via URL-adressen. Voorbeeld: 
@@ -2073,7 +2073,7 @@ Opties:
 De eerste regel vergelijkt een lokaal bestand met een bestand op een FTP-server. De tweede regel vergelijkt een map binnen een gecomprimeerd archief met een lokale map. Andere interessante KIO-slaves zijn: 
+>Andere interessante TDEIO-slaves zijn: 
 
 Mogelijkheden van KIO-slaves
+>Mogelijkheden van TDEIO-slaves
 Netwerktransparantie heeft één nadeel: niet alle bronnen hebben dezelfde mogelijkheden. 
 >
 oferece a transparência de rede através do KIO,oferece a transparência de rede através do TDEIO,
 kpart
 kio
+>tdeio
 transparente na rede
 
    Transparência na rede através do KIO.Transparência na rede através do TDEIO.
    Tópicos Diversos
 
 Transparência na rede através do KIO
+>Transparência na rede através do TDEIO
 KIO-Slaves
+>TDEIO-Slaves
 O KDE suporta a transparência na rede através dos 'KIO-slaves'. O &kdiff3; usa isto para ler os ficheiros de entrada e para pesquisar as pastas. Isto significa que você poderá indicar ficheiros e pastas em recursos locais e remotos através dos URLs. O KDE suporta a transparência na rede através dos 'TDEIO-slaves'. O &kdiff3; usa isto para ler os ficheiros de entrada e para pesquisar as pastas. Isto significa que você poderá indicar ficheiros e pastas em recursos locais e remotos através dos URLs. Exemplo: 
@@ -2574,7 +2574,7 @@ Opções:
 A primeira linha compara um ficheiro local com outro ficheiro num servidor de FTP. A segunda linha compara uma pasta dentro de um pacote comprimido com uma pasta local. Outros 'KIO-slaves' que serão interessantes: 
+>Outros 'TDEIO-slaves' que serão interessantes: 
 
 Capacidades dos 'KIO-Slaves'
+>Capacidades dos 'TDEIO-Slaves'
 A transparência na rede tem um senão: nem todos os recursos têm as mesmas capacidades. 
 >
 erbjuder nätverkstransparens via KIO,erbjuder nätverkstransparens via TDEIO,
 kpart
 kio
+>tdeio
 nätverkstransparent
 
    Nätverkstransparens via KIO.Nätverkstransparens via TDEIO.
    Diverse ämnen
 
 Nätverkstransparens via KIO
+>Nätverkstransparens via TDEIO
 I/O-slavar
diff --git a/kdiff3.spec b/kdiff3.spec
index 450a455..fdde0a6 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -20,7 +20,7 @@ BuildRequires: tdelibs-devel >= 3.3
 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 KIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
+Supports TDEIO on KDE (allows accessing ftp, sftp, fish, smb etc.).
 Unicode & UTF-8 support
 
 %prep
diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile
index c81bbc6..4e30989 100644
--- a/kdiff3plugin/po/Makefile
+++ b/kdiff3plugin/po/Makefile
@@ -145,19 +145,19 @@ LIB_KDED =
 LIB_TDEPIM = -ltdepim
 LIB_TDEPRINT = -ltdeprint
 LIB_TDEUI = -ltdeui
-LIB_KDNSSD = -ltdednssd
+LIB_TDEDNSSD = -ltdednssd
 LIB_TDEFILE = -ltdeio
 LIB_KFM = 
 LIB_TDEHTML = -ltdehtml
-LIB_KIMPROXY = -ltdeimproxy
-LIB_KIO = -ltdeio
+LIB_TDEIMPROXY = -ltdeimproxy
+LIB_TDEIO = -ltdeio
 LIB_KJS = -lkjs
 LIB_KNEWSTUFF = -lknewstuff
-LIB_KPARTS = -ltdeparts
-LIB_KSPELL = -ltdespell
-LIB_KSYCOCA = -ltdeio
-LIB_KUNITTEST = -ltdeunittest
-LIB_KUTILS = -ltdeutils
+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
diff --git a/kdiff3plugin/po/de.po b/kdiff3plugin/po/de.po
index abf7c79..6c398ed 100644
--- a/kdiff3plugin/po/de.po
+++ b/kdiff3plugin/po/de.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-19 08:46+0100\n"
 "PO-Revision-Date: 2007-01-29 22:54+0100\n"
 "Last-Translator: Thomas Reitelbach \n"
-"Language-Team: German \n"
+"Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kdiff3plugin/po/it.po b/kdiff3plugin/po/it.po
index e7fad1b..dd98c15 100644
--- a/kdiff3plugin/po/it.po
+++ b/kdiff3plugin/po/it.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-19 08:46+0100\n"
 "PO-Revision-Date: 2006-11-22 07:28+0100\n"
 "Last-Translator: Federico Zenith \n"
-"Language-Team: Italian \n"
+"Language-Team: Italian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kdiff3plugin/po/nl.po b/kdiff3plugin/po/nl.po
index 45a5444..1c8291c 100644
--- a/kdiff3plugin/po/nl.po
+++ b/kdiff3plugin/po/nl.po
@@ -7,7 +7,7 @@ msgstr ""
 "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 \n"
-"Language-Team: Dutch \n"
+"Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kdiff3plugin/po/pt.po b/kdiff3plugin/po/pt.po
index d90c664..ec8364d 100644
--- a/kdiff3plugin/po/pt.po
+++ b/kdiff3plugin/po/pt.po
@@ -4,7 +4,7 @@ msgstr ""
 "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 \n"
-"Language-Team: pt \n"
+"Language-Team: pt \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/kdiff3plugin/po/pt_BR.po b/kdiff3plugin/po/pt_BR.po
index 4abdda3..808af36 100644
--- a/kdiff3plugin/po/pt_BR.po
+++ b/kdiff3plugin/po/pt_BR.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-19 08:46+0100\n"
 "PO-Revision-Date: 2006-11-26 22:39-0200\n"
 "Last-Translator: Diniz Bortolotto \n"
-"Language-Team: Brazilian Portuguese \n"
+"Language-Team: Brazilian Portuguese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/README b/po/README
index 5093dff..6b6c87f 100644
--- a/po/README
+++ b/po/README
@@ -10,17 +10,17 @@ grep "Language-Team" *.po
 az     Azerbaijani      
 ca     LANGUAGE      
 da     Danish      
-de     Deutsch      
+de     Deutsch      
 en_GB  British English      
 es     espaniol      
 et     Estonian      
 fr     French      
 hu     Hungarian      
-it     Italian      
-nl     Nederlands      
+it     Italian      
+nl     Nederlands      
 pl     Polish     
-pt_BR  Brazilian Portuguese      
-pt     Portuguese      
+pt_BR  Brazilian Portuguese      
+pt     Portuguese      
 ro     Romanian      
 ru     Russian      
 sr     Serbian
diff --git a/po/de.po b/po/de.po
index ca89be9..a3ff81a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-05 08:45+0100\n"
 "PO-Revision-Date: 2006-07-09 10:25+0200\n"
 "Last-Translator: Thomas Reitelbach \n"
-"Language-Team: German \n"
+"Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index 289d113..b59cefa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-05 08:45+0100\n"
 "PO-Revision-Date: 2006-12-08 16:52+0100\n"
 "Last-Translator: Marcello Anni \n"
-"Language-Team: italiano \n"
+"Language-Team: italiano \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/lt.po b/po/lt.po
index d27d0e0..e748745 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -139,7 +139,7 @@ msgstr ""
 "Pavadinimas\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Vardas\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Vardas\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Vardas\n"
diff --git a/po/nl.po b/po/nl.po
index 11477b7..6dfdc52 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-05 08:45+0100\n"
 "PO-Revision-Date: 2006-11-27 00:05+0100\n"
 "Last-Translator: Rinse de Vries \n"
-"Language-Team: Dutch \n"
+"Language-Team: Dutch \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pl.po b/po/pl.po
index 364f4d8..e64d73c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 # Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # Tomasz Waleµczak , 2004.
 # Tomasz Waleńczak , 2004.
-# Michal Rudolf , 2004.
+# Michal Rudolf , 2004.
 # Marcin Bokszczanin , 2005.
 # Krzysztof Lichota , 2005.
 # Robert Gomulka , 2005.
diff --git a/po/pt.po b/po/pt.po
index 67f357d..51868c1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-05 08:45+0100\n"
 "PO-Revision-Date: 2006-11-05 14:35+0000\n"
 "Last-Translator: Pedro Morais \n"
-"Language-Team: pt \n"
+"Language-Team: pt \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 36abf3d..6ee8734 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgstr ""
 "POT-Creation-Date: 2006-11-05 08:45+0100\n"
 "PO-Revision-Date: 2007-01-30 20:41-0200\n"
 "Last-Translator: Diniz Bortolotto \n"
-"Language-Team: Brazilian Portuguese \n"
+"Language-Team: Brazilian Portuguese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index a73b52e..253e723 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,8 +25,8 @@ 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_KIO) -ltdetexteditor
-kdiff3_LDADD   = $(LIB_KPARTS)
+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
@@ -47,7 +47,7 @@ libkdiff3part_la_SOURCES = kdiff3_part.cpp kdiff3.cpp directorymergewindow.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_TDEPRINT) $(LIB_KPARTS) $(LIB_TDEFILE)
+libkdiff3part_la_LIBADD = $(LIB_TDEPRINT) $(LIB_TDEPARTS) $(LIB_TDEFILE)
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)
diff --git a/src/fileaccess.cpp b/src/fileaccess.cpp
index 6946232..0dc0511 100644
--- a/src/fileaccess.cpp
+++ b/src/fileaccess.cpp
@@ -887,7 +887,7 @@ bool FileAccessJobHandler::copyFile( const TQString& dest )
          i18n("Copying file: %1 -> %2").arg(m_pFileAccess->prettyAbsPath()).arg(dest) );
 
       return m_bSuccess;
-      // Note that the KIO-slave preserves the original date, if this is supported.
+      // Note that the TDEIO-slave preserves the original date, if this is supported.
    }
 
    // Both files are local:
diff --git a/src/main.cpp b/src/main.cpp
index fee9f0e..66aad10 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
    aboutData.addCredit("Sebastien Fricker", "Windows installer" );
    aboutData.addCredit("Stephan Binner", "i18n-help", "binner" "@" "kde.org" );
    aboutData.addCredit("Stefan Partheymueller", "Clipboard-patch" );
-   aboutData.addCredit("David Faure", "KIO-Help", "faure" "@" "kde.org" );
+   aboutData.addCredit("David Faure", "TDEIO-Help", "faure" "@" "kde.org" );
    aboutData.addCredit("Bernd Gehrmann", "Class CvsIgnoreList from Cervisia" );
    aboutData.addCredit("Andre Woebbeking", "Class StringMatcher" );
    aboutData.addCredit("Michael Denio", "Directory Equality-Coloring patch");