Added abandoned KDE3 version of kdiff3

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

183 files changed, 29170 insertions, 0 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..e82a913
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,6 @@
+# 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)  
diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000..8c28a9a
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,80 @@
+README for the Documentation
+============================
+Author: Joachim Eibl, 2004-02-22
+
+The following text contains some info about how the docs are created.
+It helps me remember certain details. Most users probably aren't 
+interested in these things.
+
+Docbook references:
+http://i18n.kde.org/doc/markup/index.html
+http://opensource.bureau-cornavin.com/crash-course/index.html
+
+Each directory contains the documentation for a different translation.
+The textual information is in the index.docbook of every subdirectory.
+
+I wrote the English version in en/index.docbook. The other translations
+were done by the KDE-Internationalization-Team. They are doing a great
+job!
+
+
+The command meinproc (which is part of KDE) can be used to convert this 
+file into HTML.
+
+meinproc index.docbook
+
+If you prefer everything in one big HTML/Postscript/PDF-file:
+   LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl
+   (The LANG=de_DE prevents that meinproc writes the file in UTF-8 encoding, which isn't understood by html2ps.)
+Create ps-file:
+   html2ps -D -u -n index.html >index.ps
+      (For the -D to work add the line "Ghostscript: 1;" in the "package"-section of file /usr/lib/html2ps/html2psrc.)
+Create pdf-file:
+   ps2pdf index.ps index.pdf
+
+The script createpdfdoc does these steps for all subdirectories.
+
+During normal installation on KDE a compressed file is generated:
+meinproc --check --cache index.cache.bz2 index.docbook
+
+
+As a service for non-KDE-users the en-directory also contains the 
+HTML-version of the English documentation.
+
+After running meinproc the HTML-files contain some references to files 
+in help:/common/ which contains stylesheets and KDE-graphics which make
+the result look much prettier. Because on non-KDE-systems this is not 
+available, I placed a copy of these files in doc/en/common. 
+To correct the references, I run the following command, which removes 
+the "help:/"-part of the references, and only the "common/"-part remains.
+
+for i in *.html; do sed -i "s/help:\///g" $i; done
+
+(sed-option "-i" means in-place, "s/orig/repl/" is the replacement-command,
+"g" replaces every occurance in the line, not only the first.)
+
+The screenshots were made with the English KDE-version and therefore are
+placed in the en-directory. But since for the other translations no new
+screenshots were made yet, they only contain links to the English 
+screenshots. These links are created en-bloc with this command. (But
+first you must cd into each subdirectory.)
+
+for i in `ls ../en | grep png`; do ln -s ../en/$i $i; done
+
+Command to retrieve other translations from cvs:
+
+cvs co kde-i18n/subdirs
+#for i in `cat kde-i18n/subdirs`; do  cvs co kde-i18n/$i/docs/kdeextragear-1/kdiff3/index.docbook; done
+for i in `cat subdirs`; do wget http://websvn.kde.org/*checkout*/trunk/l10n/$i/docs/extragear-utils/kdiff3/index.docbook -O $i.docbook; done
+
+If a new translation is available, 
+- create a new directory, 
+- copy the index.docbook file there,
+- copy a Makefile.am there and correct it, 
+- edit the doc/Makefile.am to include the new subdir,
+- create the links for the graphics,
+- and don't forget to run make -f Makefile.cvs in the top directory.
+
+
+
+
diff --git a/doc/createpdfdoc b/doc/createpdfdoc
new file mode 100644
index 0000000..c72ef6f
--- /dev/null
+++ b/doc/createpdfdoc
@@ -0,0 +1,8 @@
+for i in `find * -maxdepth 0 -type d`; do
+cd $i
+echo $i
+LANG=de_DE meinproc --check index.docbook --stylesheet /opt/kde3/share/apps/ksgmltools2/customization/kde-nochunk.xsl
+html2ps -D -u -n index.html >index.ps
+ps2pdf index.ps ../kdiff3_$i.pdf
+cd ..
+done
diff --git a/doc/da/Makefile.am b/doc/da/Makefile.am
new file mode 100644
index 0000000..28f9520
--- /dev/null
+++ b/doc/da/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = da
+
+
diff --git a/doc/da/dirbrowser.png b/doc/da/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/da/dirbrowser.png
diff --git a/doc/da/dirmergebig.png b/doc/da/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/da/dirmergebig.png
diff --git a/doc/da/index.docbook b/doc/da/index.docbook
new file mode 100644
index 0000000..10c0757
--- /dev/null
+++ b/doc/da/index.docbook
@@ -0,0 +1,2918 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "extragear-utils">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Danish "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>&kdiff3;-håndbogen</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl snabela gmx.de</email>
+</address
+></affiliation>
+</author>
+&erik.kjaer.pedersen.role; 
+</authorgroup>
+
+<copyright>
+<year
+>2002-2006</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2006-05-14</date>
+<releaseinfo
+>0.9.90</releaseinfo>
+
+
+<abstract>
+<para
+>&kdiff3; er et værktøj til sammenligning og sammenfletning af filer og mapper, som <itemizedlist>
+<listitem
+><para
+>sammenligner og fletter to eller tre tekst-inddatafiler eller mapper sammen,</para
+></listitem>
+<listitem
+><para
+>viser forskellen linje-for-linje og tegn-for-tegn(!),</para
+></listitem>
+<listitem
+><para
+>sørger for en automatisk sammenfletningsfunktion,</para
+></listitem>
+<listitem
+><para
+>har en editor til behagelig løsning af sammenfletningskonflikter,</para
+></listitem>
+<listitem
+><para
+>tilbyder netværksgennemsigtighed via KIO,</para
+></listitem>
+<listitem
+><para
+>har valgmuligheder til at fremhæve eller skjule ændringer i blanke tegn eller kommentarer,</para
+></listitem>
+<listitem
+><para
+>understøtter Unicode, UTF-8 og andre tegnsæt,</para
+></listitem>
+<listitem
+><para
+>udskriver forskelle,</para
+></listitem>
+<listitem
+><para
+>understøtter versionshåndteringsnøgleord og historiksammenfletning.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Dette dokument beskriver &kdiff3; version 0.9.98. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>sammenflet</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>trippelsammenligning</keyword>
+<keyword
+>sammenlign</keyword>
+<keyword
+>filer</keyword>
+<keyword
+>mapper</keyword>
+<keyword
+>versionskontrol</keyword>
+<keyword
+>trevejs sammenfletning</keyword>
+<keyword
+>forskelle i linje</keyword>
+<keyword
+>synkronisér</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>netværksgennemsigtighed</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>blanke tegn</keyword>
+<keyword
+>kommentarer</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Indledning</title>
+<sect1 id="why"
+><title
+>Endnu en sammenligningsgrænseflade?</title>
+<para
+>Der eksisterer flere grafiske sammenligningsværktøjer. Hvorfor skal du vælge &kdiff3;? Lad mig fortælle dig hvorfor jeg skrev det. </para
+><para
+>&kdiff3; blev påbegyndt fordi jeg var tvunget til at lave en svær sammenfletning. At sammensætte er nødvendigt når flere personer arbejder med samme fil i et projekt. En sammenfletning kan være delvis automatiseret, når sammenfletningsværktøjet ikke kun har adgang til de nye ændrede filer (som kaldes "grene"), men også originalfilen (som kaldes "basis"). Sammenfletningsværktøjet vælger automatisk en ændring som kun er udført i en gren. Når flere bidragydere ændrer samme linjer, detekterer sammenfletningsværktøjet en konflikt som skal løses manuelt. </para
+><para
+>Sammenfletningen var svær eftersom en bidragyder havde ændret meget og rettet indrykningen mange steder. Den anden bidragydere havde også ændret meget tekst i samme fil, hvilket forårsagede flere konflikter ved sammenfletningen. </para
+><para
+>Værktøjet som jeg dengang brugte viste kun ændrede linjer, men ikke hvad der var ændret indenfor linjen. Der fandtes heller ikke nogen information om hvor kun indrykningen var ændret. Sammenfletningen var et mindre mareridt. </para
+><para
+>Det var altså begyndelsen. Den første version kunne vise forskelle på en linje, og viste forskelle i blanke tegn. Senere kom mange andre funktioner til for at øge brugbarheden. </para
+><para
+>Hvis du for eksempel hurtigt vil sammenligne en tekst, kan du kopiere den til klippebordet og indsætte den i et af sammenligningsvinduerne. </para
+><para
+>En funktion som krævede en stor anstrengelse var funktionen for mappesammenligning og sammenfletning, som gjorde programmet til en næsten fuldstændig filsøger. </para
+><para
+>Jeg håber at &kdiff3; også virker for dig. Hav det sjovt! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Skærmaftryk og funktioner</title>
+<para
+>Dette skærmaftryk viser forskellen mellem to tekstfiler</para>
+<para
+>(Med en tidlig version af &kdiff3;):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>Trevejs sammenfletning understøttes fuldstændigt. Dette er nyttigt hvis to personer ændrer kode uafhængig af hinanden. Originalfilen (basen) bruges til  at hjælpe &kdiff3; med automatisk at vælge de rigtige ændringer. Sammenfletningseditoren under diff-vinduerne lader dig løse konflikter, mens uddata du vil få vises. Skærmbilledet viser tre inddatafiler som er ved at blive flettet sammen: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>&kdiff3; hjælper dig også med at sammenligne og sammenflette hele mapper. Dette skærmaftryk viser &kdiff3; under en mappesammenfletning: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Flere funktioner</title>
+<sect2
+><title
+>Linje-for-linje og tegn-for-tegn sammenligningsvisning</title>
+<para
+>Ved at bruge mulighederne en grafisk farveskærm har, viser &kdiff3; nøjagtigt hvad forskellene er. Når du skal lave mange kodegennemgange, vil du kunne lide dette. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Se forskelle i blanke tegn med et blik</title>
+<para
+>Mellemrum og tabulatorer som er forskellige ses. Når linjer kun er forskellige i mængden af blanke tegn ses det med et blik i sammendragssøjlen til venstre. (Ikke flere problemer hvis nogen ændrer indrykningen.) </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Trevejssammenligninger</title>
+<para
+>Analysér tre filer og se hvor de adskiller sig. </para
+><para
+>Venstre/midt/højre vindue kaldes A/B/C og har blå/grøn/magenta farve. </para
+><para
+>Hvis en fil er den samme og en anden anderledes for en linje, så viser farverne hvilken fil der er anderledes. Den røde farve betyder at begge de andre filer er forskellige. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Bekvem sammenfletning af to eller tre inddatafiler</title>
+<para
+>&kdiff3; kan bruges til at sammenflette to eller tre inddatafiler og sammenfletter automatisk så meget som muligt. Resultatet vises i et redigerbart vindue hvor de fleste konflikter kan løses med et enkelt museklik. Vælg knapperne A/B/C i værktøjslinjen for at vælge kilden som skal bruges. Du kan også vælge mere end en kilde. Eftersom udskriftsvinduet er en editor, kan til og med konflikter som behøver yderligere korrigering løses her uden at kræve et andet værktøj. </para>
+</sect2>
+
+<sect2
+><title
+>Og ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Hurtig navigering via knapper.</para
+></listitem>
+   <listitem
+><para
+>Et museklik i sammendragssøjlen synkroniserer alle vinduer så samme position vises.</para
+></listitem>
+   <listitem
+><para
+>Markér og kopiér fra hvilket som helst vindue, og indsæt i resultatvinduet for sammenfletning.</para
+></listitem>
+   <listitem
+><para
+>Oversigtssøjle som viser hvor ændringer og konflikter er.</para
+></listitem>
+   <listitem
+><para
+>Farverne kan justeres efter dine specifikke ønsker.</para
+></listitem>
+   <listitem
+><para
+>Justerbar fanebladsstørrelse.</para
+></listitem>
+   <listitem
+><para
+>Valgmulighed for at indsætte mellemrum i stedet for tabulatortegn.</para
+></listitem>
+   <listitem
+><para
+>Åbn filer bekvemt via dialoger, eller angiv filnavn på kommandolinjen.</para
+></listitem>
+   <listitem
+><para
+>Søg efter strenge i alle tekstvinduer. Find (Ctrl-F) og Find næste (F3).</para
+></listitem>
+   <listitem
+><para
+>Vis linjenummer for hver linje. </para
+></listitem>
+   <listitem
+><para
+>Indsæt klippebordet eller træk tekst til et inddatavindue for sammenligning</para
+></listitem>
+   <listitem
+><para
+>Netværksgennemsigtighed via KIO.</para
+></listitem>
+   <listitem
+><para
+>Kan bruges som en forskelsviser i KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Tekstombrydning af lange linjer.</para
+></listitem>
+   <listitem
+><para
+>Støtte for Unicode, UTF-8 og andre kodninger.</para
+></listitem>
+   <listitem
+><para
+>Støtte for sprog som læses fra højre til venstre.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Filsammenligning og fletning</title>
+
+<sect1 id="commandline"
+><title
+>Kommandolinjeflag</title>
+
+<sect2
+><title
+>Sammenlign to filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Sammenflet to filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+> -m
+<command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+> -o <replaceable
+>uddatafil</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Sammenlign tre filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>sammenflet tre filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+> -m
+<command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+>-o <replaceable
+>uddatafil</replaceable
+>
+</screen>
+<para
+>Bemærk at <replaceable
+>fil1</replaceable
+> behandles som basis for <replaceable
+>fil2</replaceable
+> og <replaceable
+>fil3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Specialtilfælde: Filer med samme navn </title>
+<para
+>Hvis alle filer har samme navn men er i forskellige mapper, kan du reducere hvor meget du skal skrive ved kun at angive filnavnet for den første fil. &eg;: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1/filnavn kat2 kat3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kommandolinje for at starte en mappesammenligning eller sammenfletning: </title>
+<para
+>Dette er meget lignende, men nu drejer det sig om mapper.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable
+> -o <replaceable
+>målkat</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable
+>-o <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>For mappesammenligning og sammenfletning kan du fortsætte med at læse <link linkend="dirmerge"
+>her</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Andre kommandolinjeflag</title>
+<para
+>For at se alle tilgængelige kommandolinjeflag, skriv</para>
+<screen
+><command
+>kdiff3</command
+> --help
+</screen>
+<para
+>Eksempeluddata:</para>
+<screen
+>Vælgare:
+  -m, --merge               Sammenflet inddata.
+  -b, --base file           Eksplicit basisfil. For at virke sammen med visse værktøjer.
+  -o, --output file         Uddatafil. Betyder underforstået -m. F.eks.: -o ny_fil.txt
+  --out file                Uddatafil, igen. (for at virke med visse værktøjer.)
+  --auto                    Ingen grafisk grænseflade hvis alle konflikter kan løses automatisk (kræver -o fil)
+  --qall                    Løs ikke konflikter automatisk. (For at virke med andre værktøjer...)
+  --L1 alias1               Synlig erstatning af navn for inddatafil 1 (basis).
+  --L2 alias2               Synlig erstatning af navn for inddatafil 2.
+  --L3 alias3               Synlig erstatning af navn for inddatafil 3.
+  -L, --fname alias         Alternativ synlig erstatning af navn. Angiv dette en gang for al inddata.
+  --cs string               Sæt en indstilling ud af kraft. Anvend en gang for hver indstilling, f.eks.  --cs "AutoAdvance=1"
+  --confighelp              Vis liste med indstillinger og nuværende værdier.
+  --config file             Anvend en anden indstillingsfil.
+</screen>
+<para
+>Flaget <option
+>-cs</option
+> lader dig justere et indstillingstilvalg som ellers kun kan justeres via indstillingsdialogerne. Men vær klar  over at når &kdiff3; afsluttes opbevares den ændrede værdi sammen med andre indstillinger. Med <option
+>--confighelp</option
+> kan du finde ud af  navnene på tilgængelige tilvalg og nuværende værdier.</para>
+<para
+>Via <option
+>--config</option
+> kan du angive en anden indstillingsfil. Hvis du ofte bruger &kdiff3; med helt forskellige indstillinger tillader dette dig nemt at skifte mellem dem.</para>
+</sect2>
+<sect2
+><title
+>Kommandolinjeflag som ignoreres</title>
+<para
+>Mange personer vil bruge &kdiff3; sammen med et versionshåndteringssystem, men når versionshåndteringssystemet kalder &kdiff3; med kommandolinjeflag som &kdiff3; ikke genkender, afsluttes &kdiff3; med en fejl. Integrationsindstillingerne gør det muligt at angive kommandolinjeflag som skal ignoreres af &kdiff3;. De vises i brugshjælpen som i dette eksempel:</para>
+<screen
+>--<replaceable
+>foo</replaceable
+>                     Ignoreres. (brugerdefineret)
+</screen>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Kommandolinjeflag at ignorere:</emphasis
+></term
+><listitem
+><para
+>En liste med flag, adskilte med semikolon ';'. Når et af disse flag findes på kommandolinjen, ignorerer &kdiff3; det og kører uden at rapportere en fejl. (Standard er "u;query;html;abort").</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Hvis dette ikke er nok, anbefales du at skrive et skalscript som udfører oversættelsen af flag.</para>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Dialogen Åbn</title>
+<para
+>Eftersom mange inddatafiler skal kunne vælges, har programmet en særlig åbningsdialog: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Åbningsdialogen tillader at filnavnene redigeres i hånden, at en fil vælges via filsøgeren ("Fil...") eller at nyligt brugte filer vælges i dropned-feltet. Hvis du åbner dialogen igen, eksisterer de nuværende navne stadigvæk der. Den tredje inddatafil kræves ikke. Hvis feltet for "C" forbliver tomt, udføres kun en tovejs sammenligninganalyse. </para
+><para
+>Du kan også vælge en mappe med "Mappe...". Hvis en mappe angives for A, starter en mappesammenligning og sammenfletning. Hvis A angiver en fil, men B, C eller udskriften angiver en mappe, bruger &kdiff3; filnavnet fra A i de angivne mapper. </para
+><para
+>Hvis "Sammenflet" er valgt, bliver linjen "Udskrift" redigerbar. Det kræves dog ikke at uddatafilens navn angives med det samme. Du kan også vente med dette til du gemmer. </para
+><para
+>Knappen "Indstil.." viser indstillingsdialogen, så du kan indstille tilvalgene inden analysen udføres. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Indsæt eller slip inddata</title>
+<para
+>Sommetider vil du sammenligne dele af en tekst som ikke er en egen fil. &kdiff3; lader dig også indsætte tekst fra klippebordet i det inddatavindue for sammenligning som har fokus. Sammenligningsanalysen sker så med det samme. I åbningsdialogen behøver du så ikke at angive filer, men kun at lukke den via "Annullér". </para
+><para
+>Du kan også bruge træk og slip: Træk en fil fra en filhåndtering eller markeret tekst fra en editor og slip den på et inddatavindue til sammenligning. </para
+><para
+>Hvad er idéen? Sommetider indeholder en fil to lignende funktioner, men at kontrollere hvor ens de virkelig er bliver en stor anstrengelse hvis du først skal oprette to filer og derefter indlæse dem. Nu kan du helt enkelt kopiere, indsætte og sammenligne de relevante afsnit. </para
+><para
+>Bemærk: For øjeblikket kan du ikke trække noget fra &kdiff3;. Det understøttes kun at slippe inddata i sammenligningvinduet. </para
+><para
+>Advarsel: Visse editorer tolker stadigvæk træk og slip til et andet program som klip ud (i stedet for kopiér) og indsæt. De oprindelige data kan derfor gå tabt. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Sammenlign filer og tolke informationen i inddatavinduerne</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<sect2
+><title
+>Informationslinje</title
+><para
+>Længst oppe i hvert tekstvindue er dets "informationslinje". Informationslinjerne i inddatavinduet indeholder bogstaven "A", "B" eller "C", filnavnet og linjenummeret for den første synlige linje i vinduet. (Bemærk at vinduet "C" er valgfrit.) Hver informationslinje vises i en egen farve. </para
+><para
+>Når du vælger en anden fil ved at bladre eller afslutter at redigere filnavnet her ved at trykke på returtasten, indlæses den nye fil og sammenlignes med filen eller filerne som allerede er indlæste. </para
+></sect2
+><sect2
+><title
+>Farvelægning</title
+><para
+>De tre inddatavinduer tildeles bogstaverne "A", "B" og "C". "A" har blå farve, "B" har grøn farve og "C" har magenta. (Dette er standardfarver, men de kan ændres via menuen Opsætning.) </para
+><para
+>Når en forskel opdages viser farven hvilken inddatafil som adskiller sig. Når begge de øvrige inddatafiler adskiller sig, er farven som bruges for at udtrykke dette normalt rød ("Konfliktfarve" i indstillingerne). Dette farvelægningsmønster er særlig nyttigt i tilfældet med tre inddatafiler, som ses i næste afsnit (<link linkend="merging"
+>Sammenfletning</link
+>). </para
+></sect2
+><sect2
+><title
+>Sammenfatningssøjle</title
+><para
+>Til venstre for hver tekst er "sammendragssøjlen". Hvis forskelle opstod på en linje, viser sammendragssøjlen tilsvarende farve. For en forskel som kun består af blanke tegn er sammendraget afkrydset. For programmeringssprog, hvor blanke tegn ikke er så vigtige er det nyttigt at se med et blik om noget af vigtighed er ændret. (For C/C++ er blanke tegn kun interessante inde i strenge, i kommentarer, for præprocessoren og i nogle meget esoteriske situationer.) </para
+><para
+>Den lodrette linje som adskiller sammendragssøjlen og teksten er afbrudt hvis inddatafilen ikke har nogen linjer der. Når tekstombrydning er aktiveret så vil denne linje se prikket ud for ombrudte linjer. </para
+></sect2
+><sect2
+><title
+>Oversigtssøjle</title
+><para
+>På højre side er en "oversigtssøjle" synlig til venstre for den lodrette rullebjælke. Den viser et komprimeret sammendrag af inddata "A". Alle forskelle og konflikter er synlige med et blik. Når kun to inddatavinduer bruges, ses alle forskelle i rødt her, eftersom alle forskelle også er konflikter. Et sort rektangel indrammer den synlige del af inddata. For meget lange inddatafiler, hvor antallet af inddatalinjer er større end højden på oversigten i billedpunkter, deler flere inddatalinjer en oversigtslinje. En konflikt har prioritet over enkle forskelle, som har prioritet over ingen ændringer, så ingen forskelle eller konflikter går tabte her. Ved at klikke på oversigtssøjlen vises den tilsvarende tekst. </para
+></sect2
+><sect2 id="manualdiffhelp"
+><title
+>Justér linjer manuelt</title
+><para
+>Sommetider placerer algoritmen forkerte linjer ved siden af hinanden, eller du vil  sammenligne et stykke tekst med tekst på en helt anden position i den anden fil. I disse tilfælde kan du manuelt fortælle  &kdiff3; at visse linjer skal arrangeres i bestemte linjer linje. Markér teksten som du vil arrangere med musen, som du ville gøre ved kopi og indsæt, i det første diff-vindue og vælg derefter "Tilføj manuel justering af sammenligning" i menuen "Sammenligning" (genvejstasten "Ctrl+Y"). En orange linje vises i sammenfatningssøjlen udfor den markerede tekst. Gentag det for den anden og (hvis tilgængelig) tredje sammenligningsvisning. &kdiff3; genberegner med det samme sammenligningen hver gang du gør det, og justerer de markerede linjer. Naturligvis matcher nogle af linjerne tidligere matchede ikke længere. </para
+><para
+>For øjeblikket understøttes ikke sammenfletning ved brug af manuel hjælp til sammenligning. </para
+></sect2>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Sammenfletning og editorvinduet for sammenfletning af uddata</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Editorvinduet for sammenfletning af uddata (under inddatavinduet for sammenligning) har også en informationslinje længst oppe som viser "Uddata", filnavnet og "[Ændret]" hvis du har redigeret noget. Oftest indeholder det en tekst fra de automatiske sammenfletningsfunktioner, men det indeholder også ofte konflikter. </para
+><para
+>Gem er deaktiveret indtil alle konflikter er løst!!! (Brug knapperne "Gå til foregående/næste uløste konflikt" for at finde de tilbageværende konflikter.) </para
+><para
+>Med kun to filer er hver forskel også en konflikt, som skal løses manuelt. </para
+><para
+>Med tre inddatafiler behandles den første som basis, mens den anden og tredje inddatafil indeholder ændringer. Hvis kun inddata B eller C er ændret for en vis linje, men ikke begge vælges den ændrede kilde automatisk. Kun hvis B og C er ændret på samme linjer, detekterer værktøjet en konflikt som skal løses manuelt. Når B og C er ens, men ikke det samme som A, vælges C.  </para
+><sect2
+><title
+>Sammenfatningssøjlen</title
+><para
+>Editorvinduet for sammenfletning af uddata har også en sammendragssøjle til venstre. Den viser bogstaverne for inddata fra hvilken  linjen valgtes, eller ingenting hvis alle tre kilder var ens for linjen. Ved konflikter viser den et spørgsmålstegn "?" og linjen viser "&lt; Konflikter ved sammenfletning &gt;", alt med rødt. Eftersom det ville tage meget lang tid at løse konflikter linje for linje, grupperes linjer i grupper som har samme forskelle og konfliktkarakter. Konflikter med kun blanke tegn adskilles dog fra andre konflikter for at forbedre sammenfletningen af filer hvor indrykningen er ændret på mange linjer. </para
+></sect2
+><sect2 id="synchronise_views"
+><title
+>Indstil nuværende gruppe og synkronisér sammenfletnings- og sammenligningsvisningen position</title
+><para
+>Når du klikker på sammenfatningssøjlen med venstre museknap i et af  vinduerne, så markeres gruppen som hører til den linje i alle vinduer og gruppens begyndelse vises. (Dette kan indebære et automatisk skift af position i vinduerne hvis gruppens begyndelse ikke ses.) Gruppen bliver så til den "nuværende gruppe". Den markeres med "Baggrundsfarven for nuværende sammenligningsområde" og en sort linje vises til venstre for teksten. </para
+></sect2
+><sect2
+><title
+>Vælg inddata A, B eller C for nuværende konflikt og redigering</title
+><para
+>Knaplinjen under menulinjen indeholder tre knapper for inddatavalg som indeholder bogstaverne "A", "B" og "C". Klik på knappen for inddatavalg for at indsætte linjer (eller fjerne dem hvis de allerede er indsat) fra de respektive kildefil. For at vælge linjer fra flere inddatafiler klikkes på de respektive knapper i den nødvendige rækkefølge. Hvis du for eksempel ønsker at linjer fra "B" skal havne før linjer fra "A" i uddata, klikkes først på "B" og derefter på "A". </para
+><para
+>Hvis du bruger tilvalget automatisk at gå videre (<link linkend="autoadvance"
+>Gå automatisk til næste uløste konflikt efter valg af kilde</link
+>), skal du deaktivere dette inden du vælger linjer fra flere inddatafiler eller hvis du vil redigere linjerne efter du valgt dem. Ellers går &kdiff3; til næste konflikt efter den første inddatafil er valgt. </para
+><para
+>Det er ofte nyttigt direkte at redigere sammenflettet uddata. Sammenfatningssøjlen viser "m" for hver linje som er ændret manuelt. Når forskellene for eksempel justeres på en måde så et enkelt valg af inddata ikke er tilfredsstillende, kan du markere teksten som behøves og bruge normal <link linkend="selections"
+>kopiér og indsæt</link
+> for at placere den i sammenflettet uddata. </para
+><para
+>Sommetider, når en linje fjernes enten på grund af automatisk fletning eller ved redigering og ingen andre linjer er tilbage i gruppen, vises teksten  &lt;No src line&gt; på linjen. Det er kun en pladsmarkør for gruppen hvis du ændrer mening og vælger en kilde igen. Teksten ses ikke i gemte filer eller i nogen markeringer som du vil kopiere og indsætte. </para
+><para
+>Teksten "&lt;Merge Conflict&gt;" vises i klippebordet hvis du kopierer og indsætter noget tekst som indeholder en sådan linje. Men vær satdig forsigtig med at gøre det. </para
+></sect2
+><sect2
+><title
+>Vælg inddata A, B eller C for alle konflikter</title
+><para
+>Den normale sammenfletning vil starte med at løse simple konflikter automatisk. Men "Flet"-menu sørger for handlinger for andre almindelige behov. Hvis du skal vælge samme kilde for de fleste konflikter, så kan du vælge"A", "B" eller "C" overalt, eller kun for de tiloversblevne uløste konflikter, eller for uløste konflikter med blanke tegn. Hvis du ønsker at afgøre hver lille forskel selv, kan du "Sætte lille forskel til konflikt". Eller hvis du ønsker at vende tilbage de automatiske valg udført af &kdiff3; så  vælg "Løs simple konflikter automatisk". &kdiff3; starter så sammenfletningen forfra. For handlinger der ændrer dine  tidligere ændringer vil &kdiff3; bede om bekræftelse før den går videre. </para
+><para
+>Bemærk: Når en af kilderne for uløste konflikter med blanke tegn vælges og tilvalgene "Ignorér tal" eller "Ignorér C/C++ kommentarer" bruges så  bliver ændringer i tal eller kommentarer også behandlet som blanke tegn. </para
+></sect2
+><sect2 id="vcskeywordsmergesupport"
+><title
+>Sammenflet automatisk nøgleord for versionshåndtering og historik (log)</title
+><para
+>Mange versionskontrolsystemer understøtter specielle nøgleord i filen. (f.eks. "&#36;Date:&#36;", "&#36;Header&#36;", "&#36;Author&#36;", "&#36;&#36;" osv.) Ved check-in ændrer versionskontrolsystemet (VCS) disse linjer. For eksempel bliver "&#36;Date:&#36;" til "&#36; Date:2005/03/22 18:45:01 &#36;". Idet denne linje vil være forskellig i hver version af filen, ville det kræve manuel interaktion under sammenfletningen. </para
+><para
+>&kdiff3; tilbyder automatisk sammenfletning af disse indgange. For enkle linjer som matcher tilvalget "Regulært udtryk for automatisk sammenfletning" i alle inddatafiler vælger &kdiff3; linjen fra B, eller om tilgængelig, den fra C. (Desuden er det nødvendigt at linjerne det drejer sig om linjes op i sammenligningen og at foregående linje ikke indeholder en konflikt.) Den automatiske sammenfletning kan enten udføres med det samme når sammenfletningen startes (aktivér tilvalget "Kør automatisk sammenfletning med regulært udtryk når sammenfletning starter") eller senere via "Kør automatisk sammenfletning med regulært udtryk" i menuen Sammenflet. </para
+><para
+>Automatisk sammenfletning for versionshåndteringshistorik (også kaldet "log") understøttes også. Automatisk sammenfletning af historik kan enten udføres med det samme når sammenfletningen startes ved at aktivere tilvalget  "Sammenfletning ifølge versionshåndteringshistorik når sammenfletning starter" eller senere via "Løs automatisk historikkonflikter" i menuen Sammenflet. </para
+><para
+>Oftest begynder versionshåndteringshistorikken med en linje som indeholder nøgleordet "&#36;Log&#36;". Den skal matches af tilvalget "Regulært udtryk for historikkens begyndelse". &kdiff3; detekterer hvilke efterfølgende linjer som indgår i historikken ved at analysere de indledende tegn som fandtes før nøgleordet "&#36;Log&#36;". Hvis samme "indledende kommentar" også findes på følgende linjer inkluderes de også i historikken. </para
+><para
+>Ved hver arkivering skriver VCS en entydig linje som angiver version, dato- og tidsinformation fulgt af linjer med brugerens kommentarer. Disse linjer udgør en historikindgang. Historikafsnittet vokser ved hver arkivering og de seneste indgange vises længst oppe (efter historikkens startlinje). </para
+><para
+>Når to udvikler arkiverer grene af en fil under parallel udvikling, kommer historikken for sammenfletning til at indeholde flere indgange som vises som konflikter under sammefletning af grenene. Eftersom sammenfletning af dem kan blive meget trættende, tilbyder &kdiff3; understøttelse for den med to mulige strategier: Blot indsætte historikinformationen fra begge bidragsyderne længst oppe, eller sortere historikinformationen ifølge en brugerdefineret nøgle. </para
+><para
+>Metoden kun at indsætte alle indgange er nemmest at indstille. &kdiff3; behøver kun en metode til at detektere hvilke linjer som hører til en historikindgang. De fleste VCS indsætter en tom linje efter hver historikindgang. Hvis der ikke findes andre tomme linjer, er det en tilstrækkelig betingelse for &kdiff3;. Angiv blot et tomt "Regulært udtryk for historikkens begyndelse". Hvis kriteriet med en tom linje ikke er tilstrækkeligt kan du angive et regulært udtryk for at detektere historikindgangen begyndelse. </para
+><para
+>Bemærk at &kdiff3; fjerner duplikerede historikindgange. Hvis en historikindgang blev fundet flere gange i en inddatafils historik, forbliver kun en indgang i uddataen. </para
+><para
+>Hvis du vil sortere historikken skal du angive hvordan sorteringsnøglen skal bygges. Brug parenteser som i "Regulært udtryk for historikindgangens begyndelse" for at gruppere dele af det regulære udtryk som senere skal bruges i sorteringsnøglen. Angiv derefter "Sorteringsnøglernes rækkefølge fra historikindgangens begyndelse" med en liste af tal som refererer til gruppens position i det regulære udtryk adskilt af kommategn ",". </para
+><para
+>Eftersom det ikke er så enkelt at få det rigtigt med det samme, kan du teste  og forbedre det regulære udtryk og nøglegenereringen i en særlig dialog ved at klikke på knappen "Test dine regulære udtryk". </para
+><para
+>Antag at historikken ser ud så her: <screen>
+/**************************************************************************
+** HISTORIK:    &#36;Log: \toms_sammenfletning_hovedvisning\Mit_program\kode\komplexalgoritm.cpp &#36;
+**
+**     \head\integreringsgren_12   2 Apr 2001 10:45:41   tom
+**  Sammenflettede grenen simongren_15.
+**
+**     \main\henry_felretningsgren_7\1   30 Mar 2001 19:22:05   henry
+**  Forbedrede hastigheden for delrutinen forvandleTil().
+**  Ordnede sammenbrud.
+**************************************************************************/
+</screen
+> Historikkens indledende linje matcher det regulære udtryk ".*\&#36;Log.*\&#36;.*". Derefter følger historikindgangene. </para
+><para
+>Linjen med nøgleordet "&#36;Log&#36;" begynder med to "*" og derefter følger et mellemrum. &kdiff3; bruger den første streng uden blanke tegn som "indledende kommentar" og antager at historikken slutter med den første linje uden denne indledende kommentar. I eksemplet slutter den sidste linje med en streng som også begynder med to "*", men i stedet for et mellemrum følger flere "*". Derfor afslutter denne linje historikken. </para
+><para
+>Hvis sortering af historikken ikke kræves kan det regulære udtryk for historikindgangens begyndelsen se sådan her ud. (Linjen er delt i to eftersom den ikke ville få plads ellers.) <screen>
+\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</screen
+> For detaljer om regulære udtryk se <ulink url="http://doc.trolltech.com/3.3/qregexp.html#details"
+>Trolltechs dokumentation af regulære udtryk</ulink
+>. Bemærk at "\s" (med et lille "s") matcher alle blanke tegn og  "\S" (med et stort "S") matcher alle tegn som ikke er blanke. I vort eksempel indeholder historikindgangens begyndelse først versionsinformation med det regulære udtryk "\\main\\\S+", datoen som består af dagen "[0-9]+", månaden "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" og året "[0-9][0-9][0-9][0-9]", tiden "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" og til sidst udviklerens brugernavn ".*". Bemærk at den indledende kommentar (i eksemplet "**") allerede er fjernet af &kdiff3; inden matcheforsøget, derfor begynder det regulære udtryk med at matche et eller flere blanke tegn "\s*". </para
+><para
+>Hvis du kræver sorteret historik skal sorteringsnøglen beregnes. For at gøre dette skal relevante dele i det regulære udtryk grupperes med parenteser. (De ekstra parenteser kan også forblive hvis historiksortering deaktiveres.) <screen>
+\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</screen
+> Parenteserne indeholder nu 1. versionsinformation, 2. dag, 3. måned, 4. år, 5. tid, 6. navn. Men hvis vi vil sortere efter dato og tid skal vi oprette en nøgle med elementerne synlige i en anden rækkefølge: Først året, fulgt af måned, dag, tid, versionsinformation og navn. Derfor skal sorteringsnøglens rækkefølge som angives være  "4,3,2,5,1,6". </para
+><para
+>Eftersom månednavne ikke er gode at sortere efter ("Apr" ville være først) detekterer &kdiff3; hvilken rækkefølge månednavnene angives og bruger dette nummer i stedet  for ("Apr"->"04"). Og hvis et rent nummer findes forvandles det til en fireciffers værdi med indledende nuller for sortering. Endelig bliver den resulterende sorteringsnøgle for den første historikindgangens indledende linje: <screen
+>2001 04 0002 10:45:41 integreringsgren_12   tom 
+</screen>
+</para
+><para
+>For mere information, se også <link linkend="diffmergeoptions"
+>Opsætning af sammenlign og sammenflet</link
+>. </para>
+</sect2>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigering og redigering</title>
+<para
+>Meget navigering gøres med rullelisterne og musen, men du kan også navigere med tastaturet. Hvis du klikker på et vindue kan du bruge markørtasterne venstrepil, højrepil, opadpil, nedadpil, Page Up, Page Down, Home, End, Ctrl+Home og Ctrl+End ligesom du kan i andre programmer. Sammenfatningssøjlen ved siden af inddatafilernes lodrette rulleliste kan også bruges til at navigere ved at klikke i den. </para
+><para
+>Du kan også bruge musehjulet til at rulle opad og nedad. </para
+><para
+>I editoren for fletning kan du også bruge andre taster til redigering. Du kan skifte mellem indsætnings- og erstatningstilstand med Insert-tasten. (Normaltilstanden er at indsætte.) </para
+><para
+>Et klik med venstre museknap i en sammenfatningssøjle synkroniserer alle vinduer til at vise begyndelsen af samme gruppe af linjer (som forklaret i afsnittet <link linkend="synchronise_views"
+>Indstil nuværende gruppe og synkronisér sammenfletnings- og sammenligningsvisningens position</link
+>). </para
+><para
+>Værktøjslinjen indeholder også ni navigeringsknapper som du kan bruge til at gå til nuværendel/førsea/sidste forskel, til næste/foregående forskel (Ctrl+Nedadpil eller Ctrl+Opadpil), til næste/foregående konflikt (Ctrl+Page Down eller Ctrl+Page Up) eller til næste/foregående uløste konflikt. Bemærk at for &kdiff3; forbliver en "konflikt" som ikke automatisk blev løst ved start af sammenfletningen altid en "konflikt" også selvom den er løst. Deraf nødvendigheden af at skelne "uløste konflikter". </para>
+<sect2 id="autoadvance"
+><title
+>Automatisk fortsættelse</title>
+<para
+>Der er også en knap som hedder "Gå automatisk til næste uløste konflikt efter valg af kilde" (automatisk fortsættelse). Hvis du aktiverer dette, så går &kdiff3; automatisk til næste uløste konflikt når en kilde vælges. Dette kan hjælpe til når du kun vil vælge en kilde. Når du behøver begge kilder, eller du vil redigere efter valget, bør du formodentlig slå dette fra. Inden &kdiff3; fortsætter til næste uløste konflikt, vises effekten af valget en kort tid. Denne forsinkelse kan justeres i indstillingerne under Sammenlign og sammenflet. Du kan angive <guilabel
+>Forsinkelse ved automatisk fortsættelse</guilabel
+> i millisekunder mellem 0 og 2000. </para>
+</sect2>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Markér, kopiér og indsæt</title>
+<para
+>Inddatavinduerne viser ikke nogen markør, så markeringer skal udføres med musen, ved at klikke med venstre museknap på begyndelsen, holde museknappen nede og gå til slutningen, hvor museknappen slippes igen. Du kan også markere et ord ved at dobbeltklikke på det. I editoren for sammenfletningsuddata kan du også markere med tastaturet, ved at holde shift-tasten nede og navigere med piletasterne. </para
+><para
+>Hvis markeringen overstiger det synlige område, kan du flytte musen over vindueskanterne, hvilket gør at &kdiff3; ruller i den retning. </para
+><para
+>For meget store markeringer kan du også bruge navigationstasterne mens museknappen holdes nede. Brug f.eks. Page Up og Page Down for hurtigt at gå til en bestemt position. Slip museknappen på slutpositionen. </para
+><para
+>For at markere alt i det nuværende vindue, bruges menuen "Redigér" -> Markér alt" (Ctrl+A). </para
+><para
+>For at kopiere til klippebordet skal du trykke på knappen "Kopiér" (Ctrl+C eller Ctrl+Insert). Men der er et tilvalg som hedder "Kopiér automatisk markering". Hvis det er aktiveret, kopieres hvad du end vælger med det samme, og du behøver aldrig eksplicit kopiere. Men vær forsigtig når du bruger dette, eftersom klippebordets indhold kan ødelægges ved en fejl. </para
+><para
+>"Klip" (Ctrl+X eller Shift+Delete) kopierer til klippebordet og fjerner den markerede tekst. </para
+><para
+>"Indsæt" (Ctrl+V eller Shift+Insert) indsætter teksten på klippebordet ved markørens position eller i stedet for den nuværende markeringen. Hvis du indsætter i et af sammenligningsvinduerne vises klippebordets indhold i vinduet og sammenligningen genstartes med det samme. Dette er nyttigt hvis du hurtigt vil hente et stykke tekst et sted og sammenligne det med noget andet uden først at oprette filer. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Gemmer</title>
+<para
+>At gemme tillades kun når alle konflikter er løste. Hvis filen allerede findes og tilvalget "Sikkerhedskopiér filer" er markeret, ændres originalversionens navn med tilføjelse af filendelsen .orig, og hvis en sådan fil allerede findes fjernes den. Når du afslutter eller starter en ny sammenligningsanalyse og data ikke er gemt endnu, spørger &kdiff3; om du vil gemme, annullere eller fortsætte uden at gemme. (&kdiff3; fanger ingen signaler, så hvis du "dræber" &kdiff3; går data tabt.) </para
+><para
+>Linjeslut gemmes ifølge den normale metoden i det underliggende operativsystem. For Unix slutter hver linje med et nylinjetegn "\n", mens for Windows-baserede systemer slutter hvert linje med et returtegn og et nylinjetegn "\r\n". &kdiff3; beholder ikke linjeslut for inddatafilerne, hvilket også betyder at du ikke skal bruge &kdiff3; med binære filer. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Søg efter strenge</title>
+<para
+>Du kan søge efter en streng i et hvilket som helst tekstvindue i &kdiff3;. Kommandoen "Søg..." (Ctrl+F) i menuen Redigér, viser en dialog som lader dig angive strengen at søge efter. Du kan også vælge de vinduer som skal søges. Søgning starter altid fra begyndelsen. Brug kommandoen "Søg igen" (F3) for at fortsætte til næste forekomst. Hvis du vælger at søge i flere vinduer, gennemsøges det første vindue fra begyndelsen til slutningen inden søgningen fortsætter fra begyndelsen i næste vindue, osv. </para>
+</sect1>
+
+<sect1 id="printing"
+><title
+>Udskrift</title>
+<para
+>&kdiff3; understøtter udskrift af forskelle mellem tekstfiler. Kommandoen "Skriv ud..." (Ctrl+P) i menuen Fil viser en dialog som lader dig vælge printer og justere andre tilvalg. </para
+><para
+>Der er flere muligheder for at justere området. Afhængig af forskellige udskriftsdialoger på forskellige operativsystemer, varierer metoden for at opnå valg af et vist område. </para>
+<variablelist>
+   <varlistentry
+><term
+>Alle:</term
+><listitem
+><para
+>Udskriv alt.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Nuværende:</term
+><listitem
+><para
+>Udskriv en side som begynder på den første synlige linje i vinduet. (På systemer uden dette tilvalg kan dette opnås ved at angive sidenummeret 10000 for udskrift.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Markering:</term
+><listitem
+><para
+>Inden du vælger at udskrive, markeres tekst med musen (som for kopiere og indsætte) i et af sammenligningsvinduerne for at definere start- og slutlinje. Hvis ingen tekst er markeret i et af sammenligningsvinduerne, er dette tilvalg ikke tilgængeligt. (På systemer uden dette tilvalg kan dette opnås ved at angive sidenummeret 9999 for udskrift.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Område:</term
+><listitem
+><para
+>Angiv første og sidste side. </para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Andre vigtige indstillinger for udskrift tages fra de normale indstillinger: </para
+><itemizedlist>
+   <listitem
+><para
+>Skrifttype, tegnstørrelse</para
+></listitem>
+   <listitem
+><para
+>Vis linjenummer</para
+></listitem>
+   <listitem
+><para
+>Linjebrud</para
+></listitem>
+   <listitem
+><para
+>Farver</para
+></listitem>
+   <listitem
+><para
+>osv.</para
+></listitem>
+</itemizedlist>
+<para
+>Landskabsformatering anbefales også for udskrift. </para>
+</sect1>
+
+<sect1 id="options"
+><title
+>Tilvalg</title>
+<para
+>Tilvalg og listen med nylige filer gemmes når du afslutter programmet, og indlæses igen når du starter det. (Menuen Opsætning->Indstil KDiff3 ...) </para>
+<sect2
+><title
+>Skrifttype</title>
+<para
+>Vælg en skrifttype med fast bredde. (På visse systemer viser dialogen også skrifttyper med variabel bredde, men du bør ikke bruge dem.) </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Kursiv stil for forskelle:</emphasis
+></term
+><listitem
+><para
+>Hvis du markerer dette, vises tekstforskelle med kursiv versionen af den valgte skrifttype. Hvis skrifttypen ikke understøtter kursiv stil, gør dette ingenting.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Farver</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Forgrundsfarve:</emphasis
+></term
+><listitem
+><para
+>Oftest sort. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Baggrundsfarve:</emphasis
+></term
+><listitem
+><para
+>Oftest hvid. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Baggrundsfarve for sammenligning:</emphasis
+></term
+><listitem
+><para
+>Oftest lysegrå. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve A:</emphasis
+></term
+><listitem
+><para
+>Oftest mørkeblå. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve B:</emphasis
+></term
+><listitem
+><para
+>Oftest mørkegrøn. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve C:</emphasis
+></term
+><listitem
+><para
+>Oftest mørk magenta. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Konfliktfarve:</emphasis
+></term
+><listitem
+><para
+>Oftest rød.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Baggrundsfarve for nuværende område:</emphasis
+></term
+><listitem
+><para
+>Oftest lysegul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Baggrundsfarve for nuværende sammenligningsområde:</emphasis
+></term
+><listitem
+><para
+>Oftest mørkegul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve for manuelt valgte sammenligningsområder:</emphasis
+></term
+><listitem
+><para
+>Oftest orange.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve for nyeste fil i mappesammenligning:</emphasis
+></term
+><listitem
+><para
+>Oftest grøn.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve for ældste fil i en mappesammenligning:</emphasis
+></term
+><listitem
+><para
+>Oftest rød.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve for middelgamle filer i en mappesammenligning:</emphasis
+></term
+><listitem
+><para
+>Oftest mørkegul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farve for manglende filer i et mappesammenligning:</emphasis
+></term
+><listitem
+><para
+>Oftest sort.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>At ændre farverne for mappesammenligninger får ikke nogen virkning før end næste mappesammenligning startes. </para>
+<para
+>For systemer med kun 16 eller 256 farver er visse rene farver ikke tilgængelige. For sådanne systemer vælger knappen "Standard" en ren farve. </para>
+</sect2>
+
+<sect2
+><title
+>Opsætning af editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Tabulator indsætter mellemrum:</emphasis
+></term
+><listitem
+><para
+>Hvis dette ikke er markeret, og du trykker på tabulatortasten, indsættes en tabulator, ellers indsættes et passende antal mellemrum.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tabulatorbredde:</emphasis
+></term
+><listitem
+><para
+>Kan justeres efter dine specielle behov. Normalværdien er 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatisk indrykning:</emphasis
+></term
+><listitem
+><para
+>Når du trykker på Enter eller returtasten, bruges foregående linjes indrykning for den nye linje. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kopiere markering automatisk:</emphasis
+></term
+><listitem
+><para
+>Hver markering kopieres med det samme til klippebordet når dette aktiveres, og du behøver ikke kopiere den eksplicit. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Stil for linjeafslutning:</emphasis
+></term
+><listitem
+><para
+>Når du gemmer kan du vælge den stil for linjeafslutning du foretrækker. Standardindstillingen er det almindelige valg for det operativsystem der bruges. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="diffmergeoptions"
+><title
+>Opsætning af sammenligning og fletning</title>
+<para
+>Når filer sammenlignes forsøger &kdiff3; først at matche linjer som er ens i alle inddatafiler. Det er kun under dette skridt at blanke tegn kan ignoreres. Det næste skridt sammenligner hver linje. Under dette skridt ignoreres  blanke tegn ikke. Under sammenfletning ignoreres blanke tegn heller ikke. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Behold returtegn:</emphasis
+></term
+><listitem
+><para
+>Visse editorer (på visse systemer) gemmer returtegn '\r' og nylinjetegn '\n' i slutningen på linjen, mens andre kun gemmer nylinjetegnet '\n'. Oftest ignorerer &kdiff3; returtegnet, men så ser filer som ikke har samme størrelse ens ud ved sammenligning side for side. Når dette tilvalg  er markeret, gøres returtegn synlige, men behandles som blanke tegn. Dette tilvalg skal være slået fra under en sammenfletning. Standardværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorér cifre:</emphasis
+></term
+><listitem
+><para
+>Standardværdien er fra. Ciffertegn ('0'-'9','.','-') ignoreres under første del af analysen når linjematchningen udføres. Forskellene for resultatet vises alligevel, men de behandles som blanke tegn. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorér C/C++ kommentarer:</emphasis
+></term
+><listitem
+><para
+>Normalværdien er fra. Ændringer i kommentarer vil blive behandlet ligesom ændringer i blanke tegn. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorér versaltype:</emphasis
+></term
+><listitem
+><para
+>Standardværdien er fra. Ændringer i versaltilstand for tegn (såsom 'A' eller 'a') håndteres som ændringer i blanke tegn. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Præprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>Se <link linkend="preprocessors"
+>næste afsnit</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Præprocessorkommando for linjematchning:</emphasis
+></term
+><listitem
+><para
+>Se <link linkend="preprocessors"
+>næste afsnit</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Prøv hårdt:</emphasis
+></term
+><listitem
+><para
+>Prøv hårdt at finde selv små fejl. (Normalt slået til.) Det er formodentlig effektivt for komplicerede og store filer, og langsomt for meget store filer. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Forsinkelse ved automatisk fortsættelse (ms):</emphasis
+></term
+><listitem
+><para
+>I automatisk fortsættelsestilstand angiver denne indstilling hvor længe resultatet for gruppen skal vises inden der hoppes til næste uløste konflikt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Blanke tegn 2/3-fil fletningsstandard:</emphasis
+></term
+><listitem
+><para
+>Løs automatisk alle konflikter for blanke tegn ved at vælge angiven fil. (Standardværdien er manuelt valg.) Nyttigt hvis blanke tegn virkelig ikke er vigtige i mange filer. Hvis du kun behøver det ind iblandt, er det bedre at bruge "Vælg A/B/C for uløste konflikter med blanke tegn" i menuen "Sammenflet". Bemærk at hvis du enten aktiverer Ignorér cifre eller "Ignorere C/C++ kommentarer" gælder det automatiske valg også ved konflikter for cifre eller kommentarer. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Regulært udtryk for automatisk sammenfletning:</emphasis
+></term
+><listitem
+><para
+>Regulært udtryk for linjer hvor &kdiff3; automatisk skal vælge en kilde. Se også <link linkend="vcskeywordsmergesupport"
+>Automatisk sammenfletning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kør automatisk sammenfletning med regulært udtryk når sammenfletning starter:</emphasis
+></term
+><listitem
+><para
+>Hvis aktiveret udfører &kdiff3; den automatiske sammenfletning med "Regulært udtryk for automatisk sammenfletning" når en sammenfletning startes. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Regulært udtryk for historikkens begyndelse:</emphasis
+></term
+><listitem
+><para
+>Regulært udtryk for begyndelsen af historikindgangen for sammenfletning. Som oftest indeholder linjen nøgleordet "&#36;Log&#36;". Standardværdi: ".*\&#36;Log.*\&#36;.*" </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Regulært udtryk for historikindgangens begyndelse:</emphasis
+></term
+><listitem
+><para
+>En historikindgang for sammenfletning består af flere linjer. Angiv det regulære udtryk for at detektere den første linje (uden indledende kommentar). Brug parenteser for at gruppere nøglerne du vil bruge til sortering. Hvis det efterlades tomt, antager &kdiff3; at tomme linjer skiller historikindgangene ad. Se også <link linkend="vcskeywordsmergesupport"
+>Automatisk sammenfletning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sortering af historiksammenfletning:</emphasis
+></term
+><listitem
+><para
+>Aktivér sortering af versionshåndteringshistorik. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sorteringsnøglernes rækkefølge fra historikindgangens begyndelse:</emphasis
+></term
+><listitem
+><para
+>Hver parentes som bruges i det regulære udtrykket for historikkens startindgang grupperer en nøgle som kan bruges til sortering. Angiv listen med nøgler (som nummereres i rækkefølge de optræder med begyndelsen på 1) med ',' som skilletegn (f.eks. "4,5,6,1,2,3,7"). Hvis det efterlades tomt udføres ingen sortering. Se også <link linkend="vcskeywordsmergesupport"
+>Automatisk sammenfletning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sammenfletning ifølge versionshåndteringshistorik når sammenfletningen starter:</emphasis
+></term
+><listitem
+><para
+>Hvis aktiveret udfører &kdiff3; den automatiske sammefletning af historik med tidligere nævnte tilvalg når en sammenfletning startes. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Test dine regulære udtryk</emphasis
+></term
+><listitem
+><para
+>Denne knap viser en dialog som lader dig forbedre og teste det regulære udtryk ovenfor. Kopiér blot de respektive data fra dine filer til eksempellinjerne. "Matcheresultaterne" viser med det samme om det lykkes at matche eller ej. "Sorteringsnøgleresultat" viser nøglen som bruges til sortering ved sammenfletning af historik. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Irrelevant sammenfletningskommando:</emphasis
+></term
+><listitem
+><para
+>Angiv en egen kommando som skal kaldes når &kdiff3; detekterer at filen fra B ikke bidrager med relevant data som ikke allerede findes i filen fra C. Denne kommando kaldes med de tre filnavne som parametre. Data som matches af "Regulært udtryk for automatisk sammenfletning" eller i historikken anses ikke for at være relevant. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Mappefletning</title>
+<para
+>Disse valgmulighederne har at gøre med gennemsøgning af mappen og håndtering af sammenfletningen: Se <link linkend="dirmergeoptions"
+>Mappesammenligning og sammenfletning</link
+> for detaljer. </para
+><para
+>Der er endnu en valgmulighed her som også er relevant for at gemme enkelte filer: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Sikkerhedskopiér filer:</emphasis
+></term
+><listitem
+><para
+>Når en fil gemmes og en ældre version allerede eksisterer, ændres originalversionens navn med tilføjelse af filendelsen ".orig". Hvis en gammel sikkerhedskopi med ".orig" allerede eksisterer slettes den uden sikkerhedskopiering. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Indstillinger for region og sprog</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Sprog:</emphasis
+></term
+><listitem
+><para
+>Justér brugergrænsefladens sprog. At ændre dette påvirker ikke programmet som kører. Du skal afslutte og genstarte &kdiff3; for at ændre sprog. (Dette er ikke tilgængeligt i &kde;-versionen af &kdiff3;, eftersom sproget kan justeres i de generelle &kde;-indstillinger.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Brug samme kodning til alt:</emphasis
+></term
+><listitem
+><para
+>Følgende kodningstilvalg kan justeres separat for hvert objekt, eller hvis tilvalget er sandt, indstilles alle værdier til den første værdi. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Lokal kodning:</emphasis
+></term
+><listitem
+><para
+>Ovenfor kodningsvælgerne vises en note som fortæller dig hvad den lokale kodning er (Den kan ikke justeres, men er kun til information hvis du ikke ved hvad den lokale kodning er, men har brug for at kunne vælge den.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning for A/B/C:</emphasis
+></term
+><listitem
+><para
+>Justér filkodningen for inddatafiler. Dette har en effekt på hvordan specialtegn tolkes. Eftersom du kan justere hvert kodning separat, kan du til og med sammenligne og sammenflette filer som blev gemt med forskellige kodninger. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning for sammenflettet uddata og ved at gemme:</emphasis
+></term
+><listitem
+><para
+>Når du har redigeret en fil, kan du justere hvilken kodning som bruges når den gemmes til disk. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning for præprocessorfiler:</emphasis
+></term
+><listitem
+><para
+>Når du definerer præprocessorer, kan de måske ikke håndtere din kodning (eksempelvis hvis dine filer bruger 16-bit Unicode og præprocessoren kun kan håndtere 8-bit ASCII). Med dette kan du definere kodningen for præprocessorens uddata. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Sprog som læses fra højre til venstre</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Diverse</title>
+<para
+>(Disse tilvalg og handlinger er tilgængelige i menuerne eller værktøjslinjen.)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Vis linjenummer:</emphasis
+></term
+><listitem
+><para
+>Du kan vælge om linjenummer skal vises for inddatafilerne.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Vis mellemrum og tabulatortegn i sammenligning:</emphasis
+></term
+><listitem
+><para
+>Sommetider er synlige mellemrum og tabulatortegn forstyrrende. Du kan slå dette fra.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Vis blanke tegn:</emphasis
+></term
+><listitem
+><para
+>Luk af for dette for ikke at vise ændringer af kun blanke tegn i teksten eller oversigtssøjlerne. (Bemærk at dette også gælder ændringer af cifre eller kommentarer hvis valgmulighederne "Ignorér cifre" eller "Ignorér C/C++ kommentarer" er aktive.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Overblikstilvalg:</emphasis
+></term
+><listitem
+><para
+>Disse tilvalg er kun tilgængelige når du sammenligner tre filer. I standardtilstand vises alle forskelle i en farvekodet oversigtssøjle, men sommetider er du især interesseret i forskellene mellem to af de tre filer. Ved at vælge oversigten "A mod B", "A mod C" eller "B mod C" vises en anden oversigtssøjle med den forespurgte information ved siden af den almindelige oversigt. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Tekstombrydning af diff-vinduer:</emphasis
+></term
+><listitem
+><para
+>Ombryd linjer når deres længde ville have været større end vinduets bredde. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Vis vindue A/B/C:</emphasis
+></term
+><listitem
+><para
+>Sommetider vil du gerne bruge skærmpladsen bedre for lange linjer. Skjul vinduer som ikke er vigtige. (I menuen Vinduer.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Skift opdelingsorientering:</emphasis
+></term
+><listitem
+><para
+>Skift mellem sammenligningsvinduer som vises ved siden af hinanden (A til venstre for B til venstre for C) eller ovenfor hinanden (A over B over C). Dette bør også hjælpe med lange linjer. (I menuen Vinduer.) </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Start sammenfletning hurtigt:</emphasis
+></term
+><listitem
+><para
+>Sommetider kigger du på forskelle, og bestemmer dig for at sammenflette. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Sammenflet denne fil" i menuen Mappe virker også hvis du kun sammenligner to filer. Et enkelklik starter sammenfletningen og bruger filnavnet på den sidste inddatafil som standarduddatafilnavn. (Når dette bruges til at genstarte en sammenfletning, beholdes uddatafilnavnet.)</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Indstil genvejstaster</title>
+<para
+>For øjeblikket understøtter kun &kde;-versionen indstillelige genvejstaster (Menuen Opsætning->Indstil genveje...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Præprocessorkommandoer</title>
+<para
+>&kdiff3; understøtter to præprocessortilvalg. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Præprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>Når en fil læses, sendes den via denne eksterne kommando. Uddata fra denne kommando vises i stedet for den oprindelige fil. Du kan skrive din egen præprocessor som opfylder dine specielle behov. Brug dette til at fjerne forstyrrende dele af filen, eller for automatisk at korrigere indrykning, osv. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Præprocessorkommando for linjematchning:</emphasis
+></term
+><listitem
+><para
+>Når en fil læses, sendes den via denne eksterne kommando. Hvis en præprocessorkommando (se ovenfor) også angives er udskriften fra præprocessoren input til kommandoen for linjematchning. Udskriften bruges kun under linjematchningsfasen af analysen. Du kan skrive din egen præprocessor som opfylder dine specielle behov. Hvert inddatalinje skal have en tilsvarende uddatalinje. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>Idéen er at tillade brugeren større fleksibilitet mens diff-resultatet indstilles. Men dette kræver et eksternt program, og mange brugere ønsker ikke selv at skrive et sådant. Heldigvis er det meget ofte sådan at  <command
+>sed</command
+> or <command
+>perl</command
+> vil kunne klare det. </para>
+<para
+>For eksempel et enkelt tilfælde at teste: Betragt filen a.txt (6 linjer): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> Og filen b.txt (3 linjer): <screen>
+      cg
+      dg
+      eg
+</screen
+> Uden en præprocessor ville følgende linjer placeres ud for hinanden: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Det er formodentlig ikke det der ønskes eftersom det første bogstav indeholder den interessante information. For at hjælpe matchealgoritmen med at ignorere det andet bogstav kan man bruge en linjematchende præprocessorkommando som erstatter 'g' med 'a': <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Med den kommando bliver resultatet af at matche: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Internt ser matchealgoritmen filerne efter den linjematchende præprocessor er kørt, men på skærmen er filen uforandret. (Den normale præprocessor ville også ændre data på skærmen.) </para>
+
+<sect2 id="sedbasics"
+><title
+>Basal <command
+>sed</command
+></title>
+<para
+>Dette afsnit introducerer blot nogle meget grundlæggende funktioner i <command
+>sed</command
+>. For mere information se <ulink url="info:/sed"
+>info:/sed</ulink
+> eller <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. En forkompileret version for &Windows; eksisterer på <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Bemærk at følgende eksempel antager at <command
+>sed</command
+> eksisterer i en mappe i miljøvariablen PATH. Hvis dette ikke er tilfældet, skal du angive fuldstændig absolut søgesti til kommandoen.  </para>
+<note
+><para
+>Bemærk også at følgende eksempel bruger enkle citationstegn ('), hvilket ikke virker i Windows. I Windows skal du i stedet bruge dobbelte citationstegn (").</para
+></note>
+<para
+>I denne sammenhæng bruges kun erstatningskommandoen i <command
+>sed</command
+>: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGUDTRYK</replaceable
+>/<replaceable
+>ERSTATNING</replaceable
+>/<replaceable
+>FLAG</replaceable
+>'
+</screen
+> Inden du bruger en ny kommando inde i &kdiff3;, bør du først teste den i en terminal. Her er kommandoen <command
+>echo</command
+> nyttig. For eksempel: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Dette eksempel viser en meget enkel sed-kommando som erstatter den første forekomst af "a" med "o". Hvis du vil erstatte alle forekomster behøver du flaget "g": <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Symbolet "|" er en pipe-kommando som overfører uddata fra foregående kommando til inddata i efterfølgende kommando. Hvis du vil teste med en længere fil kan du bruge <command
+>cat</command
+> på Unix-lignende systemer eller <command
+>type</command
+> på Windows-lignende systemer. <command
+>sed</command
+> udfører erstatningen for hver linje. <screen
+><command
+>cat</command
+> <replaceable
+>filnavn</replaceable
+> | <command
+>sed</command
+> <replaceable
+>flag</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Eksempel på brug af <command
+>sed</command
+> i &kdiff3;</title>
+<sect3
+><title
+>Ignorering af andre typer kommentarer</title>
+<para
+>For øjeblikket forstår &kdiff3; kun C/C++ kommentarer. Ved at bruge en linjematchende præprocessorkommando kan du også ignorere andre typer af kommentarer ved at konvertere dem til C/C++ kommentarer. For eksempel for at  ignorere kommentarer som begynder med "#", skulle du ville konvertera dem til "//". Bemærk at du også skal aktivere tilvalget "Ignorér C/C++ kommentarer" for at få nogen virkning. En passende linjematchende præprocessorkommando ville være: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Eftersom tegnet "/" har en særlig betydning i <command
+>sed</command
+>, er det nødvendigt at tilføje tegnet "\" inden hver "/" i erstatningsstrengen. Sommetider behøves "\" for at tilføje eller fjerne en særlig betydning for visse tegn. De enkle citationstegn (') inden og efter erstatningskommandoen er nu vigtige, eftersom skallen ellers ville forsøge at tolke visse specialtegn som '#', '$' eller '\' inden de sendes til <command
+>sed</command
+>. <emphasis
+>Bemærk at i Windows behøver du dobbelte citationstegn (") her. Windows erstatter andre tegn som '%', så du kan få brug for at eksperimentere noget.</emphasis
+> </para>
+</sect3>
+<sect3
+><title
+>Ikke versalfølsom Diff</title>
+<para
+>Brug følgende linjematchende præprocessorkommando til at forvandle al inddata til store bogstaver: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Her er ".*" et regulært udtryk som matcher alle strenge, og i denne sammenhæng matcher alle tegn på linjen. Tegnet "\1" i erstatningsstrengen svarer til den matchede tekst mellem det første par "\(" og "\)". "\U" konverterer den indsatte tekst til store bogstaver. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorering af nøgleord for versionskontrol</title>
+<para
+>CVS og andre versionshåndteringssystemer bruger flere nøgleord til at indsætte automatisk genererede strenge (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Alle følger mønstret "$NØGLEORD genereret tekst$". Nu behøver vi en linjematchende præprocessorkommando som kun fjerner den genererede tekst: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Strengen "\|" skiller de mulige nøgleord ad. Du vil måske ændre listen ifølge dine behov. Tegnet "\" ud for "$" behøves eftersom "$" ellers matcher linjeslut. </para>
+<para
+>Mens du eksperimenterer med <command
+>sed</command
+> kommer du måske til at forstå og endog at kunne lide disse regulære udtryk. De er nyttige fordi der er mange andre programmer der også understøtter lignende ting. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorér cifre</title>
+<para
+>At ignorere tal er i virkeligheden et indbygget tilvalg, men som et andet eksempel, vises hvordan det ville se ud som en linjematchende præprocessorkommando. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Alle tegn indenfor '[' og ']' matcher og vil blive erstattet af ingenting. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorering af visse søjler</title>
+<para
+>Sommetider er teksten meget strengt formateret, og indeholder søjler som du altid vil ignorere, mens der er andre søjler du vil bevare for analyse. I følgende eksempel ignoreres de fem første søjler (tegn), de følgende ti søjler bevares, derefter ignoreres igen fem søjler og resten af linjen bevares. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Hvert punktum '.' svarer til et hvilket som helst enkelt tegn. Strengene "\1" og "\2" i erstatningsstrengen refererer til den matchende tekst indenfor det første og andre par af  "\(" og "\)" som angiver teksten at bevare. </para>
+</sect3>
+
+<sect3
+><title
+>Kombination af flere substitutioner</title>
+<para
+>Sommetider vil du tilpasse flere erstatninger samtidigt. Så kan du bruge semikolon ';' for at skille dem fra hinanden. For eksempel: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+ -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Brug af <command
+>perl</command
+> i stedet for <command
+>sed</command
+></title>
+<para
+>I stællet for <command
+>sed</command
+> måske du vil bruge noget andet som <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGUTTRYCK</replaceable
+>/<replaceable
+>ERSÆTTNING</replaceable
+>/<replaceable
+>FLAGGOR</replaceable
+>'
+</screen
+> Men visse detaljer er anderledes i <command
+>perl</command
+>. Bemærk at hvor <command
+>sed</command
+> behøver "\(" og "\)" kræver <command
+>perl</command
+> det enklare  "(" og ")" uden indledende '\'. Till eksempel: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+  <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Rækkefølge for præprocessor-udførsel</title>
+<para
+>Data sendes gennem alle interne og eksterne præprocessorer i følgende rækkefølge: </para>
+<itemizedlist>
+<listitem
+><para
+>Normal præprocessor,</para
+></listitem>
+<listitem
+><para
+>Præprocessor for linjematchning,</para
+></listitem>
+<listitem
+><para
+>Ignorér versaler (konvertér til store bogstaver),</para
+></listitem>
+<listitem
+><para
+>Detektion af C/C++ kommentarer,</para
+></listitem>
+<listitem
+><para
+>Ignorér cifre,</para
+></listitem>
+<listitem
+><para
+>Ignorér blanke tegn</para
+></listitem>
+</itemizedlist>
+<para
+>Data efter den normale præprocessor vil blive bevaret til visning og indfletning. De andre operationer ændrer kun de data som den linjematchende diff-algoritme ser. </para
+><para
+>I de sjældne tilfælde hvor du bruger en normal præprocessor, bemærk at den linjematchende præprocessor ser uddata fra den normale præprocessor som inddata. </para>
+</sect2>
+
+<sect2
+><title
+>Advarsel</title>
+<para
+>Forbehandlingskommandoer er ofte meget nyttige, men som med alle tilvalg som ændrer teksten eller skjuler visse forskelle automatisk, kan du ved en fejl springe over visse forskelle og i værste fald ødelægge vigtige data. </para
+><para
+>Af denne grund, hvis en normal præprocessorkommando bruges under en sammenfletning, fortæller &kdiff3; dig om det og spørger om det skal deaktiveres eller ej. Men du får ingen advarsel hvis en linjematchende præprocessorkommando er aktiv. Sammenfletningen sker ikke førend alle konflikter er løste. Hvis du deaktiverede "Vis blanke tegn" bliver også forskellene som blev fjernet med den linjematchende præprocessorkommando usynlige. Hvis knappen Gem forbliver inaktiv under en sammenfletning (på grund af tilbageværende konflikter), så sørg for at aktivere "Vis blanke tegn". Hvis du ikke vil sammenflette disse mindre vigtige forskelle manuelt kan du vælge "Vælg [A|B|C] for uløste konflikter med blanke tegn" i menuen "Sammenflet". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Mappesammenligning og sammenfletning med &kdiff3;</title>
+<sect1 id="dirmergeintro"
+><title
+>Introduktion til mappesammenligning og sammenfletning</title>
+<para
+>Ofte skal programmører ændre mange filer i en mappe for at opnå deres formål. For at opnå dette lader &kdiff3; dig også sammenligne og sammenflette hele mapper rekursivt! </para
+><para
+>Selvom sammenligning og sammenfletning af mapper synes at være ganske selvklart, er der flere detaljer som du bør kende til. Det vigtigste er naturligvis det faktum at mange filer nu kan påvirkes af hver handling. Hvis du ikke har sikkerhedskopier af originale data, kan det være meget svært eller til og med umuligt at komme tilbage til originaltilstanden. Så inden du påbegynder en sammenfletning, skal du sørge for at data er sikret, og at det er muligt at nulstille. Om du laver et arkiv, eller bruger et versionskontrolsystem er din egen beslutning, men til og med erfarne programmører og integratører behøver sommetider gammel kildekode. Bemærk også at også selvom jeg (forfatteren til &kdiff3;) forsøger at gøre mit bedste, kan jeg ikke garantere at der ikke er fejl. Ifølge GNU GPL er der INGEN GARANTI af nogen slags for dette program. Så hvor ydmyg, og husk altid: </para>
+<blockquote
+><para>
+   <emphasis
+>At fejle er menneskeligt, men for at virkelig lave rod i det behøves en maskine.</emphasis>
+</para
+></blockquote>
+<para
+>Så dette er hvad programmet kan gøre for dig: &kdiff3; ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... læser og sammenligner to eller tre mapper rekursivt,</para
+></listitem>
+     <listitem
+><para
+>... håndterer symbolske link særskilt,</para
+></listitem>
+     <listitem
+><para
+>... lader dig bladre gennem filer med et dobbeltklik,</para
+></listitem>
+     <listitem
+><para
+>... foreslår en sammenfletningsmulighed for hvert objekt, som du kan ændre inden mappesammenfletningen startes,</para
+></listitem>
+     <listitem
+><para
+>... lader dig simulere sammenfletningen og giver en liste af handlingerne som ville ske, uden at virkelig gøre dem,</para
+></listitem>
+     <listitem
+><para
+>... lader dig udføre sammenfletningen, og lader dig bestemme hvornår manuel interaktion behøves,</para
+></listitem>
+     <listitem
+><para
+>... lader dig udføre valgt handling for alle punkter (tasten F7) eller markeret punkt (tasten F6),</para
+></listitem>
+     <listitem
+><para
+>... lader dig fortsætte sammenfletningen efter manuel interaktion med tasten F7,</para
+></listitem>
+     <listitem
+><para
+>... laver valgfrie sikkerhedskopier, med filendelsen ".orig".</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Start mappesammenligning eller sammenfletning</title>
+<para
+>Dette ligner meget sammenfletning og sammenligning af en enkelt fil. Du skal kun angive mapper på kommandolinjen eller i dialogen for filåbning. </para>
+<sect2
+><title
+>Sammenlign eller sammenflet to mapper: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable
+> -o <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>Hvis ingen målmappe angives, bruger &kdiff3; <replaceable
+>kat2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Sammenlign eller sammenflet tre mapper: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable
+> -o <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>Når tre mapper sammenflettes, bruges <replaceable
+>kat1</replaceable
+> som basen for sammenfletningen. Hvis ingen målmappe angives, bruger &kdiff3; <replaceable
+>kat3</replaceable
+> som målmappe for sammenfletningen. </para>
+
+<para
+>Bemærk at kun sammenligningen startes automatisk, ikke sammenfletningen. For det skal du først vælge et menupunkt eller tasten F7. (Mere information kommer senere.) </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Katalogsammenfletning af synlig information</title>
+<para
+>Mens mapperne læses vises et meddelelsesfelt som informerer dig om forløbet. Hvis du afbryder mappesøgningen, vises kun filer som hidtil er sammenlignet. </para
+><para
+>Når mappegennemsøgningen er færdig, viser &kdiff3; et listefelt med tilbageværende resultater, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... og detaljer om det markerede punkt til højre: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>Navnesøjlen</title>
+<para
+>Hver fil og mappe som blev fundet under søgningen vises her i et træ. Du kan vælge et punkt ved at klikke en gang på det med musen. </para
+><para
+>Mapperne er normalt sammentrukket. Du kan ekspandere og trække dem sammen ved at klikke på "+"/"-", ved at dobbeltklikke på punktet eller ved at bruge tasterne "venstrepil" og "højrepil". Menuen "Mappe" indeholder også to tilvalg "Træk alle undermapper sammen" og "Ekspandér alle undermapper" som du kan bruge til at trække sammen eller ekspandere alle mapper på én gang. </para
+><para
+>Hvis du dobbeltklikker på et filpunkt, udføres filsammenligning og sammenligningvinduet for filer vises. </para>
+<para
+>Ikonen i navnesøjlen svarer til filtypen i den første mappe ("A"). Den kan være en af disse: </para>
+<itemizedlist>
+     <listitem
+><para
+>Normal fil</para
+></listitem>
+     <listitem
+><para
+>Normal mappe (mappeikon)</para
+></listitem>
+     <listitem
+><para
+>Link til en fil (filikon med en link-pil)</para
+></listitem>
+     <listitem
+><para
+>Link til en mappe (mappeikon med en link-pil)</para
+></listitem>
+</itemizedlist>
+<para
+>Hvis filtypen er anderledes i de øvrige mapper, ses det i søjlerne A/B/C og i vinduet som viser detaljerne om det markerede punkt. Bemærk at i disse tilfælde kan ingen sammenfletningshandling vælges automatisk. Når sammenfletningen startes, informeres brugeren om denne slags problemer. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Søjlerne A/B/C og farvesammensætninger</title>
+<para
+>Som det ses i billedet ovenfor, bruges farverne rød, grøn, gul og sort i søjlerne A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Sort: Dette punkt eksisterer ikke i denne mappe.</para
+></listitem>
+     <listitem
+><para
+>Grøn: Nyeste punkt.</para
+></listitem>
+     <listitem
+><para
+>Gul: Ældre end grøn, nyere end rød.</para
+></listitem>
+     <listitem
+><para
+>Rød: Ældst punkt.</para
+></listitem>
+</itemizedlist>
+<para
+>Men for punkter som er identiske i sammenligningen, er farven også identisk selvom alderen ikke er det. </para
+><para
+>Mapper anses for at være ens hvis alle objekter de indeholder er ens. Så har de også samme farve. Alderen på en mappe spiller ingen rolle for dens farve. </para
+><para
+>Idéen til denne farvesammensætning fandt jeg i <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. Farverne svarer til farverne for et blad, som er grønt i begyndelsen, derefter bliver gult og til sidst rødt når det er gammelt. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>Handlingssøjlen</title>
+<para
+>Efter at have sammenlignet mapperne evaluerer &kdiff3; også et forslag til sammenfletningshandling. Den vises i søjlen "Handling". Du kan ændre den ved at klikke på handlingen du vil ændre. En lille menu dukker op og lader dig vælge en handling for dette punkt. (Du kan også vælge den oftest bruge handling via tastaturet. Ctrl+1/2/3/4/Delete vælger A/B/C/Sammenflet/Slet hvis de er tilgængelige.) Denne handling udføres under sammenfletningen. Hvilke handlinger som er tilgængelige afhænger af punktet og sammenfletningstilstanden som bruges. Sammenfletningstilstanden er en af: </para>
+<itemizedlist>
+     <listitem
+><para
+>Sammenfletning af tre mapper ("A" behandles som ældste basis for begge).</para
+></listitem>
+     <listitem
+><para
+>Sammenfletning af to mapper.</para
+></listitem>
+     <listitem
+><para
+>To-mappes synkroniseringstilstand (aktiveres med tilvalget "Synkronisér mapper").</para
+></listitem>
+</itemizedlist>
+<para
+>Ved tremappers-sammenfletning er den handling der foreslås: Hvis for et objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... alle tre mapper er ens: Kopiér fra C</para
+></listitem>
+     <listitem
+><para
+>... A og C er ens med B er det ikke: Kopiér fra B (eller hvis B ikke eksisterer, slet målet hvis det eksisterer)</para
+></listitem>
+     <listitem
+><para
+>... A og B er ens men C er det ikke: Kopiér fra C (eller hvis C ikke eksisterer, slet målet hvis det eksisterer)</para
+></listitem>
+     <listitem
+><para
+>... B og C er ens med A er det ikke: Kopiér fra C (eller hvis C ikke eksisterer, slet målet hvis det eksisterer)</para
+></listitem>
+     <listitem
+><para
+>... kun A eksisterer: Slet målet (hvis det eksisterer)</para
+></listitem>
+     <listitem
+><para
+>... kun B eksisterer: Kopiér fra B</para
+></listitem>
+     <listitem
+><para
+>... kun C eksisterer: Kopiér fra C</para
+></listitem>
+     <listitem
+><para
+>... A, B og C er ikke ens: Sammenflet</para
+></listitem>
+     <listitem
+><para
+>A, B og C har ikke samme filtype (f.eks. A er en mappe, B er en fil): "Fejl: Konflikt i filtyper". Så længe sådanne punkter eksisterer, kan mappesammenfletningen ikke startes.</para
+></listitem>
+</itemizedlist>
+<para
+>Ved tomappers sammenfletning er den foreslåede handling: Hvis for et objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... begge mapper er ens: Kopiér fra B</para
+></listitem>
+     <listitem
+><para
+>...A eksisterer men ikke B: Kopiér fra A</para
+></listitem>
+     <listitem
+><para
+>... B eksisterer men ikke A: Kopiér fra B</para
+></listitem>
+     <listitem
+><para
+>... A og B eksisterer men er ikke ens: Sammenflet</para
+></listitem>
+     <listitem
+><para
+>A og B har ikke samme filtype (f.eks. A er en mappe, B er en fil): "Fejl: Konflikt i filtyper". Så længe sådanne punkter eksisterer, kan mappesammenfletningen ikke startes.</para
+></listitem>
+</itemizedlist>
+<para
+>Synkroniseringstilstand er kun aktiv hvis to mapper og ingen eksplicit målmappe angives, og hvis tilvalget "Synkronisér mapper" er aktivt. &kdiff3; vælger så en standardhandling så begge mapper er ens bagefter. Hvis for et punkt ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... begge mapper er ens: Ingenting gøres.</para
+></listitem>
+     <listitem
+><para
+>... A eksisterer, men ikke B: Kopiér A til B</para
+></listitem>
+     <listitem
+><para
+>... B eksisterer, men ikke A: Kopiér B til A</para
+></listitem>
+     <listitem
+><para
+>... A og B eksisterer, men er ikke ens: Sammenflet og opbevar resultatet i begge mapper. (For brugeren er det synlige filnavn for at gemme B, men derefter kopierer &kdiff3; også B til A.)</para
+></listitem>
+     <listitem
+><para
+>A og B har ikke samme filtype (f.eks. A er en mappe, B er en fil): "Fejl: Konflikt i filtyper". Så længe sådanne punkter eksisterer, kan mappesammenfletningen ikke startes.</para
+></listitem>
+</itemizedlist>
+<para
+>Når to mapper sammenflettes og tilvalget "Kopiér nyere i stedet for at sammenflette" er markeret, kigger &kdiff3; på datoen og foreslår at vælge den nyere fil. Hvis filerne ikke er ens men har samme dato, indeholder handlingen "Fejl: Dato er ens men filerne er det ikke." Så længe sådanne punkter eksisterer, kan  mappesammenfletningen ikke startes. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>Statussøjlen</title>
+<para
+>Under sammenfletningen behandles en fil af gangen. Statussøjlen viser "Færdig" for punkter hvor sammenfletningshandlingen er lykkedes, og en anden tekst hvis noget uventet indtraf. Når en sammenfletning er færdig, bør du udføre en sidste kontrol for at se at status for alle punkter er acceptabel. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Statistiske søjler</title>
+<para
+>Når filsammenligningtilstanden "Fuldstændig analyse" er aktiveret i valgmulighederne, viser &kdiff3; ekstra søjler som indeholder antal uløste, løste, ikke blanke og blanke konflikter. (Søjlen løste vises kun når mapper sammenlignes eller sammenflettes.) </para>
+</sect2>
+
+<sect2 id="selectingvisiblefiles"
+><title
+>Vælg listede filer</title>
+<para
+>Flere tilvalg påvirker hvilke filer som listes her. Nogle er tilgængelige i <link linkend="dirmergeoptions"
+>indstillingsdialogen</link
+>. Menuen Mappe indeholder punkterne: </para
+><para
+><itemizedlist>
+     <listitem
+><para
+>"Vis identiske filer": Filer som er detekteret som ens i alle inddatamapper.</para
+></listitem>
+     <listitem
+><para
+>"Vis forskellige filer": Filer som findes i to eller flere mapper men ikke er ens.</para
+></listitem>
+     <listitem
+><para
+>"Vis kun filer i A": Filer som kun findes i A, men ikke i B eller C.</para
+></listitem>
+     <listitem
+><para
+>"Vis kun filer i B": Filer som kun findes i B, men ikke i A eller C.</para
+></listitem>
+     <listitem
+><para
+>"Vis kun filer i C": Filer som kun findes i C, men ikke i A eller B.</para
+></listitem>
+</itemizedlist
+></para>
+<para
+>Aktivér kun valgmulighederne "Vis" for de punkter du vil liste. Hvis du for eksempel kun vil liste alle punkter som enten findes i A eller i B men ikke i begge, skal du aktivere "Vis kun filer i A" og "Vis kun filer i B" og deaktivere alle andre ("Vis identiske filer", "Vis forskellige filer", "Vis kun filer i C"). Listen opdateres med det samme for at svare til ændringen. </para
+><para
+>Disse tilvalg gælder også for mapper med en undtagelse: At deaktivere "Vis forskellige filer" skjuler ikke hele mapper. Dette fungerer kun for filer inde i dem. </para
+><para
+>Bemærk at af disse er det kun tilvalget "Vis identiske filer" som er bestående. De øvrige aktiveres når &kdiff3; startes. </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Udfør en mappesammenfletning</title>
+<para
+>Du kan enten sammenflette det valgte punkt (fil eller mappe), eller alle punkter. Når du har lavet alle valg af handlinger (også i alle undermapper), kan du udføre sammenfletningen. </para
+><para
+>Vær klar over at hvis du ikke eksplicit angav en målmappe, bliver målet "C" i tre-mappetilstand, "B" i to-mappetilstand, og i synkroniseringstilstand er det "A" og/eller "B". </para
+><para
+>Hvis du også har angivet en målmappe, kontrollér at alle objekter som skal eksisterer i udskriften eksisterer i træet. Der er nogle valgmuligheder som får visse objekter til at blive udeladt fra mappesammenligningen og sammenfletningen. Kontrollér disse valgmuligheder for at undgå ubehagelige overraskelser: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Rekursive mapper": Hvis det er fra, er der ikke punkter i undermapper.</para
+></listitem>
+     <listitem
+><para
+>"Mønster" eller "Undtagelsesmønster": Inkludér eller undtag punkter som matcher.</para
+></listitem>
+     <listitem
+><para
+>"Undtag gemte filer"</para
+></listitem>
+     <listitem
+><para
+><link linkend="selectingvisiblefiles"
+>"Vis"-tilvalg</link
+> (Vis identiske/forskellige filer, kun filer i A/B/C)</para
+></listitem>
+</itemizedlist>
+<para
+>Hvis du ændrer indstillingerne for at vise flere filer, skal du gøre en omsøgning via menuen "Mappe" -> "Skan igen". (Grunden til dette er at &kdiff3; udelader sammenligning for filer ifølge kriterierne for at få hurtigere sammenligningshastighed.) Hvis du ændrede fil- og mappemønstre for at undtage filer, opdateres fillisten med det samme når indstillingsdialogen lukkes. </para
+><para
+>Bemærk at når du skriver til en helt ny mappe vil du oftest også kopiere de identiske filer. Aktivér "Vis identiske filer" i dette tilfælde. Hvis din målmappe er en af inddatamapperne, er dette ikke nødvendigt eftersom filerne allerede findes der. </para
+><para
+>Hvis du er tilfreds indtil videre, er resten enkelt. </para
+><para
+>For at sammenflette alle punkter: Vælg "Start eller fortsæt mappesammenfletning"  i menuen "Mappe" eller tryk på F7 (som er standardgenvejstasten). For kun at sammenflette nuværende punkt: Vælg "Udfør handling for nuværende punkt" eller tryk på F6. </para
+><para
+>Hvis visse objekter med ugyldige filtyper stadigvæk eksisterer, på grund af filtyper med konflikter, vises et meddelelsefelt og objektet udpeges, så du kan vælge en gyldig handling for objektet. </para
+><para
+>Hvis du sammenfletter alle punkter vises en dialog som giver dig valgmulighederne "Gør det", "Simulér det" og "Annullér". </para>
+<itemizedlist>
+     <listitem
+><para
+>Vælg "Simulér det" hvis du vil se hvad der ville blive gjort uden virkelig at gøre det. En udførlig liste med alle handlinger vises.</para
+></listitem>
+     <listitem
+><para
+>Vælg ellers "Gør det" for virkelig at udføre sammenfletningen.</para
+></listitem>
+</itemizedlist>
+<para
+>Derefter udfører &kdiff3; den angivne handling for alle punkter. Hvis manuel interaktion kræves (sammenfletning af enkelt fil), vises et sammenfletningsvindue (<link linkend="dirmergebigscreenshot"
+>se det store skærmaftryk</link
+>). </para
+><para
+>Når du er færdig med manuel indfletning af en fil, vælges igen "Start eller fortsæt mappesammenfletning"  eller tryk på F7. Hvis du ikke har gemt endnu, beder en dialog dig om at gøre det. Derefter fortsætter &kdiff3; til næste punkt. </para
+><para
+>Når &kdiff3; støder på en fejl, meddeles det og udførlig statusinformation vises. Længst nede i listen er der nogen fejlmeddelelser som bør hjælpe dig til at forstå problemets grund. Når du fortsætter sammenfletningen (tasten F7), giver &kdiff3; dig valget at forsøge igen eller springe over punktet som forårsagede problemet. Dette betyder at du kan vælge en anden handling, eller løse problemet på anden måde, inden du fortsætter. </para
+><para
+>Når sammenfletningen er færdig, informerer &kdiff3; dig med et meddelelsesfelt. </para
+><para
+>Hvis visse punkter sammenflettedes individuelt før mappefletning bruges, husker &kdiff3; det (mens sammenfletningssessionen er i gang), og sammenfletter dem ikke igen når sammenfletningen for alle punkter udføres. Selv når sammenfletningen springes over eller ingenting gemmes regnes disse punkter som færdige. Kun når sammenfletningshandlingen ændres, vil "Færdig"-status for punktet blive fjernet så det kan sammenflettes igen. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Tilvalg for at sammenligne og sammenflette mapper</title>
+<para
+>Indstilling af &kdiff3; (menuen "Opsætning"-&gt;"Indstil KDiff3") har en side som hedder "Mappesammenfletning" med følgende tilvalg: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Rekursive mapper:</emphasis
+></term
+><listitem
+><para
+>Vælg om mapper skal gennemsøges rekursivt.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Mønster for filer:</emphasis
+></term
+><listitem
+><para
+>Kun filer som matcher et mønster her tilføjes i træet. Mere end et mønster kan angives ved at bruge semikolon ";" som skilletegn. Gyldige jokertegn: "*" og "?". (f.eks. "*.cpp;*.h"). Standardværdien er "*". Dette mønster bruges ikke for mapper.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-mønster for filer:</emphasis
+></term
+><listitem
+><para
+>Filer som matcher et mønster undtages fra træet. Mere end et mønster kan angives ved at bruge semikolon ";" som skilletegn. Gyldige jokertegn: '*' og '?'. Standardværdien er "*.orig;*.o;"*.obj".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Mappeundtagelsesmønster for filer:</emphasis
+></term
+><listitem
+><para
+>Mapper som matcher et mønster undtages fra træet. Mere end et mønster kan angives ved at bruge semikolon ";" som skilletegn. Gyldige jokertegn: '*' og '?'. Standardværdien er "CVS;deps;.svn".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Brug .cvsignore:</emphasis
+></term
+><listitem
+><para
+>Ignorér filer og mapper som også ville blive ignoreret af CVS. Mange automatisk genererede filer ignoreres af CVS. Den store fordel er at dette kan være mappespecifikt via en lokal ".cvsignore" fil. (Se <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Find efter skjulte filer og mapper:</emphasis
+></term
+><listitem
+><para
+>For visse filsystemer har filer egenskaben "Skjult". For andre systemer skjules et filnavn som begynder med et punktum ("."). Dette lader dig bestemme om disse filer skal indgå i træet eller ej. Standardværdien er til.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Følg fillink:</emphasis
+></term
+><listitem
+><para
+>For link til filer: Hvis deaktiveret, sammenlignes de symbolske link. Hvis aktiveret, sammenlignes filerne bagved linkene. Normalværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Følg mappelink:</emphasis
+></term
+><listitem
+><para
+>For link til mapper: Hvis deaktiveret, sammenlignes symbolske link. Hvis aktiveret behandles linket som et mappe og gennemsøges rekursivt. (Bemærk at programmet ikke kontrollerer om linket er "rekursivt". En mappe som indeholder et link til samme mappe vil forårsage en uendelig løkke, og efter en vis tid når stakken bliver fuld eller hukommelsen løber ud, bryder programmet sammen.) Standardværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Versaltilstandsfølsom filnavnesammenligning:</emphasis
+></term
+><listitem
+><para
+>Standardværdi er falsk på Windows, og sand for andre operativsystemer.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Filsammenligningstilstand:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Binær sammenligning:</emphasis
+></term
+><listitem
+><para
+>Dette er standardsammenligningstilstanden. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Fuld analyse:</emphasis
+></term
+><listitem
+><para
+>Udfør en fuld analyse for hver fil og vis de statistiske informationssøjler. (Antal løste, uløste, ikke blanke og blanke konflikter.) Den fulde analyse er langsommere end en simpel binær analyse, og meget langsommere når den bruges på filer der ikke indeholder tekst. (Angiv de passende fil-antimønstre.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Stol på ændringsdato:</emphasis
+></term
+><listitem
+><para
+>Hvis du sammenligner store mapper via et langsomt netværk, kan det gå hurtigere kun at sammenligne ændringsdato og fillængde. Men hastighedsforbedringen kommer med prisen af en lille usikkerhed. Brug dette med forsigtighed. Normalværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Stol på størrelsen:</emphasis
+></term
+><listitem
+><para
+>Ligesom at stile på ændringsdatoen. Ingen egentlig sammenligning foregår. To filer betragtes som ens hvis deres filstørrelser er ens. Dette er nyttigt når filkopieringsoperationen ikke bevarer ændringsdatoen. Brug dette med forsigtighed. Normalværdien er fra.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Synkronisér mapper:</emphasis
+></term
+><listitem
+><para
+>Aktiverer "synkroniseringstilstand" når to mapper sammenlignes og ingen eksplicit målmappe angives. I denne tilstand vælges de foreslåede handlinger så begge kildemapperne er ens bagefter. Sammenfletningsresultatet skrives også til begge mapper. Normalværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kopiér nyere i stedet for at sammenflette:</emphasis
+></term
+><listitem
+><para
+>I stedet for at sammenflette kopieres den foreslåede handling den nyere kilden hvis der er sket om ændringer. (Anses for at være usikkert, eftersom det betyder at du ved at den anden fil ikke også er redigeret. Tjek for at være sikker i hvert enkelt tilfælde.) Normalværdien er fra.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sikkerhedskopiér filer:</emphasis
+></term
+><listitem
+><para
+>Hvis en fil eller hel mappe erstattes med en anden eller slettes, så ændres originalversionens navn med tilføjelse af filendelsen ".orig". Hvis en gammel sikkerhedskopi med filendelsen ".orig" allerede eksisterer slettes den uden sikkerhedskopiering. Dette gælder også normal sammenfletning af enkelte filer, ikke kun sammenfletningstilstand for mapper. Standardværdien er til.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Andre funktioner i mappesammenfletningsvinduet</title>
+<sect2
+><title
+>Opdelt eller fuldskærmstilstand</title>
+<para
+>Sædvanligvis forbliver listevinduet for mappesammenfletning synligt mens en enkelt fil sammenlignes eller sammenflettes. Du kan flytte linjen som opdeler fillisten fra vinduerne til tekstsammenligning med musen. Hvis du ikke vil gøre dette, kan du deaktivere "Opdelt skærmvisning" i menuen "Mappe". Derefter kan du bruge "Skift visning" i menuen "Mappe" til at skifte mellem fillisten og vinduerne til tekstsammenligning, som så optager hele vinduet. </para>
+</sect2>
+<sect2
+><title
+>Sammenlign og sammenflette en enkelt fil</title>
+<para
+>Du foretrækker formodentlig et almindeligt dobbeltklik på musen for at sammenligne en fil. Ikke desto mindre er der også en indgang i menuen "Mappe". Du kan også direkte sammenflette en enkelt fil, uden at starte mappesammenfletning via "Sammenflet markerede filer" i menuen "Mappe". Når resultatet gemmes, sættes status til færdig, og filen sammenflettes ikke igen hvis en mappesammenfletning startes. </para
+><para
+>Men observér at statusinformationen går tabt når du kører en mappegennemsøgning igen: "Mappe"-menuen "Skan igen". </para>
+</sect2>
+<sect2
+><title
+>Sammenlign og sammenflet filer med forskellige navne</title>
+<para
+>Sommetider behøver du at sammenligne eller sammenflette filer med forskellige navne (f.eks. nuværende fil og sikkerhedskopi i samme mappe). </para
+><para
+>Markér den nøjagtige fil ved at klikke på ikonen i søjlen A, B eller C. Filen som først markeres på den måde markeres med "A", den anden og tredje med "B" og "C" uafhængig af hvilken søjle de findes i. Kun op til tre filer kan markeres på denne måde. </para
+><para
+>Fortsæt ved at vælge "Sammenlign eksplicit markerede filer" eller "Sammenflet eksplicit markerede filer" fra menuen "Mappe". Af bekvemmelighedsgrunder findes også menuvalgmulighederne som en sammenhængsafhængig menu som vises når du klikker på den senest markerede fil. </para
+><para
+>Sammenligningen eller sammenfletningen af en fil sker i samme vindue. Hvis denne metode bruges for mapper åbnes et nyt vindue. </para
+></sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Diverse emner</title>
+<sect1 id="networktransparency">
+<title
+>Netværksgennemsigtighed via KIO</title>
+<sect2
+><title
+>I/O-slaver</title>
+<para
+>&kde; understøtter netværkstransparens via I/O-slaver. &kdiff3; bruger dem til at indlæse datafiler og gennemsøge mapper. Det betyder at du kan angive filer og mapper på lokal- og fjern-ressourcer via &URL;'er. </para
+><para
+>Eksempel: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.langtbortistan.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hakker/arkiv.tar.gz/kat ./kat
+</screen>
+</para>
+<para
+>Den første linje sammenligner en lokal fil med en fil på en &FTP;-server. Den anden linje sammenligner en mappe i et komprimerat arkiv med en lokal mappe. </para
+><para
+>Andre I/O-slaver som er interessante er: </para>
+<itemizedlist>
+<listitem
+><para
+>Filer fra WWW (http:),</para
+></listitem>
+<listitem
+><para
+>Filer fra FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Krypteret filoverførsel (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Ressourcer fra Windows (smb:),</para
+></listitem>
+<listitem
+><para
+>Lokale filer (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>Andre ting som er mulige, men formodentlig mindre nyttige, er: </para>
+<itemizedlist>
+<listitem
+><para
+>Manualsider (man:),</para
+></listitem>
+<listitem
+><para
+>Infosider (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Hvordan man skriver &URL;'er</title>
+<para
+>En &URL; har en anderledes syntaks sammenlignet med søgestier til lokale filer og mapper. Visse ting skal der tages hensyn til: </para>
+<itemizedlist>
+<listitem
+><para
+>En søgesti kan være relativ, og kan indeholde "." eller "..". Dette er ikke muligt for &URL;'er, som altid er absolutte. </para
+></listitem
+><listitem
+><para
+>Specialtegn skal skrives med særlige "escape". ("#"->"%23", mellemrum bliver til "%20", osv.) For eksempel ville en fil med navnet "/#foo#" have &URL; "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>Når &URL;'er ikke virker som ventet, så forsøg at åbne dem i &konqueror; først. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Muligheder med I/O-slaver</title>
+<para
+>Netværkstransparens har en bagdel: Ikke alle ressourcer har samme muligheder. </para
+><para
+>Sommetider skyldes det serverens filsystem, sommetider protokollen. Her er en kort liste med begrænsninger: </para>
+<itemizedlist>
+<listitem
+><para
+>Sommetider er der ikke støtte for link. </para
+></listitem
+><listitem
+><para
+>Eller der er ingen måde at skelne mellem om et link peger på en fil eller mappe, der antages altid en fil (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Kan ikke altid afgøre filstørrelsen. </para
+></listitem
+><listitem
+><para
+>Begrænset støtte for rettigheder. </para
+></listitem
+><listitem
+><para
+>Ingen mulighed at ændre rettigheder eller ændringstid, så rettigheder eller tiden for en kopi adskiller sig fra originalen. (Se tilvalget "Stol på størrelse".)  (At ændre af tilladelser eller ændringstidspunkt er kun muligt for lokale filer.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Brug &kdiff3; som en Kpart</title>
+<para
+>&kdiff3; er en Kpart. For øjeblikket implementeres grænsefladen KParts::ReadOnlyPart. </para
+><para
+>Hovedanvendelsen er til forskelsvisning i KDevelop. KDevelop starter altid den interne forskelsvisning først. For at bruge &kdiff3;, klik med højre museknap i forskelsvisningens vindue og vælg "Vis i KDiff3-part" i den sammenhængsafhængige menuen. </para
+><para
+>&kdiff3; kræver normalt to fuldstændige filer som inddata. Når det bruges som en part, antager &kdiff3; at inddatafilen er en programrettelsesfil i forenet format. &kdiff3; henter derefter originalfilernes navn i programrettelsesfilen. I det mindste en af de to filer skal være tilgængelig. &kdiff3; starter så kommandoen <command
+>patch</command
+> for at genoprette den anden fil. </para
+><para
+>Du kan vælge en programrettelsesfil i &konqueror; og vælge "Forhåndsvis i"-"&kdiff3;-part"i den sammenhængsafhængige menu. Vær klar over at dette ikke virker hvis ingen af originalfilerne er tilgængelige, og er ikke tilforladeligt hvis originalfilen eller filerne er ændret siden programrettelsesfilen blev oprettet. </para
+><para
+>Når det kører som en Kpart sørger &kdiff3; kun for sammenligning mellem to filer, en meget lille værktøjslinje og menu. Sammenfletning eller mappesammenligning understøttes ikke. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Spørgsmål og svar</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Hvorfor kaldes det &kdiff3;? </para
+></question
+><answer
+><para
+>Værktøjer som hedder "KDiff" og "KDiff2" (som nu kaldes &kompare;) fandtes allerede. Desuden skal &kdiff3; antyde at programmet kan sammenflette ligesom værktøjet "diff3" fra samlingen med diff-værktøjer. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvorfor udgives det under GPL? </para
+></question
+><answer
+><para
+>Jeg har brugt GPL-programmer i meget lang tid nu, og lært mig meget ved at kigge på en hel del af kildekoden. Altså er dette min "tak" til alle programmører som også gjorde eller kommer til at gøre det samme. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Visse knapper og funktioner mangler. Hvad er galt? </para
+></question
+><answer
+><para
+>Du kompilerede fra kildekode, men angav formodentlig ikke rigtigt &kde;-præfiks med 'configure'. Som standard vil configure installere i /usr/local, men så kan &kde; ikke finde ressourcefilerne for brugergrænsefladen (dvs. kdiff3ui.rc). README-filen indeholder mere information om rigtig præfiks. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Ofte vises linjer som ligner men ikke er identiske med hinanden, men ikke altid. Hvorfor? </para
+></question
+><answer
+><para
+>Linjer hvor kun antal blanke tegn er forskellige behandles først som "ens", mens kun et andet slags blankt tegn gør at linjerne er "forskellige". Hvis lignende linjer er ved siden af hinanden, er dette i virkeligheden et tilfælde men det er heldigvis ofte noget der sker. Se også manualen <link linkend="manualdiffhelp"
+>Diff Help</link
+>. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvorfor skal alle konflikter være løste inden sammenfletningsresultatet kan gemmes? </para
+></question
+><answer
+><para
+>For hver ens eller forskelligt afsnit husker editoren i vinduet med sammenfletningsresultatet hvor det begynder og slutter. Det er nødvendigt eftersom konflikter kan løses op manuelt ved helt enkelt at vælge kildeknappen (A, B eller C). Informationen går tabt når filen gemmes som tekst, og det er for besværligt at oprette et specielt filformat som understøtter at gemme og genoprette al nødvendig information. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvordan kan jeg synkronisere sammenligningsvisningen og sammenfletningsvisningen så alle visninger viser samme tekstposition? </para
+></question
+><answer
+><para
+>Klik på sammenfatningssøjlen til venstre for teksten. (<link linkend="synchronise_views"
+>Se også her.</link
+>) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvorfor har editoren i resultatvinduet for sammenfletning ikke en "fortryde"-funktion? </para
+></question
+><answer
+><para
+>Hidtil har det været for besværligt. Du kan altid genoprette en version fra en kilde (A, B eller C) ved at klikke på den tilsvarende knap. For større redigering, anbefales brug af en anden editor alligevel. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Når jeg fjernede en del tekst, vistes pludselig "&lt;Ingen kildelinje&gt;" og dette kan ikke slettes. Hvad betyder det og hvordan kan man fjerne det? </para
+></question
+><answer
+><para
+>For hvert afsnit der er ligedan eller anderledes husker editoren i vinduet med sammenfletningsresultatet hvor det begynder og slutter. "&lt;Ingen kildelinje&gt;" betyder at der ikke er noget tilbage i et afsnit, ikke engang et nylinjetegn. Dette kan indtræffe enten ved automatisk sammenfletning eller efter redigering. Det er intet problem, eftersom denne information ikke eksisterer i den gemte fil. Hvis du vil have  originalkilden igen, markeres kilden blot (klikke på sammenfatningssøjlen til venstre) og klik derefter på kildeknappen med indholdet som ønskes (A, B eller C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvorfor understøtter &kdiff3; ikke syntaksfremhævning? </para
+></question
+><answer
+><para
+>&kdiff3; bruger allerede mange farver til fremhævning af sammenligninger. Yderligere frem,hævning ville være forvirrende. Burg en anden editor til dette. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Kan jeg bruge &kdiff3; til at sammenligne filer fra OpenOffice.Org, Word, Excel, PDF, og så videre? </para
+></question
+><answer
+><para
+>Selvom &kdiff3; kan analysere alle slags filer, vil resultatet formodentlig ikke være særligt tilfredsstillende for dig. </para
+><para
+>&kdiff3; blev lavet til at sammenligne rene tekstfiler. OpenOffice, Word, Excel, og så videre, opbevarer meget mere information i filerne (om skrifttype, billeder, sider, farver, osv.), som &kdiff3; ikke kender til. Altså viser &kdiff3; dig indholdet i filen tolket som ren tekst, men dette kan være ulæseligt eller i det mindste se meget mærkeligt ud. </para
+><para
+>Eftersom de fleste programmer nu om dage opbevarer deres indhold i XML-format, kan du måske læse det som ren tekst. Hvis ændringen kun var lille, kan &kdiff3; måske stadigvæk hjælpe dig. </para
+><para
+>Den bedste løsning hvis du kun vil sammenligne teksten (uden indlejrede objekter såsom billeder) er at bruge "Markér alt" og "Kopiér" i programmet for at kopiere den interessante tekst til klippebordet og derefter indsætte teksten i et af sammenligningsvinduerne i &kdiff3;. (Se også <link linkend="selections"
+>Markér, kopiér og indsæt</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvorfor er mappetilvalget "List kun forskelle" blevet fjernet? </para
+></question
+><answer
+><para
+>Der er nu flere forskellige <link linkend="selectingvisiblefiles"
+>"Vis"-tilvalg</link
+> i mappemenuen. At deaktivere "Vis identiske filer" afstedkommer hvad aktivering af "List kun forskelle" plejede at gøre. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hvordan kan man lave en stor markering i sammenligningsvinduet når det tager så lang tid at rulle teksten? </para
+></question
+><answer
+><para
+>Start markeringen som sædvanligt (klik og hold venstre museknap nede). Brug derefter navigationstasterne (f.eks. Page Up, Page Down) mens venstre museknap holdes nede. (Se også <link linkend="selections"
+>Markér, kopiér og indsæt</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Der er en stor mængde  information her, men dit spørgsmål er alligevel ikke besvaret? </para
+></question
+><answer
+><para
+>Send gerne dit spørgsmål til mig. Jeg sætter pris på alle kommentarer. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Medvirkende og licens</title>
+
+<para
+>&kdiff3;: Værktøj til sammenligning og sammenfletning af filer og mapper </para>
+<para
+>Program ophavsret 2002-2006 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Flere fede idéer og fejlrapporter kom fra kolleger og mange personer ude på www. Tak! </para>
+
+<para
+>Dokumentation ophavsret &copy; 2002-2006 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+&erik.kjaer.pedersen.credit; 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installation</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Hvordan får man fat på &kdiff3;</title>
+
+<para
+>Du kan hente seneste version af &kdiff3; fra hjemmesiden <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>&kdiff3; er også tilgængelig for andre platforme. Se hjemmesiden for detaljer. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Krav</title>
+
+<para
+>For at bruge alle funktioner i &kdiff3; med godt resultat har du brug for &kde; 3.1 eller nyere. </para
+><para
+>For information om hvordan &kdiff3; kan køres på andre platforme uden &kde;, se <ulink url="http://kdiff3.sourceforge.net"
+>hjemmesiden</ulink
+>. </para
+><para
+>Du finder en liste med ændringer på <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> eller i filen "ChangeLog" i kildekodepakken. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Kompilering og installation</title>
+
+<para
+>For at kompilere og installere &kdiff3; på et system med KDE, skriv følgende i basismappen for distributionen af &kdiff3;:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-mappe</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-mappe</replaceable
+> angiver mappen som indeholder KDE på dit system. Hvis du ikke er sikker, læs filen README for detaljer. </para>
+<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>
+<para
+>Eftersom &kdiff3; bruger <command
+>autoconf</command
+> og <command
+>automake</command
+> skulle du ikke have problemer med at kompilere det. Skulle du støde på problemer, så rapportér dem gerne til &kde;'s e-mail-lister.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/da/iteminfo.png b/doc/da/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/da/iteminfo.png
diff --git a/doc/da/letter_by_letter.png b/doc/da/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/da/letter_by_letter.png
diff --git a/doc/da/merge_current.png b/doc/da/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/da/merge_current.png
diff --git a/doc/da/new.png b/doc/da/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/da/new.png
diff --git a/doc/da/open_dialog.png b/doc/da/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/da/open_dialog.png
diff --git a/doc/da/screenshot_diff.png b/doc/da/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/da/screenshot_diff.png
diff --git a/doc/da/screenshot_merge.png b/doc/da/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/da/screenshot_merge.png
diff --git a/doc/da/triple_diff.png b/doc/da/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/da/triple_diff.png
diff --git a/doc/da/white_space.png b/doc/da/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/da/white_space.png
diff --git a/doc/de/Makefile.am b/doc/de/Makefile.am
new file mode 100644
index 0000000..f75e9de
--- /dev/null
+++ b/doc/de/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = de
+
+
diff --git a/doc/de/dirbrowser.png b/doc/de/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/de/dirbrowser.png
diff --git a/doc/de/dirmergebig.png b/doc/de/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/de/dirmergebig.png
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
new file mode 100644
index 0000000..e34e9f3
--- /dev/null
+++ b/doc/de/index.docbook
@@ -0,0 +1,2430 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "kdeextragear-1">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % German "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>Das Handbuch zu &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+</authorgroup>
+
+<othercredit role="translator"
+><firstname
+>Thomas</firstname
+><surname
+>Reitelbach</surname
+><affiliation
+><address
+><email
+>tr@erdfunkstelle.de</email
+></address
+></affiliation
+><contrib
+>Deutsche Übersetzung</contrib
+></othercredit
+> 
+
+<copyright>
+<year
+>2002-2005</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2005-01-30</date>
+<releaseinfo
+>0.9.87</releaseinfo>
+
+
+<abstract>
+<para
+></para>
+<para
+>&kdiff3; ist ein Programm zum Anzeigen von Unterschieden und zum Zusammenführen von Dateien und Ordnern. &kdiff3; <itemizedlist>
+<listitem
+><para
+>vergleicht zwei oder drei Textdateien bzw. Ordner und führt sie zusammen,</para
+></listitem>
+<listitem
+><para
+>kann Unterschiede zeilenweise und sogar Zeichen für Zeichen anzeigen,</para
+></listitem>
+<listitem
+><para
+>hat eine Funktion zum automatischen Zusammenführen,</para
+></listitem>
+<listitem
+><para
+>enthält einen speziellen komfortablen Editor zum Auflösen von Konflikten beim Zusammenführen,</para
+></listitem>
+<listitem
+><para
+>ist mit Hilfe von KIO Netzwerktransparent,</para
+></listitem>
+<listitem
+><para
+>kann Unterschiede in "weißen" Zeichen oder Kommentaren besonders hervorheben oder verstecken.</para
+></listitem>
+<listitem
+><para
+>unterstützt Unicode, UTF-8 und weitere Dateikodierungen.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Dieses Dokument beschreibt &kdiff3; in der Version 0.9.87. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>vergleichen</keyword>
+<keyword
+>zusammenführen</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>dreifach-vergleichen</keyword>
+<keyword
+>vergleichen</keyword>
+<keyword
+>Dateien</keyword>
+<keyword
+>Ordner</keyword>
+<keyword
+>Versionskontrolle</keyword>
+<keyword
+>Drei-Wege-Zusammenführen</keyword>
+<keyword
+>Unterschiede innerhalb einer Zeile</keyword>
+<keyword
+>synchronisieren</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>netzwerktransparent</keyword>
+<keyword
+>Editor</keyword>
+<keyword
+>"weißes" Zeichen</keyword>
+<keyword
+>Kommentare</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Einführung</title>
+<sect1 id="why"
+><title
+>Noch eine Oberfläche zu Diff?</title>
+<para
+>Es gibt viele graphische Werkzeuge zum Vergleichen. Warum also &kdiff3;? Lassen Sie mich kurz erklären, warum ich &kdiff3; ins Leben gerufen habe. </para
+><para
+>&kdiff3; wurde programmiert, weil ich eine sehr komplizierte Zusammenführung durchzuführen hatte. Zusammenführen wird dann nötig, wenn mehrere Personen an der gleichen Datei in einem Projekt arbeiten. Wenn das verwendete Werkzeug zum Zusammenführen nicht nur die geänderten Dateien ("Branch" genannt), sondern auch die Originale ("Basis") zur Verfügung hat, kann das Zusammenführen gewissermaßen automatisiert werden. Das Programm wird dann automatisch die in der Branch gemachten Änderungen auswählen. Doch wenn mehrere Beitragende die gleichen Zeilen ändern, wird ein Konflikt erkannt. Solch ein Konflikt muss dann von Hand aufgelöst werden. </para
+><para
+>Die Zusammenführung war sehr kompliziert, weil einer der Beitragenden viele Änderungen vorgenommen und gleichzeitig an vielen Stellen die Einrückung korrigiert hatte. Ein weiterer Programmierer hatte in der gleichen Datei viel Text verändert. Das Ergebnis waren zahlreiche Konflikte beim Zusammenführen. </para
+><para
+>Das von mir benutzte Programm zeigte mir nur die geänderten Zeilen an, ich konnte aber nicht sehen, was genau sich innerhalb dieser Zeilen geändert hatte. Und es gab keinerlei Hinweise auf die Stellen, wo sich vielleicht nur die Einrückung geändert hatte. Das Zusammenführen dieser Änderungen war ein kleiner Albtraum. </para
+><para
+>Das war also der Beginn. Die erste Version von &kdiff3; konnte Unterschiede innerhalb einer Zeile und Änderungen an "weißen" Zeichen darstellen. Später wurden noch jede Menge weiterer nützlicher Funktionen hinzugefügt. </para
+><para
+>Wenn Sie zum Beispiel schnell Text vergleichen möchten, kopieren Sie ihn einfach in die Zwischenablage und fügen ihn in eines der Vergleichsfenster ein. </para
+><para
+>Eine Funktion die viel Arbeit machte, war das Vergleichen und Zusammenführen von Ordnern. Diese Funktion verwandelte &kdiff3; beinahe in einen vollwertigen Datei-Browser. </para
+><para
+>Ich hoffe, dass Sie viel Nutzen an &kdiff3; haben und wünsche Ihnen viel Freude! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Bildschirmphotos und Funktionen</title>
+<para
+>Dieses Bildschirmphoto zeigt die Unterschiede zwischen zwei Textdateien</para>
+<para
+>(Unter Verwendung einer frühen Version von &kdiff3;):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>Auch 3-Wege-Zusammenführen wird vollständig unterstützt. Dies ist nützlich, wenn zwei Personen unabhängig voneinander an einem Stück Kode arbeiten und Änderungen vornehmen. Die Originaldatei (die Basis) hilft &kdiff3; beim automatischen Auswählen der jeweils korrekten Änderungen. Der Zusammenführungs-Editor unter den Unterschiede-Fenstern ermöglicht das Auflösen von Konflikten und zeigt gleichzeitig das zu erwartende Ergebnis an. In diesem Editor können Sie das Ergebnis sogar direkt bearbeiten. Das Bildschirmphoto zeigt drei Quell-Dateien beim Zusammenführen: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>&kdiff3; hilft Ihnen auch beim Vergleichen und Zusammenführen kompletter Ordner. Dieses Bildschirmphoto zeigt &kdiff3; beim Ordner-Zusammenführen: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Weitere Funktionen</title>
+<sect2
+><title
+>Zeilen- und sogar Zeichenweises Darstellen von Unterschieden</title>
+<para
+>&kdiff3; zeigt die exakten Unterschiede an und bediehnt sich dazu der Möglichkeiten heutiger Farbmonitore. Wenn Sie häufig Kode überprüfen müssen, werden Sie diese Funktion mögen. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Erkennen von Unterschieden in "weißen" Zeichen auf einen Blick</title>
+<para
+>Unterschiede in "weißen" Zeichen und Tabulatoren werden sichtbar dargestellt. Wenn sich Zeilen nur in einer gewissen Anzahl an "weißen" Zeichen unterscheiden, kann man das auf einen Blick an der Zusammenfassung in der Spalte an der linken Seite sehen. (Kein Ärger mehr, wenn Jemand die Einrückung ändert.) </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>3-Wege-Vergleichen</title>
+<para
+>Man kann drei Dateien analysieren und sehen, an wo sie sich unterscheiden. </para
+><para
+>Das linke/mittlere/rechte Fenster hat den Namen A/B/C und ist entsprechend blau/grün/magenta eingefärbt. </para
+><para
+>Wenn eine Datei gleich ist, und die andere sich in einer Zeile unterscheidet, dann zeigt die Farbe an, welche Datei unterschiedlich ist. Rote Farbe bedeutet, dass beide sich Dateien unterscheiden. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Komfortables zusammenführen von zwei oder drei Dateien</title>
+<para
+>Mit &kdiff3; kann man zwei oder drei Dateien zusammenführen. Dabei führt &kdiff3; so viel wie möglich automatisch zusammen. Das Ergebnis wird in einem editierbaren Fenster angezeigt; dort können die meisten Konflikte schon mit einem einfachen Mausklick gelöst werden: Wählen Sie zwischen den Knöpfen A/B/C um die zu benutzende Quelle auszuwählen. Sie können auch mehr als eine Quelle wählen. Weil das Fenster im Grunde ein Editor ist, können hier selbst Konflikte, die eine weitere Bearbeitung erfordern, einfach aufgelöst werden. Sie benötigen dazu keine weiteren Hilfsmittel. </para>
+</sect2>
+
+<sect2
+><title
+>Und ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Schnelle Navigation über Knöpfe.</para
+></listitem>
+   <listitem
+><para
+>Ein Mausklick in die Zusammenfassungs-Spalte gleicht alle Fenster ab, so dass alle die gleiche Stelle anzeigen.</para
+></listitem>
+   <listitem
+><para
+>Kopieren Sie eine Auswahl aus irgendeinem Fenster einfach in das Ergebnisfenster.</para
+></listitem>
+   <listitem
+><para
+>Die Übersichtsspalte zeigt an, wo sich Änderungen und Konflikte befinden.</para
+></listitem>
+   <listitem
+><para
+>Die Farben sind an Ihre Bedürfnisse anpassbar.</para
+></listitem>
+   <listitem
+><para
+>Die Größe von Unterfenstern ist veränderbar.</para
+></listitem>
+   <listitem
+><para
+>Es gibt die Option, anstelle von Tabulatoren Leerzeichen einzufügen.</para
+></listitem>
+   <listitem
+><para
+>Bequemes Öffnen von Dateien über einen Dialog oder über die Kommandozeile.</para
+></listitem>
+   <listitem
+><para
+>Suchen (Strg-F) und Weitersuchen (F3) nach bestimmten Zeichenketten in allen Textfenstern.</para
+></listitem>
+   <listitem
+><para
+>Anzeigen der Zeilennummer zu jeder Zeile. </para
+></listitem>
+   <listitem
+><para
+>Einfügen aus der Zwischenablage oder das Ziehen von Text in ein Vergleichsfenster.</para
+></listitem>
+   <listitem
+><para
+>Netzwerktransparenz durch KIO.</para
+></listitem>
+   <listitem
+><para
+>&kdiff3; kann als Anzeigemodul in KDevelop 3 genutzt werden um Unterschiede anzuzeigen.</para
+></listitem>
+   <listitem
+><para
+>Zeilenumbruch für lange Zeilen</para
+></listitem>
+   <listitem
+><para
+>Unterstützung für Unicode, UTF-8 und weitere Kodierungen.</para
+></listitem>
+   <listitem
+><para
+>Unterstützung für Sprachen, die von rechts nach links geschrieben werden.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Dokumentation zum Vergleichen und Zusammenführen von Dateien</title>
+
+<sect1 id="commandline"
+><title
+>Kommandozeilen-Optionen</title>
+
+<sect2
+><title
+>Vergleichen von zwei Dateien: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>datei1 datei2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Zusammenführen von zwei Dateien: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>datei1 datei2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>datei1 datei2</replaceable
+> -o <replaceable
+>ausgabedatei</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Vergleichen von drei Dateien: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>datei1 datei2 datei3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Zusammenführen von drei Dateien: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>datei1 datei2 datei3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>datei1 datei2 datei3</replaceable
+> -o <replaceable
+>ausgabedatei</replaceable
+>
+</screen>
+<para
+>Beachten Sie, dass <replaceable
+>datei1</replaceable
+> als Basis für <replaceable
+>datei2</replaceable
+> und <replaceable
+>datei3</replaceable
+> verwendet wird. </para>
+</sect2>
+
+<sect2
+><title
+>Spezialfall: Dateien mit gleichem Namen </title>
+<para
+>Wenn alle Dateien den gleichen Namen haben, aber in verschiedenen Ordnern liegen, dann können Sie sich die Tipparbeit erleichtern indem Sie nur den Dateinamen der ersten Datei vollständig ausschreiben. Beispiel: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>Ordner1/Dateiname Ordner2 Ordner3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kommandozeile zum Vergleichen bzw. Zusammenführen von Ordnern: </title>
+<para
+>Das Vorgehen ist hier sehr ähnlich, doch nun geht es um Ordner.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2</replaceable
+> -o <replaceable
+>Zielordner</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2 Ordner3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2 Ordner3</replaceable
+> -o <replaceable
+>Zielordner</replaceable
+>
+</screen>
+<para
+>Zum Vergleichen bzw. Zusammenführen von Ordnern lesen Sie bitte <link linkend="dirmerge"
+>hier</link
+> weiter.</para>
+</sect2>
+
+<sect2
+><title
+>Mehr Informationen zu den Kommandozeilen-Optionen erhalten Sie mit diesem Befehl: </title>
+<screen
+><command
+>kdiff3</command
+> --help
+Options:
+  -m, --merge               Quellen zusammenführen.
+  -b, --base file           Explizite Basisdatei. Für Kompatibilität mit anderen Programmen.
+  -o, --output datei        Ausgabe-Datei. Impliziert -m. Z. B.: -o neueDatei.txt
+  --out file                Ausgabe-Datei. (Für Kompatibilität mit anderen Programmen.)
+  --auto                    Keine graphische Oberfläche, wenn alle Konflikte automatisch aufgelöst werden können. (Benötigt -o datei)
+  --qall                    Konflikte nicht automatisch auflösen. (Aus Kompatibilitätsgründen.)
+  --L1 alias1               Sichtbarer Namensersatz für Quelldatei 1 (Basis).
+  --L2 alias2               Sichtbarer Namensersatz für Quelldatei 2.
+  --L3 alias3               Sichtbarer Namensersatz für Quelldatei 3.
+  -L, --fname alias         Alternativer sichtbarer Namensersatz. Für jede Quelldatei einmal angeben.
+  -u                        Hat keine Wirkung. Für Kompatibilität mit anderen Programmen.
+</screen>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Öffnen-Dialog</title>
+<para
+>Weil mehrere Dateien auszuwählen sind, hat &kdiff3; einen besonderen Dialog zum Öffnen von Dateien: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Der Öffnen-Dialog ermöglicht das manuelle Eintippen von Dateinamen, die Auswahl über den Datei-Browser ("Datei...") oder das Auswählen einer zuletzt geöffneten Datei aus der Aufklappliste. Der Öffnen-Dialog merkt sich Ihre Auswahl und zeigt sie beim nächsten Mal wieder an. Sie müssen keine dritte Datei angeben; wenn Sie den Eintrag für "C" leer lassen, wird die Analyse der Unterschiede mit zwei Dateien durchgeführt. </para
+><para
+>Über den Knopf "Ordner..." können Sie auch einen Ordner auswählen. Wenn Sie einen Ordner wählen, wird das Vergleichen bzw. Zusammenführen von Ordnern eingeleitet. Wenn für "A" eine Datei ausgewählt wird, für "B" und "C" jedoch ein Ordner, dann benutzt &kdiff3; den Dateinamen aus "A" in den beiden anderen Ordnern. </para
+><para
+>Wenn "Zusammenführen" angekreuzt ist, wird das Eingabefeld für "Ziel" aktiv und lässt sich bearbeiten. Es ist allerdings nicht unbedingt erforderlich, sofort eine Ausgabedatei festzulegen. Sie können diesen Schritt auch später beim Speichern erledigen. </para
+><para
+>Der "Einrichten"-Knopf öffnet einen Dialog mit Einstellungen. Hier können Sie Optionen festlegen bevor Sie mit dem Vergleichen/Zusammenführen beginnen. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Einfügen und Ablegen von Text</title>
+<para
+>Manchmal möchte man nicht eine ganze Datei, sondern nur Teile eines Textes vergleichen. &kdiff3; ermöglicht Ihnen, Textteile aus der Zwischenablage in das aktive Vergleichsfenster zu ziehen. Der Vergleich beginnt dann sofort. Im Öffnen-Dialog müssen Sie keine Dateien auswählen, Sie können den Dialog einfach mit dem "Abbrechen"-Knopf schließen. </para
+><para
+>Sie können auch "Ziehen und Ablegen" benutzen: Ziehen Sie einfach eine Datei aus einem Dateimanager oder ausgewählten Text aus einem Editor und lassen Sie ihn über einem Vergleichsfenster fallen. </para
+><para
+>Welcher Gedanke steckt dahinter? Manchmal enthält eine Datei z. B. mehrere ähnliche Funktionen. Wenn Sie herausfinden möchten, wie ähnlich sich diese Funktionen sind, wäre das ein relativ großer Aufwand. Sie müssten erst zwei entsprechende Dateien erstellen, sie in &kdiff3; laden und diese dann vergleichen. Jetzt können Sie die relevanten Abschnitte einfach kopieren, einfügen und dann vergleichen. </para
+><para
+>Anmerkung: Zur Zeit können Sie nichts aus &kdiff3; herausziehen. Nur das Fallenlassen von Text in ein Vergleichsfenster wird unterstützt. </para
+><para
+>Warnung: Einige Editoren interpretieren das Ziehen und Ablegen von Text in ein anderes Programm als Ausschneiden und Einfügen (anstelle von Kopieren und Einfügen). In einem solchen Fall könnten Ihre Originaldaten verloren gehen. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Interpretieren der angezeigten Informationen in den Quellfenstern</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Im oberen Teil jedes Textfensters befindet sich die Info-Zeile. Die Info-Zeile der Quellfenster enthält die Zeichen "A", "B" oder "C", den Dateinamen und die Zeilennummer der ersten sichtbaren Zeile im Fenster. (Beachten Sie, dass Fenster "C" optional ist.) Jede Info-Zeile hat eine unterschiedliche Farbe. (Wenn der Pfad zu einer Datei zu lang ist, lassen Sie die Maus eine Weile über der Zeile ruhen. Dann wird ein kleines Hilfsfenster den vollständigen Namen anzeigen.) </para
+><para
+>Den drei Quellfenstern sind die Buchstaben "A", "B" und "C" zugeordnet. "A" hat die Farbe Blau, "B" die Farbe Grün und "C" ist magenta. (Diese Voreinstellungen können über das Einstellungen-Menü geändert werden.) </para
+><para
+>Wenn ein Unterschied erkannt wird, sieht man an der Farbe, welche Datei sich unterscheidet. Wenn sich beide Dateien unterscheiden, ist die Voreingestellte Farbe dafür Rot. ("Farbe für Konflikte" in den Einstellungen). Das Farbschema ist besonders nützlich, wenn Sie drei Dateien vergleichen. Das ist im nächsten Abschnitt (<link linkend="merging"
+>Zusammenführen</link
+>) gut zu sehen. </para
+><para
+>Links neben dem Text befindet sich die Zusammenfassungs-Spalte. Wenn Unterschiede gefunden wurden, zeigt die Spalte die entsprechende Farbe an. Bei Unterschieden in "weißen" Zeichen wird die Farbe gerastert angezeigt. Bei einigen Programmiersprachen wo "weiße" Zeichen nicht so wichtig sind, ist es nützlich, nur die relevanten Änderungen zu sehen. (Bei C/C++ z. B. sind "weiße" Zeichen nur in Zeichenketten und Kommentaren, für den Preprozessor und in wenigen, seltenen Einzelfällen relevant.) </para
+><para
+>Die vertikale Linie, die die Zusammenfassungs-Spalte vom Text trennt, wird an den Stellen unterbrochen, wo die jeweilige Quelldatei keine Zeilen hat. Wenn der Zeilenumbruch aktiviert ist, wird die Linie an umgebrochenen Zeilen gepunktet dargestellt. </para
+><para
+>An der rechten Seite befindet sich eine Übersichts-Spalte, direkt links neben der vertikalen Bildlaufleiste. Sie zeigt eine komprimierte Zusammenfassung des gesamten Fenster "A". Alle Unterschiede und Konflikte sind hier auf einen Blick erkennbar. Wenn nur zwei Quellfenster genutzt werden, dann erscheinen alle Unterschiede rot, denn dann ist jeder Unterschied gleichzeitig auch ein Konflikt. Der aktuell sichtbare Bereich der Quelltexte wird durch ein schwarzes Rechteck umrandet. Bei sehr langen Quelldateien mit mehr Zeilen als die Übersichts-Spalte in Pixeln anzeigen kann, teilen sich mehrere Zeilen jeweils eine Zeile in der Übersichts-Spalte. Ein Konflikt hat gegenüber einfacher Unterschiede die höchste Priorität. Unterschiede wiederum haben eine höhere Priorität als "keine Änderungen". So gehen keine Konflikte oder Unterschiede verloren. Durch einen Klick in die Übersichts-Spalte wird der zugehörige Text angezeigt. </para>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Zusammenführen und das editierbare Ergebnisfenster</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Das Ergebnisfenster (unter den Vergleichsfenstern) hat auch eine Info-Zeile mit der Aufschrift "Ausgabe:", dem Dateinamen und "[Geändert]" wenn Sie das Ergebnis bearbeitet haben. Üblicherweise enthält es durch das automatische Zusammenführen bereits Text, aber oft enthält es auch Konflikte. </para
+><para
+>!!! Bis alle Konflikte aufgelöst sind, ist das Speichern deaktiviert !!! (Benutzen Sie die Knöpfe "Springe zu nächstem gelösten/ungelösten Konflikt" um die noch verbleibenden Konflikte zu finden.) </para
+><para
+>Wenn nur zwei Vergleichsfenstern benutzt werden, ist jeder Unterschied gleichzeitig auch ein Konflikt der manuell gelöst werden muss. </para
+><para
+>Bei drei Vergleichsfenstern wird die erste Datei als Basis verwendet, und die zweite und dritte Datei enthalten die Änderungen. Wenn eine Zeile nur in Datei B oder C geändert wurde, aber nicht in beiden, dann wird automatisch die richtige Änderung ausgewählt. Wenn B und C allerdings Änderungen in der gleichen Zeile enthalten, erkennt &kdiff3; einen manuell zu lösenden Konflikt. Wenn B und C identisch sind, sich aber von A unterscheiden, dann wird C als Quelle ausgewählt. </para
+><para
+>Das Ergebnisfenster hat auch eine Zusammenfassungs-Spalte an der linken Seite. Sie zeigt entweder den Buchstaben des Vergleichsfensters an von dem eine Zeile stammt, oder sie ist leer, wenn alle drei Quellen an der Stelle identisch sind. Konflikte werden mit einem roten Fragezeichen "?" und dem Text &lt;Zusammenführungskonflikt&gt; dargestellt. Weil das zeilenweise Auflösen von Konflikten sehr lange dauern würde, werden Zeilen mit gleichem Unterschied und Charakteristika gruppiert. Konflikte mit "weißen" Zeichen und Konflikte mit "nicht-weißen" Zeichen werden getrennt dargestellt, um das Zusammenführen von Dateien mit vielen Einrückungsänderungen zu vereinfachen. </para
+><para
+>Durch einen Klick mit der linken Maustaste in die Zusammenfassungs-Spalte in einem der Fenster wird die zu der Zeile gehörende Gruppe in allen Fenstern markiert und die erste Zeile der Gruppe wird angezeigt. (Dadurch wird auch ein Sprung der Position in den Fenstern verursacht, wo der Anfang der Gruppe sonst nicht sichtbar wäre.) Diese Gruppe wird dann die "aktuelle Gruppe". Sie wird mit der Farbe "Hintergrundfarbe für aktuellen Bereich" hervorgehoben und jeweils zur Linken erscheint ein schwarzer Balken. </para
+><para
+>Beachten Sie die Knöpfe zur Auswahl der Quelle mit der Beschriftung "A", "B" und "C" unterhalb der Menüleiste. Wenn Sie auf einen der Knöpfe klicken, werden die Zeilen aus dem entsprechenden Fenster an das Ende der ausgewählten Gruppe im Ergebnisfenster angehängt (wenn sie nicht bereits vorhanden sind). Falls die Zeilen bereits vorhanden sind, werden sie beim Klicken auf den Knopf entsprechend wieder entfernt. </para
+><para
+>Hinweis: Sie können auch jede Zeile manuell bearbeiten. Die Zusammenfassungs-Spalte zeigt dann ein "m" in jeder Zeile, die Sie von Hand bearbeitet haben. </para
+><para
+>Manchmal bleibt durch das automatische Zusammenführen oder durch manuelles Bearbeiten keine weitere Zeile mehr in der Gruppe übrig; dann wird in diesen Zeilen der Text &lt;Keine Zeile in der Quelle&gt; angezeigt. Das ist nur ein Platzhalter für den Fall, dass Sie Ihre Meinung ändern und vielleicht doch wieder eine andere Quelle wählen. Dieser Text erscheint weder in der endgültigen gespeicherten Datei, noch in einer Markierung die Sie vielleicht kopieren und woanders einfügen. </para
+><para
+>Der Text &lt;Zusammenführungskonflikt&gt; erscheint allerdings in der Zwischenablage, wenn Sie solchen Text aus dem Ergebnisfenster kopieren. Gehen Sie vorsichtig mit dieser Funktion um. </para
+><para
+>Das normale Zusammenführen startet mit dem automatischen Lösen einfacher Konflikte. Das "Zusammenführen"-Menü enthält einige häufig verwendete Funktionen. Wenn Sie bei den meisten Konflikten die gleiche Quelle auswählen müssen, können Sie z. B. überall "A", "B" oder "C" auswählen. Die gleiche Möglichkeit gibt es auch für die noch verbleibenden ungelösten Konflikte oder sogar für die noch verbleibenden ungelösten Konflikte in "weißen" Zeichen. Wenn Sie solche Entscheidungen nicht zusammengefasst für eine Gruppe, sondern sogar für jeden einzelnen Unterschied im Detail treffen möchten, dann wählen Sie "Alle Unterschiede zu Konflikten machen". Sie können wieder zur automatischen Auswahl von &kdiff3; zurück, indem Sie "Automatisch einfache Konflikte lösen" wählen. &kdiff3; startet das Zusammenführen dann erneut. &kdiff3; fragt nach, bevor Ihre eventuell gemachten Änderungen verloren gehen. </para
+><para
+>Hinweis: Wenn beim Auswählen der Quellen die Optionen "Zahlen ignorieren" oder "Ignoriere C/C++ Kommentare" aktiviert sind, werden Änderungen in Zahlen oder Kommentaren auch wie "weiße" Zeichen behandelt. </para>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigieren und Bearbeiten</title>
+<para
+>Navigiert wird hauptsächlich mit den Bildlaufleisten und der Maus, aber Sie können dazu auch die Tastatur benutzen. Wenn Sie in eines der Fenster klicken, können Sie die Pfeiltasten links, rechts, hoch, runter, Seite auf, Seite ab, Anfang, Ende, Strg-Anfang und Strg-Ende benutzen, siw wie Sie es auch von anderen Programmen gewohnt sind. Die Übersichts-Spalte neben der vertikalen Bildlaufleiste kann durch hineinklicken auch zum Navigieren benutzt werden. </para
+><para
+>Ausserdem können Sie das Rädchen Ihrer Maus zum hoch- und runterblättern benutzen. </para
+><para
+>Im Augabefenster können Sie auch die anderen Tasten zum Bearbeiten verwenden. Mit der "Einfügen"-Taste können Sie zwischen Einfüge- und Überschreibmodus wechseln. (Voreingestellt ist der Einfügemodus.) </para
+><para
+>Ein Klick mit der linken Maustaste in eine der Zusammenfassungs-Spalten synchronisiert die Ansicht aller Fenster auf den Anfang der jeweiligen Gruppe (wie bereits im Abschnitt <link linkend="merging"
+>"Zusammenführen und das editierbare Ausgabefenster"</link
+> erklärt wurde). </para
+><para
+>Die Werkzeugleiste enthält sieben Knöpfe zur Navigation mit denen Sie zum aktuellen/ersten/letzten Unterschied, zum nächsten/vorigen Unterschied (Strg-unten/Strg-oben), zum nächsten/vorigen Konflikt (Strg-Bild Aufwärts/Strg-Bild Abwärts) oder zum nächsten/vorigen ungelösten Konflikt springen können. Beachten Sie, dass &kdiff3; alle nicht automatisch gelösten Konflikte auch nach dem manuellen lösen weiterhin als Konflikt betrachtet. Daher muss zwischen gelösten und ungelösten Konflikten unterschieden werden. </para
+><para
+>Es gibt auch einen Knopf "Automatisch zum nächsten ungelösten Konflikt weiterspringen". Wenn Sie dies aktivieren, wird &kdiff3; nach der ersten Auswahl der Quelle automatisch zum nächsten ungelösten Konflikt weiterspringen und ihn lösen. Das ist hilfreich, wenn Sie immer nur eine Quelle wählen möchten. Wenn Sie beide Quellen brauchen, oder das Ergebnis nach der Auswahl noch bearbeiten möchten, dann sollten Sie diese Funktion ausschalten. Bevor &kdiff3; zum nächsten ungelösten Konflikt weiterspringt, wird das Ergebnis der Auswahl für eine Kurze Zeit angezeigt. Die Verzögerungszeit kann im Abschnitt "Vergleich und Zusammenführung" in den Einstellungen eingestellt werden: Geben Sie für "Automatisch-Weiterspringen-Verzögerung" einen Wert zwischen 0 und 2000 Millisekunden an. Tipp: Wenn Sie sich viele Mausklicks sparen möchten, dann benutzen Sie eine kurze Verzögerungszeit und die Tastenkürzel Strg-1/2/3 uum Auswählen der Quelle A/B/C. </para>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Markieren, Kopieren und Einfügen</title>
+<para
+>In den Vergleichsfenstern wird kein Cursor angezeigt, daher müssen Markierungen mit der Maus gemacht werden. Drücken Sie am Beginn der Markierung die linke Maustaste und halten Sie sie gedrückt, ziehen Sie die Maus dann bis zum Ende der Markierung und lassen Sie hier die Maustaste wieder los. Ein einzelnes Wort kann auch einfach durch einen Doppelklick darauf markiert werden. Im Ergebnisfenster können Sie zum Markieren auch die Tastatur benutzen. Drücken Sie dazu die Umschalt-Taste und verändern Sie die Markierung mit den Pfeiltasten. </para
+><para
+>Um die Markierung in die Zwischenablage zu kopieren, müssen Sie den "Kopieren"-Knopf (Strg-C oder Strg-Einfügen) drücken. Es gibt auch die Option "Auswahl automatisch kopieren". Wenn diese aktiviert ist, wird, was immer Sie markieren, automatisch in die Zwischenablage kopiert und das manuelle Kopieren entfällt. Seien Sie mit dieser Option aber vorsichtig, denn Sie könnten so den Inhalt der Zwischenablage versehentlich überschreiben. </para
+><para
+>"Ausschneiden" (Strg-X oder Umschalt-Entfernen) kopiert in die Zwischenablage und löscht den markierten Text. "Einfügen" (Strg-V oder Umschalt-Einfügen) fügt den Text aus der Zwischenablage an der aktuellen Cursorposition ein bzw. ersetzt die aktuelle Markierung. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Speichern</title>
+<para
+>Speichern ist erst möglich, wenn alle Konflikte gelöst sind. Falls die Datei bereits existiert und die Option "Sicherungskopie erstellen" aktiviert ist, dann erhält die bestehende Datei die Endung ".orig". Wenn bereits eine ".orig"-Datei existiert, wird diese überschrieben. Wenn Sie einen weiteren Vergleich starten bzw. beenden und noch nicht gespeichert haben, dann fragt &kdiff3;, ob Sie Speichern, Abbrechen oder ohne zu speichern fortfahren möchten. (KDiff3 fängt allerdings keine System-Signale ab. Wenn Sie &kdiff3; also mit dem Signal "kill" beenden, gehen Ihre ungespeicherten Daten verloren.) </para
+><para
+>Zeilenenden werden entsprechend dem zugrundeliegenden Betriebssystem gespeichert. Unix-Varianten verwenden ein Zeilenvorschub-Zeichen "\n", und Win32-basierte Systeme benutzen Wagenrücklauf + Zeilenvorschub "\r\n". KDiff3 behält die Zeilenenden der Quelldateien nicht bei, darum sollten Sie &kdiff3; auch nicht mit Binärdateien verwenden. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Suchen und Finden von Zeichenketten</title>
+<para
+>Sie können in jedem Textfenster von &kdiff3; nach einer Zeichenkette suchen. Die "Suchen..."-Funktion (Strg-F) im Bearbeiten-Menü öffnet einen Dialog, in dem Sie die zu suchende Zeichenkette eingeben können. Eine Suche beginnt immer am Anfang. Mit der Funktion "Weitersuchen" (F3) können Sie zum nächsten Vorkommen der gesuchten Zeichenkette springen. Wenn Sie eine Suche über mehrere Fenster aktiviert haben, wird erst das erste Fenster vom Beginn bis zum Ende durchsucht, danach das nächste Fenster, u. s. w. </para>
+</sect1>
+
+
+<sect1 id="options"
+><title
+>Optionen</title>
+<para
+>Die Optionen und die Liste der zuletzt verwendeten Dateien wird beim Beenden automatisch gespeichert und beim nächsten Start wiederhergestellt. (Menü Einstellungen->KDiff3 einrichten...) </para>
+<sect2
+><title
+>Schriftart</title>
+<para
+>Wählen Sie eine Schrift mit fester Breite. (Auf einigen Systemen stellt der Dialog auch Schriften mit variabler Breite zur Auswahl, Sie sollten diese aber nicht benutzen.) </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Kursivschrift bei Unterschieden:</emphasis
+></term
+><listitem
+><para
+>Wenn Sie diese Option aktivieren, werden Unterschiede in kursiver Schrift dargestellt. Wenn die gewählte Schrift diese Darstellung nicht unterstützt, passiert gar nichts.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Farbe</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Vordergrundfarbe:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise Schwarz. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Hintergrundfarbe:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise Weiß. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Hintergrundfarbe bei Unterschieden:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise helles Grau. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farbe für A:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise dunkles Blau. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farbe für B:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise dunkles Grün. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farbe für C:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise dunkles Magenta. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Farbe für Konflikte:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise Rot.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Hintergrundfarbe für aktuellen Bereich:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise helles Gelb.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Hintergrundfarbe für Unterschiede im aktuellen Bereich:</emphasis
+></term
+><listitem
+><para
+>Üblicherweise dunkles Gelb.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>An Systemen mit nur 16 oder 256 Farben könnten einige Farben nicht in ihrer reinen Form verfügbar sein sondern würden gerastert dargestellt werden. An diesen Systemen stellt der Knopf "Voreinstellungen" automatisch eine ungerasterte Farbe ein. </para>
+</sect2>
+
+<sect2
+><title
+>Editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Tabulator fügt Leerzeichen ein:</emphasis
+></term
+><listitem
+><para
+>Wenn diese Option aktiviert ist, wird beim Drücken der Tabulator-Taste die entsprechende Anzahl an Leerzeichen eingefügt. Ansonsten wird ein Tabulator-Zeichen eingefügt.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tabulator Länge:</emphasis
+></term
+><listitem
+><para
+>Kann nach Ihren persönlichen Vorstellungen eingestellt werden. Voreingestellt ist 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatisch einrücken:</emphasis
+></term
+><listitem
+><para
+>Wenn Sie Eingabe oder Return drücken, wird die Einrückung der vorangehenden Zeile automatisch auch für die nächste Zeile verwendet. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Auswahl automatisch kopieren:</emphasis
+></term
+><listitem
+><para
+>Wenn diese Option aktiviert ist, wird jede Auswahl automatisch in die Zwischenablage kopiert. Das manuelle kopieren in die Zwischenablage entfällt dann. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Zeilenende-Typ:</emphasis
+></term
+><listitem
+><para
+>Sie können auswählen, welchen Zeilenende-Typ Sie zum Speichern bevorzugen. Der voreingestellte Wert ist die allgemein übliche Auswahl auf dem verwendeten Betriebssystem. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Verwendung der lokalen Codetabelle:</emphasis
+></term
+><listitem
+><para
+>Zum Anzeigen ausländischer Zeichen. Ändern Sie diese Option, wenn ausländische Zeichen nicht korrekt angezeigt werden. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Vergleich und Zusammenführung</title>
+<para
+>Beim Vergleichen von Dateien versucht &kdiff3; zuerst, alle vollständig identischen Zeilen in den Quelldateien zu finden. Nur während diesem ersten Schritt können "weiße" Zeichen ignoriert werden. Der zweite Schritt vergleicht jede Zeile. In diesem Schritt werden "weiße" Zeichen nicht ignoriert. Auch beim Zusammenführen werden "weiße" Zeichen nicht ignoriert. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Wagenrücklaufzeichen anzeigen:</emphasis
+></term
+><listitem
+><para
+>Manche Editoren (auf manchen Systemen) speichern ein Wagenrücklaufzeichen '\r' und einen Zeilenvorschub '\n' am Ende einer Zeile, andere wiederum speichern nur einen Zeilenvorschub '\n'. Üblicherweise ignoriert &kdiff3; das Wagenrücklaufzeichen, aber dann könnten Dateien mit unterschiedlichen Größen im Seite-an-Seite-Vergleich identisch aussehen, obwohl sie unterschiedlich sind. Wenn diese Option aktiviert ist, werden Wagenrücklaufzeichen sichtbar gemacht, jedoch wie ein "weißes" Zeichen behandelt. Während dem Zusammenführen muss diese Option deaktiviert sein. In der Voreinstellung ist dies deaktiviert.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Zahlen ignorieren:</emphasis
+></term
+><listitem
+><para
+>In der Voreinstellung ist diese Option deaktiviert. Im ersten Teil der Analyse werden Zahlen und zugehörige Zeichen ('0'-'9', '.', '-') ignoriert. Im Ergebnis werden die Unterschiede dennoch angezeigt, aber sie werden wie "weiße" Zeichen behandelt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignoriere C/C++ Kommentare:</emphasis
+></term
+><listitem
+><para
+>In der Voreinstellung ist diese Option deaktiviert. Änderungen in Kommentaren werden wie Änderungen in "weißen" Zeichen behandelt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Groß-/Kleinschreibung ignorieren:</emphasis
+></term
+><listitem
+><para
+>In der Voreinstellung ist diese Option deaktiviert. Underschiede in einzelnen Zeichen (wie z. B. 'A' und 'a') werden wie Unterschiede in "weißen" Zeichen behandelt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Vorverarbeitungsbefehl:</emphasis
+></term
+><listitem
+><para
+>Siehe <link linkend="preprocessors"
+>nächster Abschnitt</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Vorverarbeitungsbefehl nur für Zeilenabgleich:</emphasis
+></term
+><listitem
+><para
+>Siehe <link linkend="preprocessors"
+>nächster Abschnitt</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Aufwändig suchen (langsamer):</emphasis
+></term
+><listitem
+><para
+>Intensiv nach noch kleineren Unterschieden suchen. Die Option ist in der Voreinstellung aktiviert. Sie ist effektiv bei komplizierten und großen Dateien, aber langsam bei sehr großen Dateien. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatisch-Weiterspringen-Verzögerung (ms):</emphasis
+></term
+><listitem
+><para
+>Im Automatisch-Weiterspringen-Modus bestimmt diese Einstellung, wie lange das Ergebnis der Auswahl angezeigt wird, bevor zum nächsten ungelösten Konflikt weitergesprungen wird. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>"Weiße" Zeichen Autoauswahl bei 2/3 Dateien:</emphasis
+></term
+><listitem
+><para
+>Löst automatische alle Konflikte in "weißen" Zeichen indem die gewählte Datei als Quelle benutzt wird. (Voreingestellt ist manuelle Auswahl.) Das ist nützlich, wenn "weiße" Zeichen in vielen Dateien weniger wichtig sind. Wenn Sie dies nur von Zeit zu Zeit benötigen, dann nutzen Sie besser die Funktionen "Wähle A/B/C für alle ungelösten "weißen" Konflikte" aus dem Zusammenführen-Menü. Beachten Sie, dass die Automatische Auswahl auch Konflikte in Zahlen oder Kommentaren betrifft, wenn die Optionen "Zahlen ignorieren" oder "Ignoriere C/C++-Kommentare" aktiviert sind. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Verzeichnis-Zusammenführung</title>
+<para
+>Diese Optionen werden im Kapitel zum Scannen von Ordnern und Durchführen einer Zusammenführung behandelt. Schauen Sie für Details unter <link linkend="dirmergeoptions"
+>Dokumentation zum Verzeichnis-Vergleich und Zusammenführung</link
+> nach. </para
+><para
+>Es gibt hier dennoch eine Option die auch beim Speichern von einzelnen Dateien relevant ist: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Sicherungskopie erstellen (.orig):</emphasis
+></term
+><listitem
+><para
+>Wenn eine Datei gespeichert wird und bereits eine ältere Version existiert, dann wird der Originalversion das Suffix ".orig" angehängt. Wenn bereits eine solche Backupdatei mit dem Suffix ".orig" existiert, wird diese ohne weitere Sicherung gelöscht. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Regional- und Spracheinstellungen</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Sprache:</emphasis
+></term
+><listitem
+><para
+>Passt die Sprache der Benutzeroberfläche an. Das Ändern dieser Option betrifft nicht das aktuell laufende Programm. Sie müssen &kdiff3; beenden und neu starten, damit die Änderung aktiv wird. (Diese Option ist in der KDE-Version von &kdiff3; nicht verfügbar, weil die Sprache dort global über das Kontrollzentrum eingestellt wird.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Die gleiche Kodierung für alles verwenden:</emphasis
+></term
+><listitem
+><para
+>Die folgenden Kodierungseinstellungen können für jeden Eintrag separat eingestellt werden. Wenn man diese Option aktiviert, wird für alle Einträge die obere Einstellung verwendet. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Lokale kodierung:</emphasis
+></term
+><listitem
+><para
+>Über den Auswahlfeldern für die Kodierung erscheint ein kurzer Hinweis, was die lokale Kodierung ist. (Dies kann hier nicht geändert werden und hat für Sie rein informellen Charakter.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Datei-Kodierung für A/B/C:</emphasis
+></term
+><listitem
+><para
+>Passen Sie die Datei-Kodierung für Quelldateien an. Dies beeinflusst, wie Sonderzeichen behandelt und interpretiertwerden. Da die Kodierung für jede Datei einzeln einstellbar ist, können selbst Dateien mit unterschiedlicher Kodierung verglichen und zusammengeführt werden. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Datei-Kodierung für die Zusammenführen-Ausgaben und zum Speichern:</emphasis
+></term
+><listitem
+><para
+>Wenn Sie eine Datei bearbeitet haben, können Sie hier festlegen, welche Kodierung zum Speichern verwendet werden soll. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Datei-Kodierung für Preprozessor-Dateien:</emphasis
+></term
+><listitem
+><para
+>Wenn Sie Vorverarbeitungsbefehle definieren, könnten sie eventuell nicht mit Ihrem Codec funktionieren. (Z. B. könnten Ihre Dateien 16-Bit Unicode sein, aber der Vorverarbeitungsbefehl kann nur mit 8-Bit ASCII umgehen.) Mit dieser Option kann man die Kodierung der Ausgabe von Vorverarbeitungsbefehelen festlegen. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Rechts-nach-Links-Sprache:</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Verschiedenes</title>
+<para
+>(Diese Optionen und Aktionen sind in den Menüs oder den Werkzeugleisten zu finden.)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Zeige Zeilennummern:</emphasis
+></term
+><listitem
+><para
+>Sie können wählen, ob in den Quelldateien die Zeilennummern angezeigt werden sollen.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Zeige Leerzeichen und Tabulator-Zeichen in Unterschieden:</emphasis
+></term
+><listitem
+><para
+>Manchmal sind sichtbare Leerzeichen und Tabulatoren störend. Sie können die Anzeige dieser Zeichen abschalten.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Zeige "weiße" Zeichen:</emphasis
+></term
+><listitem
+><para
+>Schalten Sie dies ab, um Hervorhebungen von Änderungen in "weißen" Zeichen in den Text- oder Übersichtsspalten zu unterdrücken. (Hinweis: Dies gilt auch für Änderungen in Zahlen oder Kommentaren, wenn die Optionen "Zahlen ignorieren" oder "Ignoriere C/C++-Kommentare" aktiviert sind.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Übersichts-Optionen:</emphasis
+></term
+><listitem
+><para
+>Dieses Auswahl ist nur verfügbar, wenn Sie drei Dateien vergleichen. Im normalen Modus werden alle Unterschiede in einer farblich kodierten Übersichts-Spalte angezeigt. Aber manchmal möchten Sie vielleicht nur die Unterschiede zwischen zwei von drei Dateien sehen. Nach Auswahl von "A &lt;-&gt; B", "A &lt;-&gt; C" oder "B &lt;-&gt; C" wird neben der normalen noch eine zweite Übersichts-Spalte mit den benötigten Informationen angezeigt. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Zeilenumbruch in Diff-Fenstern:</emphasis
+></term
+><listitem
+><para
+>Aktiviert den Zeilenumbruch in Diff-Fenstern, wenn die Länge einer Zeile die Breite des Fensters überschreitet. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Zeige Fenster A/B/C:</emphasis
+></term
+><listitem
+><para
+>Manchmal möchte man den verfügbaren Platz auf dem Bildschirm lieber für lange Zeilen benutzen. Verstecken Sie einfach die weniger wichtigen Fenster. (Diese Option befindet sich im Fenster-Menü.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Ausrichtung der Fensterteilung wechseln:</emphasis
+></term
+><listitem
+><para
+>Ordnet die Vergleichfenster nebeneinander oder übereinander an. Dies kann auch zum Anzeigen von langen Zeilen nützlich sein. (Diese Option befindet sich im Fenster-Menü.) </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Aktuelle Datei zusammenführen:</emphasis
+></term
+><listitem
+><para
+>Manchmal betrachten Sie die Unterschiede und entscheiden sich dann unvermittelt, die Dateien zusammenzuführen. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+>"Aktuelle Datei zusammenführen" im Zusammenführen-Menü funktioniert auch dann, wenn Sie nur zwei Dateien vergleichen. Ein einfacher Klick startet die Zusammenführung und benutzt den Dateinamen der letzten Quelldatei als voreingestellten Namen für die Ausgabedatei. (Wenn diese Funktion benutzt wird, um das Zusammenführen erneut zu starten, dann wird der Name der zuletzt benutzten Ausgabedatei beibehalten.)</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Kurzbefehle festlegen</title>
+<para
+>Zur Zeit unterstützt nur die KDE-Version benutzerdefinierbare Kurzbefehle (Menü Einstellungen->Kurzbefehle festlegen...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Vorverarbeitungsbefehle:</title>
+<para
+>KDiff3 unterstützt zwei Vorverarbeitungsbefehle. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Vorverarbeitungsbefehl:</emphasis
+></term
+><listitem
+><para
+>Beim Lesen einer Datei wird sie zuerst diesem externen Kommando übergeben. In &kdiff3; wird dann die Ausgabe des Kommandos sichtbar, und nicht die Datei selbst. Sie können Ihren eigenen Präprozessor schreiben, der genau Ihren Ansprüchen entspricht. Sie können diese Funktion z. B. zum herausschneiden störender Teile oder zum korrigieren der Einrückung verwenden. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Vorverarbeitungsbefehl nur für Zeilenabgleich:</emphasis
+></term
+><listitem
+><para
+>Beim Lesen einer Datei wird sie zuerst diesem externen Kommando übergeben. Wenn auch ein normaler Vorverarbeitungsbefehl angegeben wurde (siehe oben), dann ist die Ausgabe des Befehls die Eingabe dieses Vorverarbeitungsbefehls. Die Ausgabe des Kommandos wird nur beim Zeilenabgleich verwendet. Sie können Ihren eigenen Präprozessor schreiben, der genau Ihren Ansprüchen entspricht. Jede Eingabe-Zeile muss eine zugehörige Ausgabe-Zeile haben. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>Der Gedanke dahinter ist, dem Anwender mehr Flexibilität beim Einrichten der Diff-Ergebnisse zu ermöglichen. Doch dafür wird ein externes Programm benötigt, und die meisten Anwender möchten das nicht selbst programmieren. Die Gute Nachricht ist allerdings, dass in dem meisten Fällen <command
+>sed</command
+> oder <command
+>perl</command
+> vollkommen ausreichen. </para>
+<para
+>Beispiel: Ein einfacher Testfall. Wie nehmen eine Datei a.txt (6 Zeilen):<screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> Und eine Datei b.txt (3 Zeilen): <screen>
+      cg
+      dg
+      eg
+</screen
+>  Ohne Preprozessor würden die folgenden Zeilen nebeneinander stehen: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Dies ist allerdings nicht das gewünschte Ergebnis, weil der erste Buchstabe die interessante Information darstellt. Um den Suchalgorythmus beim Abgleich zu unterstützen, ignorieren wir den zweiten Buchstaben. Dazu kann folgender Zeilen-Preprozessor verwendet werden, der "g" durch "a" ersetzt: <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Mit diesem Kommando würde das Ergebnis so aussehen: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+>  Programmintern "sieht" der Vergleichsalgorythmus die Dateien erst nach dem Durchlauf des Zeilen-Preprozessors, auf dem Bildschirm jedoch erscheinen die Dateien unverändert. (Der normale Preprozessor würde auch die Daten auf dem Bildschirm ändern.) </para>
+
+<sect2 id="sedbasics"
+><title
+><command
+>sed</command
+>-Grundlagen</title>
+<para
+>Dieser Abschnitt führt Sie nur in einige sehr grundlegende Funktionen von <command
+>sed</command
+> ein. Weiterführende Informationen finden Sie unter <ulink url="info:/sed"
+>info:/sed</ulink
+> oder <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Eine vorkompilierte Version für Windows finden Sie unter <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Beachten Sie, dass die folgenden Beispiele voraussetzen, dass das Kommando <command
+>sed</command
+> sich in einem Ordner in der PATH-Variable befindet. Falls das nicht der Fall sein sollte, müssen Sie den vollständigen Pfad zu <command
+>sed</command
+> angeben. Außerdem nutzen die Beispiele einfache Hochkommas ('), die allerdings unter Windows nicht funktionieren. Unter Windows müssen Sie doppelte Hochkommas (") verwenden. </para>
+<para
+>In diesem Kontext wird nur das <command
+>sed</command
+>-Substitute-Kommando benutzt: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>ERSATZ</replaceable
+>/<replaceable
+>SCHALTER</replaceable
+>'
+</screen
+> Bevor Sie in KDiff3 ein neues Kommando benutzen, sollten Sie es zuerst in der Konsole testen. Hier kann der <command
+>echo</command
+>-Befehl sehr hilfreich sein. Beispiel: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Dieses Beispiel zeigt ein einfaches <command
+>sed</command
+>-Kommando, das das erste Vorkommen von "a" durch "o" ersetzt. Wenn Sie alle Vorkommen ersetzen möchten, müssen Sie den Schalter "g" benutzen: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Das "|"-Symbol ist das Pipe-Kommando, es übergibt die Ausgabe des ersten Kommandos an die Eingabe des folgenden Kommando. Wenn Sie Ihr <command
+>sed</command
+>-Kommando mit einer längeren Datei testen möchten, dann können Sie unter Unix <command
+>cat</command
+> und unter Window <command
+>type</command
+> dazu benutzen. <command
+>sed</command
+> wird die Ersetzung in jeder Zeile der Datei durchführen. <screen
+><command
+>cat</command
+> <replaceable
+>dateiname</replaceable
+> | <command
+>sed</command
+> <replaceable
+>optionen</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Beispielanwendungen von <command
+>sed</command
+> in KDiff3</title>
+<sect3
+><title
+>Ignorieren weiterer Kommentartypen</title>
+<para
+>Zur Zeit unterstützt KDiff3 nur C/C++-Kommentare. Mit Hilfe des Vorverarbeitungsbefehl nur für Zeilenabgleich können Sie auf andere Kommentar-Arten unterstützen. Dafür wandeln Sie diese in C/C++-Kommentare um. Beispiel: Um Kommentare zu ignorieren, die mit "#" beginnen, würden Sie diese zu "//" umwandeln. Außerdem muss natürlich die Option "C/C++-Kommentare ignorieren" aktiviert sein damit dies etwas bewirkt. Ein passendes Kommando für den Vorverarbeitungsbefehl nur für Zeilenabgleich wäre zum Beispiel: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Weil das Zeichen "/" für <command
+>sed</command
+> ein Sonderzeichen ist, muss jedem "/" ein "\" vorangestellt werden. Manchmal wird dies benötigt, um einem Sonderzeichen die besondere Bedeutung zu "entziehen". Außerdem sind die einfachen Anführungszeichen (') vor und hinter dem Ersetzungskommando wichtig, weil die Shell sonst versucht, einige der Zeichen wie '#', '$' oder '\' zu ersetzen bevor sie an <command
+>sed</command
+> weitergereicht werden. Unter Windows müssen Sie doppelte Anführungszeichen verwenden ("). Windows ersetzt Zeichen wie '%' grundsätzlich, hier müssen Sie eventuell ein wenig experimentieren. </para>
+</sect3>
+<sect3
+><title
+>Diff ohne Beachtung der Groß-/ Kleinschreibung</title>
+<para
+>Verwenden Sie diesen Vorverarbeitungsbefehl für Zeilenabgleich um die Eingabe in Großbuchstaben umzuwandeln: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Das ".*" ist ein ergulärer Ausdruck der auf jede Zeichenkette passt und in diesem Zusammenhang daher alle Zeichen in einer Zeile erfasst. Die "\1" in der Ersetzungs-Zeichenkette bezieht sich auf den gefundenen Text im ersten Klammernpaar. Das "\U" wandelt den gefundenen Text in Großbuchstaben um. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorieren von Schlüsselwörtern aus Versionskontrolle-Systemen</title>
+<para
+>CVS und andere Versionskontrolle-Systeme verwenden einige Schlüsselwörter um automatisch erzeugte Zeichenketten einzufügen (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Alle folgen dem selben Muster "$SCHLÜSSELWORT erzeugter Text$". Nun wird also ein Vorverarbeitungsbefehl für Zeilenabgleich benötigt, der den automatisch erzeugten Text entfernt: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Das "\|" trennt die möglichen Schlüsselwörter. Sie können die Liste nach Bedarf ändern. Das "\" vor dem "$" ist nötig, weil "$" ein Sonderzeichen ist und "Ende der Zeile" bedeuten würde. </para>
+<para
+>Während Sie mit <command
+>sed</command
+> experimentieren, beginnen Sie vielleicht, es zu verstehen und vielleicht mögen Sie diese regulären Ausdrücke sogar. Sie sind sehr nützlich weil es viele Programme gibt, die sehr ähnliche Dinge unterstützen. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorieren von Zahlen</title>
+<para
+>Das Ignorieren von Zahlen ist eigentlich eine bereits eingebaute Funktion in KDiff3. Aber sie ist gut als Beispiel für einen weiteren Vorverarbeitungsbefehl für Zeilenabgleich geeignet. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Jedes Zeichen zwischen '[' und ']' ist ein Treffer, und jeder Treffer wird durch nichts ersetzt, also quasi gelöscht. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorieren von bestimmten Spalten</title>
+<para
+>Manchmal ist ein Text nach strengen Regeln formatiert und enthält Spalten, die Sie grundsätzlich ignorieren möchten, und andere Spalten, die Sie für die Analyse heranziehen möchten. Im folgenden Beispiel werden die ersten fünf Spalten (Zeichen) ignoriert, dann 10 Spalten beibehalten, dann wieder fünf Spalten ignoriert und der Rest der Zeile wird beibehalten. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Jeder Punkt '.' passt auf genau ein Zeichen. Die "\1" und "\2" in der Ersetzungs-Zeichenkette beziehen sich auf den gefundenen Text im ersten und zweiten Klammernpaar und markieren so den beizubehaltenden Text. </para>
+</sect3>
+
+<sect3
+><title
+>Mehrere Ersetzungen kombinieren</title>
+<para
+>Manchmal möchten Sie vielleicht mehrere Ersetzungen auf einmal durchführen. Dann können Sie das Semikolon ';' benutzen, um die Ersetzungen voneinander zu trennen. Beispiel: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+><command
+>perl</command
+> statt <command
+>sed</command
+> benutzen</title>
+<para
+>Statt <command
+>sed</command
+> können Sie auch etwas anderes wie z. B. <command
+>perl</command
+> verwenden. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>ERSETZUNG</replaceable
+>/<replaceable
+>SCHALTER</replaceable
+>'
+</screen
+> Allerdings sind bei <command
+>perl</command
+> einige Details anders. Wo <command
+>sed</command
+> "\(" und "\)" benötigt, braucht <command
+>perl</command
+> nur noch "(" und ")" ohne das vorangestellte '\'. Beispiel: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Reihenfolge der Ausführung von Preprozessoren</title>
+<para
+>Die Daten werden durch interne und externe Preprozessoren in dieser Reihenfolge durchgeschleust: </para>
+<itemizedlist>
+<listitem
+><para
+>Normaler Preprozessor,</para
+></listitem>
+<listitem
+><para
+>Vorverarbeitungsbefehl für Zeilenabgleich,</para
+></listitem>
+<listitem
+><para
+>Groß-/Kleinschreibung ignorieren (Umwandlung in Großbuchstaben),</para
+></listitem>
+<listitem
+><para
+>Erkennung von C/C++ Kommentaren,</para
+></listitem>
+<listitem
+><para
+>Zahlen ignorieren,</para
+></listitem>
+<listitem
+><para
+>"weiße" Zeichen ignorieren</para
+></listitem>
+</itemizedlist>
+<para
+>Die Daten nach dem normalen Preprozessor werden für die Anzeige und zum Zusammenführen beibehalten. Die weiteren Operationen verändern nur die Daten, die der Zeilenabgleich-Algorythmus "sieht". </para
+><para
+>Beachten Sie: In seltenen Fällen wenn Sie einen normalen Preprozessor verwenden, sieht der Zeilenabgleich-Preprozessor die Ausgabe des normalen Preprozessors als Eingabe. </para>
+</sect2>
+
+<sect2
+><title
+>Warnung</title>
+<para
+>Die Preprozessor-Kommandos sind sehr nützlich, aber wie bei jeder Funktion, die Text verändert oder Unterschiede versteckt, können Sie versehentlich bestimmte Unterschiede nicht bemerken und im schlimmsten Fall wichtige Daten zerstören. </para
+><para
+>Beim Zusammenführen werden Sie daher von KDiff3 gewarnt, falls ein Preprozessor-Kommando benutzt wurd. Sie werden gefragt, ob dieser deaktiviert werden soll oder nicht. Sie werden allerdings nicht gewarnt, wenn ein Vorverarbeitungsbefehl für den Zeilenabgleich benutzt wird. Das Zusammenführen ist nicht abgeschlossen bevor nicht alle Konflikte aufgelöst wurden. Falls Sie "Weiße" Zeichen anzeigen deaktiviert haben, dann sind die vom Zeilenabgleich-Preprozessor entfernten Unterschiede ebenfalls unsichtbar. Wenn der Knopf "Speichern" während dem Zusammenführen deaktiviert bleibt (durch nicht aufgelöste Konflikte), dann aktivieren Sie "weiße" Zeichen anzeigen. Falls diese weniger wichtigen Unterschiede nicht zusammengeführt werden sollen, können Sie auch "Wähle [A|B|C] für alle ungelöste Konflikte" im Menü Zusammenführen-Menü auswählen. </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Mit &kdiff3; Ordner Vergleichen und Zusammenführen</title>
+<sect1 id="dirmergeintro"
+><title
+>Einführung</title>
+<para
+>Oftmals müssen Programmierer in einem Ordner viele Dateien bearbeiten. Aus diesem Grund können Sie mit &kdiff3; komplette Ordner rekursiv vergleichen und zusammenführen. </para
+><para
+>Auch wenn das Vergleichen und Zusammenführen von ganzen Ordnern recht naheliegend und einleuchtend erscheint, gibt es einige Details, die Sie wissen sollten. Der wichtigste Punkt ist natürlich, dass sich jeder Durchlauf dieser Funktion gleich auf viele Dateien auswirkt. Wenn Sie keine Sicherungskopie der Originaldaten haben, könnte es schwer oder gar unmöglich werden, den Originalstand wiederherzustellen. Bevor Sie das Zusammenführen starten, sollten Sie also sicherstellen, dass Ihre Daten gesichert sind und das Sie alles rückgängig machen können. Ob Sie ein Archiv erstellen oder ein System zur Versionskontrolle benutzen, ist Ihre Entscheidung; selbst erfahrene Programmierer und Integratoren benötigen hin und wieder die alten Quelltexte. Bitte beachten Sie auch, dass selbst ich (der Autor von &kdiff3;) keine Garantie geben kann, dass das Programm fehlerlos ist. Entsprechend der GNU-GPL gibt es für dieses Programm KEINE GARANTIE. Also denken Sie daran: </para>
+<blockquote
+><para>
+   <emphasis
+>Irren ist menschlich, aber um etwas wirklich durcheinander zu bringen braucht man schon einen Computer ;-)</emphasis>
+</para
+></blockquote>
+<para
+>All diese Dinge kann &kdiff3; für Sie erledigen: &kdiff3;... </para>
+<itemizedlist>
+     <listitem
+><para
+>... liest und vergleicht rekursiv zwei oder drei Ordner,</para
+></listitem>
+     <listitem
+><para
+>... behandelt symbolische Links besonders vorsichtig,</para
+></listitem>
+     <listitem
+><para
+>... lässt Sie Ihre Dateien per Mausklick durchsuchen,</para
+></listitem>
+     <listitem
+><para
+>... macht für jedes Objekt einen Vorschlag zum Zusammenführen; Sie können den Vorschlag vor dem Start anpassen,</para
+></listitem>
+     <listitem
+><para
+>... kann das Zusammenführen simulieren und zeigt die simulierten Änderungen an, ohne sie wirklich durchzuführen,</para
+></listitem>
+     <listitem
+><para
+>... führt letztendlich die Zusammenführung durch und lässt Sie (wenn nötig) eingreifen,</para
+></listitem>
+     <listitem
+><para
+>... führt ausgewählte Aktionen entweder mit allen (F7-Taste), oder nur mit den ausgewählten Objekten (F6-Taste) aus,</para
+></listitem>
+     <listitem
+><para
+>... setzt das Zusammenführen nach einem manuellen Eingriff fort (F7-Taste),</para
+></listitem>
+     <listitem
+><para
+>... erzeugt optional Sicherungskopien mit der Erweiterung".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Ordnervergleich oder -zusammenführung starten</title>
+<para
+>Dies ist dem Vergleichen und Zusammenführen von einzelnen Dateien sehr ähnlich. Sie müssen nur Ordner auf der Kommandozeile oder im "Datei öffnen"-Dialog angeben. </para>
+<sect2
+><title
+>Vergleichen/Zusammenführen von zwei Ordnern: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2</replaceable
+> -o <replaceable
+>Zielordner</replaceable
+>
+</screen>
+<para
+>Wenn kein Zielordner angegeben wurde, benutzt &kdiff3; <replaceable
+>Ordner2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Vergleichen/Zusammenführen von drei Ordnern: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2 Ordner3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>Ordner1 Ordner2 Ordner3</replaceable
+> -o <replaceable
+>Zielordner</replaceable
+>
+</screen>
+<para
+>Wenn drei Ordner zusammengeführt werden, dann wird <replaceable
+>Ordner1</replaceable
+> als Basis benutzt. Wenn kein Zielordner angegeben wurde, verwendet &kdiff3; <replaceable
+>Ordner3</replaceable
+> als Zielordner. </para>
+
+<para
+>Beachten Sie, dass nur der Vergleich von Ordnern automatisch startet, nicht das Zusammenführen. Um das Zusammenführen zu starten, müssen Sie den entsprechenden Menüeintrag auswählen oder die F7-Taste drücken. (Weitere Details folgen.) </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Sichtbare Informationen</title>
+<para
+>Während dem Einlesen der Ordner informiert Sie ein kleines Nachrichtenfenster über den aktuellen Fortschritt. Wenn Sie das Scannen der Ordner abbrechen, werden nur die Dateien aufgelistet, die bis dahin verglichen wurden. </para
+><para
+>Wenn das Scannen der Ordner abgeschlossen ist, zeigt &kdiff3; ein Listenfenster mit den Ergebnissen auf der linken Seite, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... und den Details zu dem jeweils ausgewählten Objekt auf der rechten Seite: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>Die Spalte "Name"</title>
+<para
+>Jede Datei und jeder Ordner der während dem Scan gefunden wurde, wird hier in einem Baum dargestellt. Sie können ein Objekt mit einem einfachen Mausklick auswählen. </para
+><para
+>Die Ordnerstruktur wird normalerweise zusammengeklappt dargestellt. Sie können einen Ordner aufklappen, indem Sie auf das "+"/"-" klicken, oder auf das Objekt doppelklicken oder indem Sie die Pfeiltasten für links/rechts benutzen. Das "Verzeichnis"-Menü enthält zwei Funktionen "Alle Unterverzeichnisse einklappen" und "Alle Unterverzeichnisse aufklappen" mit denen Sie alle Ordner auf- bzw. zuklappen können. </para
+><para
+>Wenn Sie auf eine Datei doppelklicken, wird der Dateivergleich gestartet und es erscheint ein Vergleichsfenster. </para>
+<para
+>Das Symbol in der Spalte "Name" spiegelt den Dateityp im ersten Ordner ("A") wieder. Diese Typen sind möglich: </para>
+<itemizedlist>
+     <listitem
+><para
+>Normale Datei</para
+></listitem>
+     <listitem
+><para
+>Normaler Ordner (Ordner-Symbol)</para
+></listitem>
+     <listitem
+><para
+>Link auf eine Datei (Datei-Symbol mit einem Link-Pfeil)</para
+></listitem>
+     <listitem
+><para
+>Link auf einen Ordner (Ordner-Symbol mit einem Link-Pfeil)</para
+></listitem>
+</itemizedlist>
+<para
+>Wenn der Dateityp in den anderen Ordnern unterschiedlich ist, dann ist dies in den Spalten A/B/C und in dem Detailfenster zu dem ausgewählten Objekt sichtbar. In einem solchen Fall kann die Zusammenführ-Aktion nicht automatisch gewählt werden. Wenn das Zusammenführen gestartet wird, werden Sie über Probleme dieser Art nochmals informiert. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Die Spalten A/B/C und das Farbschema</title>
+<para
+>Wie in dem obigen Bild zu sehen ist, werden in den Spalten A/B/C die Farben Rot, Grün, Gelb und Schwarz verwendet. </para>
+<itemizedlist>
+     <listitem
+><para
+>Schwarz: Dieser Eintrag existiert nicht in diesem Ordner.</para
+></listitem>
+     <listitem
+><para
+>Grün: Neuester Eintrag.</para
+></listitem>
+     <listitem
+><para
+>Gelb: Älter als grün, neuer als rot.</para
+></listitem>
+     <listitem
+><para
+>Rot: Ältester Eintrag.</para
+></listitem>
+</itemizedlist>
+<para
+>Bei identischen Einträgen ist die Farbe allerdings auch identisch, auch wenn das Alter der Einträge unterschiedlich ist. </para
+><para
+>Ordner werden als identisch betrachtet, wenn ihr gesamter Inhalt identisch ist. Dann haben auch Ordner die gleiche Farbe. Bei Ordnern ist das Alter unerheblich für seine Farbe. </para
+><para
+>Die Idee zu diesem Farbschema basiert auf <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. Die Farben spiegeln die Farben eines Blattes wieder, welches erst grün ist, dann gelb wird und später, wenn es alt ist, rot wird. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>Die Aktions-Spalte</title>
+<para
+>Nach dem Vergleichen der Ordner schlägt &kdiff3; eine Zusammenführ-Aktion vor. Dieser Vorschlag wird in der Aktions-Spalte angezeigt. Sie können den Vorschlag ändern, indem Sie auf den entsprechenden Eintrag klicken. Daraufhin erscheint ein kleines Menü, in dem Sie eine Aktion auswählen können. (Die häufigsten Aktionen können Sie auch mit der Tastatur auswählen. Strg+1/2/3/4/Entf wählt entsprechend A/B/C/Zusammenführen/Löschen aus.) Die Aktion wird dann während dem Zusammenführen ausgeführt. Welche Aktionen möglich sind, hängt von dem Eintrag und dem aktuellen Zusammenführ-Modus ab. Mögliche Zusammenführ-Modi sind </para>
+<itemizedlist>
+     <listitem
+><para
+>Drei-Ordner-Zusammenführen ("A" wird als die ältere Basis für die beiden anderen herangezogen).</para
+></listitem>
+     <listitem
+><para
+>Zwei-Ordner-Zusammenführen.</para
+></listitem>
+     <listitem
+><para
+>Zwei-Ordner-Synchronisieren-Modus (aktivieren Sie diesen Modus mit der Option "Verzeichnisse Synchronisieren").</para
+></listitem>
+</itemizedlist>
+<para
+>Beim Zusammenführen von drei Ordnern sind diese Aktions-Vorschläge möglich: Wenn für ein Objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... alle drei Ordner identisch sind: Kopieren von C</para
+></listitem>
+     <listitem
+><para
+>... A und C identisch sind, aber nicht B: Kopieren von B (oder falls B nicht existiert, löschen des Ziels, falls es existiert)</para
+></listitem>
+     <listitem
+><para
+>... A und B identisch sind, aber nicht C: Kopieren von C (oder falls C nicht existiert, löschen des Ziels, falls es existiert)</para
+></listitem>
+     <listitem
+><para
+>... B und C identisch sind, aber nicht A: Kopieren von A (oder falls A nicht existiert, löschen des Ziels, falls es existiert)</para
+></listitem>
+     <listitem
+><para
+>... nur A existiert: Löschen des Ziels (falls es existiert)</para
+></listitem>
+     <listitem
+><para
+>... nur B existiert: Kopieren von B</para
+></listitem>
+     <listitem
+><para
+>... nur C existiert: Kopieren von C</para
+></listitem>
+     <listitem
+><para
+>... A, B und C nicht identisch sind: Zusammenführen</para
+></listitem>
+     <listitem
+><para
+>... A, B und C nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): "Fehler: Widersprüchliche Dateitypen". Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden.</para
+></listitem>
+</itemizedlist>
+<para
+>Beim Zusammenführen von zwei Ordnern sind diese Aktions-Vorschläge möglich: Wenn für ein Objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... beide Ordner gleich sind: Kopieren von B</para
+></listitem>
+     <listitem
+><para
+>... A existiert, aber nicht B: Kopieren von A</para
+></listitem>
+     <listitem
+><para
+>... B existiert, aber nicht A: Kopieren von B</para
+></listitem>
+     <listitem
+><para
+>... A und B existieren aber nicht identisch sind: Zusammenführen</para
+></listitem>
+     <listitem
+><para
+>... A und B nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): "Fehler: Widersprüchliche Dateitypen". Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden.</para
+></listitem>
+</itemizedlist>
+<para
+>Der Modus zum Synchronisieren ist aktiv, wenn nur zwei Ordner und kein expliziter Zielordner angegeben wurden und wenn die Option "Verzeichnisse synchronisieren" aktiv ist. Dann wählt &kdiff3; die nötige Aktion aus, damit nachher beide Ordner identisch sind. Wenn für einen Eintrag... </para>
+<itemizedlist>
+     <listitem
+><para
+>... beide Ordner identisch sind: Es wird nichts unternommen.</para
+></listitem>
+     <listitem
+><para
+>... A existiert, aber nicht B: Kopieren von A nach B</para
+></listitem>
+     <listitem
+><para
+>... B existiert, aber nicht A: Kopieren von B nach A</para
+></listitem>
+     <listitem
+><para
+>... A und B existieren, aber nicht identisch sind: Zusammenführen und das Ergebnis in beiden Ordnern speichern. (Der Anwender sieht als sichtbaren Dateinamen für die Ausgabedatei nur B; direkt nach dem Zusammenführen kopiert &kdiff3; B nach A.)</para
+></listitem>
+     <listitem
+><para
+>... A und B nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): "Fehler: Widersprüchliche Dateitypen". Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden.</para
+></listitem>
+</itemizedlist>
+<para
+>Wenn zwei Ordner zusammengeführt werden und die Option "Neuere Datei statt Zusammenführung auswählen (unsicher)" aktiviert ist, dann untersucht &kdiff3; das Datum der Dateien und schlägt die neuere Datei zum Kopieren vor. Wenn die Dateien unterschiedlich sind, aber das gleiche Datum aufweisen, dann erscheint eine Fehlermeldung "Fehler: Dateien sind unterschiedlich, aber das Datum ist identisch.". Solange solche Fehler nicht beseitigt sind, kann das Zusammenführen der Ordner nicht gestartet werden. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>Die Status-Spalte</title>
+<para
+>Während dem Zusammenführen wird eine Datei nach der anderen abgearbeitet. Sie Status-Spalte zeigt "Fertig" an, wenn das Zusammenführen erfolgreich war, und entsprechend andere Meldungen, wenn etwas unerwartetes auftrat. Wenn das Zusammenführen abgeschlossen ist, sollten Sie eine letzte Überprüfung vornehmen und nachsehen, ob der Status überall in Ordnung ist. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Die Statistik-Spalte</title>
+<para
+>Wenn im Einrichtungsdialog die Dateivergleichsmethode "Vollständige Analyse" gewählt ist, wird KDiff3 weitere Spalten anzeigen. Diese enthalten die Anzahl ungelöster, gelöster, nicht "weißer" und "weißer" Konflikte. (Die Spalte für gelöste Konflikte wird nur angezeigt, wenn drei Ordner verglichen oder zusammengeführt werden.) </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Eine Zusammenführung durchführen</title>
+<para
+>Sie können entweder den gerade ausgewählten Eintrag (Datei oder Odner) zusammenführen, oder alle Einträge auf einmal. Wenn Sie alle Zusammenführ-Aktionen ausgewählt haben (auch in allen Unterordnern), können Sie das Zusammenführen starten. </para
+><para
+>Beachten Sie bitte: Wenn Sie keinen Zielordner angegeben haben, dann wird im Drei-Ordner-Zusammenführen-Modus "C" als Ziel benutzt, beim Zwei-Ordner-Zusammenführen wird "B" als Ziel gewählt und beim Synchronisieren wird "A" und/oder "B" als Ziel verwendet. </para
+><para
+>Wenn Sie einen Zielordner ausgewählt haben, prüfen Sie bitte nachher, ob alle Einträge die im Zielordner sein sollten, auch in der Ordnerstruktur angezeigt werden. Es gibt einige Optionen durch die bestimmte Einträge übersprungen werden könnten. Überprüfen Sie diese Optionen um unliebsame Überraschungen zu vermeiden: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Rekursive Verzeichnisse": Wenn diese Option deaktiviert ist, werden keine Dateien in Unterordnern bearbeitet.</para
+></listitem>
+     <listitem
+><para
+>"Datei Muster"/"Datei Anti-Muster": Ein-/ und Ausschließen auf das Muster passender Einträge</para
+></listitem>
+     <listitem
+><para
+>"Finde versteckte Dateien und Verzeichnisse"</para
+></listitem>
+     <listitem
+><para
+>"Nur Unterschiede anzeigen": Dateien die in allen Ordnern identisch sind erscheinen nicht in der Ordnerstruktur, und folglich auch nicht im Zielordner.</para
+></listitem>
+</itemizedlist>
+<para
+>(In der aktuellen Programmversion müssen Sie nach Änderungen an diesen Optionen den Ordner mit der Funktion "Aktualisieren" neu einlesen.) </para
+><para
+>Wenn Sie soweit zufrieden sind ist der Rest einfach. </para
+><para
+>Um alle Einträge zusammenzuführen: Wählen Sie "Verzeichniszusammenführung starten/fortsetzen" im "Verzeichnis"-Menü oder drücken Sie F7 (das Tastenkürzel). Um nur den aktuellen Eintrag zusammenzuführen: Wählen Sie "Aktion des aktuellen Elements ausführen" oder drücken Sie F6. </para
+><para
+>Wenn durch widersprüchliche Dateitypen immer noch ungültige Zusammenführen-Aktionen existieren, erscheint eine Meldung die auf die fehlerhaften Elemente hinweist. Sie können für sie dann eine gültige Aktion auswählen. </para
+><para
+>Wenn Sie alle Einträge zusammenführen, erscheint ein Dialogfenster mit den Optionen "Durchführen", "Simulieren" und "Abbrechen". </para>
+<itemizedlist>
+     <listitem
+><para
+>Wählen Sie "Simulieren" wenn Sie erst sehen möchten was passieren würde, ohne das wirklich Änderungen vorgenommen werden. Sie erhalten dann eine ausführliche Liste aller Aktionen.</para
+></listitem>
+     <listitem
+><para
+>Ansonsten klicken Sie auf "Durchführen" um das Zusammenführen wirklich zu starten.</para
+></listitem>
+</itemizedlist>
+<para
+>&kdiff3; führt dann bestimmte Aktionen mit allen Einträgen durch. Wenn ein manueller Eingriff nötig ist (zusammenführen einer einzelnen Datei), dann öffnet sich ein Zusammenführen-Fenster (<link linkend="dirmergebigscreenshot"
+>beachten Sie das Bildschirmphoto</link
+>). </para
+><para
+>Wenn Sie mit einer Datei fertig sind, wählen Sie erneut "Verzeichniszusammenführung starten/fortsetzen" oder drücken Sie F7. Wenn Sie noch nicht gespeichert haben, erscheint ein entsprechender Dialog. Dann führt &kdiff3; seine Arbeit mit dem nächsten Eintrag fort. </para
+><para
+>Wenn &kdiff3; auf einen Fehler stösst, erscheint eine Nachricht und ausführliche Status-Informationen. Am Schluss der Liste sehen Sie einige Fehlermeldungen, die Ihnen helfen sollen, die Ursache des Problems auszumachen. Wenn Sie das Zusammenführen fortfahren (F7-Taste), lässt &kdiff3; Ihnen die Wahl es erneut zu versuchen, oder den problematischen Eintrag zu überspringen. So haben Sie die Möglichkeit, eine andere Aktion für den Eintrag auszuwählen oder das Problem auf andere Weise zu lösen, bevor Sie mit dem Zusammenführen fortfahren. </para
+><para
+>&kdiff3; informiert Sie mit einem Info-Fenster wenn das Zusammenführen abgeschlossen ist. </para
+><para
+>Falls einige Einträge individuell zusammengeführt wurden, merkt sich &kdiff3; diese Einträge (in der aktuellen Sitzung) und führt sie beim späteren zusammenführen aller Einträge nicht nochmals zusammen. Selbst wenn hier das Zusammenführen übersprungen wurde oder nicht gespeichert wurde, werden diese Einträge als erledigt betrachtet. Nur wenn Sie die Zusammenführen-Aktion ändern, werden diese Einträge erneut zusammengeführt. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Optionen zum Vergleichen und Zusammenführen von Ordnern</title>
+<para
+>Das Einstellungen-Menü von &kdiff3; (Menü "Einstellungen"->"KDiff3 einrichten...") hat nun einen Abschnitt namens "Verzeichnis-Zusammenführung" mit diesen Optionen: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Rekursive Verzeichnisse:</emphasis
+></term
+><listitem
+><para
+>Stellen Sie ein, ob Ordner rekursiv durchsucht werden sollen.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Datei Muster:</emphasis
+></term
+><listitem
+><para
+>Nur Dateien, die auf das angegebene Muster passen, werden im Elementbaum angezeigt. Es können mehrere Muster eingegeben werden. Trennen Sie die Muster mit einem Semikolon ";". Gültige Platzhalter: '*' und '?'. (z. B. "*.cpp;*.h"). Die Voreinstellung ist "*". Ordner müssen nicht diesem Muster entsprechen.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Datei Anti-Muster:</emphasis
+></term
+><listitem
+><para
+>Dateien und Ordner die diesem Muster entsprechen, werden nicht im Elementbaum angezeigt. Es kann mehr als ein Muster eingegeben werden, benutzen Sie das Semikolon ";" als Trennzeichen . Gültige Platzhalter: '*' und '?'. Voreinstellung ist "*.orig;*.o".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>.cvsignore benutzen:</emphasis
+></term
+><listitem
+><para
+>Ignoriert Dateien, die auch von CVS ignoriert werden würden. Viele autmatisch erzeugte Dateien werden von CVS ignoriert. Der große Vorteil ist, dass dies Ordnerspezifisch mit einer ".cvsignore"-Datei eingestellt werden kann. (Schauen Sie unter <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Finde versteckte Dateien und Verzeichnisse:</emphasis
+></term
+><listitem
+><para
+>In einigen Dateisystemen haben Dateien ein "Versteckt"-Attribut. In anderen Dateisystemen markiert ein vorangestellter Punkt "." eine Datei als versteckt. Diese Option lässt Sie entscheiden, ob diese Dateien im Elementbaum angezeigt werden sollen oder nicht. Diese Option ist in der Voreinstellung eingeschaltet.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Folge Datei-Verknüpfungen:</emphasis
+></term
+><listitem
+><para
+>Bei Links auf Dateien: Wenn die Option abgeschaltet ist, werden symbolische Verknüpfungen verglichen. Wenn die Option eingeschaltet ist, werden die Dateien verglichen, auf die die Links zeigen. Dies ist in der Voreinstellung deaktiviert.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Folge Verzeichnis-Verknüpfungen:</emphasis
+></term
+><listitem
+><para
+>Bei Links auf Ordner: Wenn die Option abgeschaltet ist, werden die symbolischen Links verglichen. Wenn die Option eingeschaltet ist, werden die Links wie normale Ordner behandelt und rekursiv durchsucht. (Beachten Sie, dass &kdiff3; nicht auf mögliche Rekursionen prüft. Ein Link auf einen Ordner der einen Link auf sich selbst enthält würde zu einer Endlosschleife führen und &kdiff3; stürzt ab.) Diese Option ist in der Voreinstellung abgeschaltet.</para
+></listitem
+></varlistentry
+>   
+   <varlistentry
+><term
+><emphasis
+>Nur Unterschiede anzeigen:</emphasis
+></term
+><listitem
+><para
+>Es werden nur Einträge angezeigt, die Unterschiede aufweisen. Das führt auch dazu, dass identische Dateien beim Zusammenführen nicht in den Zielordner kopiert werden. Falls der Zielordner diese Dateien nicht bereits enthält, fehlen sie nach dem Zusammenführen. (Das Verhalten wird in einer späteren Programmversion wahrscheinlich abgeändert.) Diese Option ist in der Voreinstellung abgeschaltet.</para
+></listitem
+></varlistentry>
+
+   <varlistentry
+><term
+><emphasis
+>Dateivergleichsmethode:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Binärvergleich:</emphasis
+></term
+><listitem
+><para
+>Dies ist die voreingestellte Vergleichsmethode. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Vollständige Analyse:</emphasis
+></term
+><listitem
+><para
+>Führt eine vollständige Analyse jeder Datei durch und zeigt die Statistik-Spalten an. (Die Anzahl gelöster, ungelöster, nicht-"weißer" und "weißer" Konflikte.) Die vollständige Analyse ist langsamer als eine einfache binäre Analyse, und wesentlich langsamer, wenn sie auf Dateien angewendet wird, die keinen Text enthalten. (Geben Sie ein entsprechendes Anti-Muster ein.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Vertraue dem Änderungsdatum (unsicher):</emphasis
+></term
+><listitem
+><para
+>Wenn Sie große Ordner über ein langsames Netzwerk vergleichen, geht es möglicherweise schneller, nur das Änderungsdatum und die Dateigröße zu vergleichen. Dieser Geschwindigkeitsvorteil kostet Sie allerdings ein gewisses Maß an Sicherheit. Bitte mit Vorsicht benutzen. Diese Option ist in der Voreinstellung abgschaltet.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Vertraue der Größe (unsicher):</emphasis
+></term
+><listitem
+><para
+>Ähnlich wie "Vertraue dem Änderungsdatum". Es findet kein echter Vergleich statt. Die Dateien werden als identisch betrachtet, wenn sie gleich groß sind. Das kann z. B. nützlich sein, wenn beim Kopieren das Änderungsdatum verlorengegangen ist. Bitte mit Vorsicht benutzen. Diese Option ist in der Voreinstellung abgschaltet.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Verzeichnisse synchronisieren:</emphasis
+></term
+><listitem
+><para
+>Aktiviert den "Synchronisieren"-Modus wenn zwei Ordner verglichen werden und kein Zielordner angegeben wurde. In diesem Modus werden die Vorschläge zum Zusammenführen so ausgewählt, dass nachher beide Ordner identisch sind. Auch die Ergebnisse vom Zusammenführen von Dateien werden in beiden Ordnern gespeichert. Diese Option ist in der Voreinstellung abgeschaltet.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Neuere Datei statt Zusammenführung auswählen (unsicher):</emphasis
+></term
+><listitem
+><para
+>Falls es Unterschiede gibt, wird statt dem Zusammenführen das Kopieren der neueren Datei als Aktion vorgeschlagen. (Dies wird als unsicher betrachtet, denn es wird das Wissen vorausgesetzt, dass die andere Datei nicht auch verändert wurde. Sie sollten dies in jedem Fall prüfen.) Diese Option ist in der Voreinstellung abgeschaltet.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sicherungskopie erstellen (.orig):</emphasis
+></term
+><listitem
+><para
+>Wenn eine Datei oder ein Ordner durch eine andere ersetzt oder gelöscht wird, dann wird die Originalversion umbenannt und erhält die Erweiterung ".orig". Wenn eine alte Backup-Datei mit der ".orig"-Erweiterung bereits existiert, so wird diese ohne weiteres Backup gelöscht. Das betrifft auch das normale Zusammenführen einzelner Dateien, nicht nur das Zusammenführen ganzer Ordner. Diese Option ist in der Voreinstellung eingeschaltet.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Weitere Funktionen</title>
+<sect2
+><title
+>Verzeichnis &amp; Textfenster teilen sich Hauptfenster</title>
+<para
+>Normalerweise bleibt die Ordner-Zusammenführen-Ansicht währen dem Zusammenführen einzelner Dateien sichtbar; Sie können den Fensterteiler mit der Maus verschieben. Wenn Sie das nicht wollen, können Sie die Option "Verzeichnis &amp; Textfenster teilen sich Hauptfenster" im "Fenster"-Menü abschalten und mittels "Wechsel zwischen Verzeichnis &amp; Textfenster" zwischen den beiden Ansichten umschalten. </para>
+</sect2>
+<sect2
+><title
+>Vergleichen und Zusammenführen einer einzelnen Datei</title>
+<para
+>Wahrscheinlich bevorzugen Sie, eine Datei einfach mittels Doppelklick zu vergleichen. Dennoch gibt es im "Verzeichnis"-Menü auch einen entsprechenden Menüeintrag. Sie können eine einzelne Datei auch direkt zusammenführen, ohne erst das Ordnerzusammenführen starten zu müssen. Dazu benutzen Sie die Funktion "Aktuelle Datei Zusammenführen" aus dem "Zusammenführen"-Menü. Sobald Sie das Ergebnis speichern, wird der Status auf "Erledigt" gesetzt und die Datei wird nicht nochmals zusammengeführt wenn Sie das Ordnerzusammenführen starten. </para
+><para
+>Dieser Status geht allerdings verloren, wenn Sie das Verzeichnis erneut einlesen: "Verzeichnis"-Menü: "Neu einlesen" </para>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Verschiedene Themen</title>
+<sect1 id="networktransparency">
+<title
+>Netzwerktransparenz via KIO</title>
+<sect2
+><title
+>KIO-Slaves</title>
+<para
+>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. </para
+><para
+>Beispiel: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.weitweg.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hacker/archiv.tar.gz/ordner ./ordner
+</screen>
+</para>
+<para
+>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. </para
+><para
+>Weitere interessante KIO-Slaves sind: </para>
+<itemizedlist>
+<listitem
+><para
+>Dateien aus dem WWW (http:),</para
+></listitem>
+<listitem
+><para
+>Dateien von FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Verschlüsselte Dateiübertragung (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Windows-Ressourcen (smb:),</para
+></listitem>
+<listitem
+><para
+>Lokale Dateien (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>Desweiteren wäre möglich (wenn auch weniger nützlich): </para>
+<itemizedlist>
+<listitem
+><para
+>Man-Pages (man:),</para
+></listitem>
+<listitem
+><para
+>Info-Seiten (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Wie man eine URL schreibt</title>
+<para
+>Eine URL hat eine andere Syntax als lokale Dateien und Ordner. Ein paar Dinge sollten Sie beachten: </para>
+<itemizedlist>
+<listitem
+><para
+>Ein Pfad kann relativ sein und "." oder ".." enthalten. Das ist mit URLs nicht möglich, diese sind immer absolut. </para
+></listitem
+><listitem
+><para
+>Sonderzeichen müssen maskiert werden. ("#"->"%23", Leerzeichen->"%20", u.s.w.). Zum Beispiel hat eine Datei mit dem Namen "/#foo#" die URL "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>Wenn eine URL nicht wie erwartet funktioniert, versuchen Sie erstmal, diese im Konqueror zu öffnen. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Fähigkeiten von KIO-Slaves</title>
+<para
+>Netzwerktransparenz hat auch einen Nachteil: Nicht alle Ressourcen haben die gleichen Fähigkeiten. </para
+><para
+>Manchmal aufgrund des Dateisystems auf dem Server, manchmal durch das verwendete Protokoll. Es folgt eine kurze Liste der Einschränkungen: </para>
+<itemizedlist>
+<listitem
+><para
+>Teilweise werden keine Links unterstützt. </para
+></listitem
+><listitem
+><para
+>Oder es kann nicht unterschieden werden, ob ein Link auf eine Datei oder einen Ordner zeigt. Dann wird immer eine Datei als Link-Ziel angenommen. (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Die Dateigröße kann nicht immer ermittelt werden. </para
+></listitem
+><listitem
+><para
+>Eingeschränkte Unterstützung für Berechtigungen. </para
+></listitem
+><listitem
+><para
+>Es gibt keine Möglichkeit, Berechtigungen oder Veränderungsdatum zu bearbeiten. Daher weichen die Berechtigungen oder das Veränderungsdatum vom Original ab. (Beachten Sie hierzu die Option "Vertraue der Größe".) (Dies ist nur bei lokalen Dateien möglich.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>&kdiff3; als KPart benutzen</title>
+<para
+>&kdiff3; ist ein KPart. Zur Zeit ist die KParts::ReadOnlyPart-Schnittstelle eingebaut. </para
+><para
+>Der hauptsächliche Verwendungszweck ist zur Zeit als Unterschiede-Betrachter in KDevelop. KDevelop startet zuerst immer den eingebauten Unterschiede-Betrachter. Um KDiff3 zu starten, drücken Sie die rechte Maustaste über dem Unterschiede-Betrachter und wählen dann "In KDiff3Part anzeigen" aus dem Kontextmenü. </para
+><para
+>Normalerweise benötigt &kdiff3; zwei vollständige Eingabedateien. Wenn es allerdings als KPart angewendet wird, nimmt &kdiff3; an, dass die Eingabedatei eine Patch-Datei im unified-Format ist. Dann entnimmt &kdiff3; die Namen der Originaldateien aus der Patch-Datei. Mindestens eine der beiden Dateien muss existieren. Dann startet &kdiff3; das Programm <command
+>patch</command
+> um die fehlende Datei wiederherzustellen. </para
+><para
+>Im Konqueror können Sie auf eine Patch-Datei klicken und aus dem Kontextmenü "Vorschau in"-"KDiff3Part" auswählen. Beachten Sie bitte, dass das nicht funktioniert wenn keine der Originaldateien existiert. Ausserdem ist dies unzuverlässig, wenn sich die Originaldateien seit Erzeugung der Patch-Datei verändert haben. </para
+><para
+>Wenn &kdiff3; als Part ausgeführt wird, unterstützt es nur das Vergleichen von zwei Dateien, eine sehr kleine Werkzeugleiste und Menü. Das Zusammenführen oder das Vergleichen von Ordnern wird im KPart-Modus nicht unterstützt. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Fragen und Antworten</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Warum heisst das Programm "KDiff3"? </para
+></question
+><answer
+><para
+>Werkzeuge mit dem Namen "KDiff" und "KDiff2" (nun heist es "Kompare") gibt es bereits. Ausserdem weist der Name "KDiff3" bereits darauf hin, dass es Zusammenführen kann wie das Programm "diff3" aus der Diff-Tool-Sammlung. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Warum wurde KDiff3 unter der GPL lizenziert? </para
+></question
+><answer
+><para
+>Ich verwende GPL-Programme schon sehr lange und habe viel gelernt indem ich in die Quellen anderer Programme geschaut habe. Dies ist mein "Dankeschön" an alle Programmierer die diesen Weg gegangen sind oder ihn mal so gehen werden. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Einige Knöpfe und Funktionen fehlen. Was ist passiert? </para
+></question
+><answer
+><para
+>Sie haben das Programm aus den Quellen kompiliert und dem configure-Skript vermutlich nicht den richtigen Prefix zu KDE mitgeteilt. In der Voreinstellung installiert configure in /usr/local, aber dann kann KDE die Ressourcen für die Benutzerschnittstellen nicht finden (z. B. kdiff3ui.rc). In der README-Datei finden Sie nähere Informationen zu diesem Thema. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Häufig werden ähnliche, aber nicht identische Zeilen nebeneinander angezeigt, und manchmal nicht. Warum? </para
+></question
+><answer
+><para
+>Wenn nur die Anzahl an "weißen" Zeichen unterschiedlich ist, werden diese Zeilen erstmal als "identisch" behandelt; wenn jedoch auch nur ein "nicht-weißes" Zeichen unterschiedlich ist, wird die Zeile als "nicht identisch" behandelt. If similar lines appear next to each other, this actually is coincidence but this fortunately is often the case. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Warum müssen alle Konflikte gelöst sein, bevor das Ergebnis gespeichert werden kann? </para
+></question
+><answer
+><para
+>Der Editor merkt sich für jeden Unterschied in den Dateien wo er beginnt und wo er endet. Das ist nötig, um einen Konflikt einfach durch das Klicken in den Quelltext und Auswählen des Knopfes A/B/C lösen zu können. Diese wichtige Information geht allerdings verloren, wenn das Ergebnis einfach als Textdatei gespeichert wird und es ist zuviel Aufwand, extra ein eigenes Dateiformat zu entwerfen, das diese Informationen speichern könnte. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Warum hat der Editor im Ergebnisfenster einer Zusammenführung keine "Rückgängig"-Funktion? </para
+></question
+><answer
+><para
+>Der Aufwand dafür war bisher zu groß. Sie können eine bestimmte Version immer durch das Auswählen einer Quelle A/B/C wiederherstellen. Um grössere Mengen an Text zu bearbeiten sollte ein anderer Editor verwendet werden. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Nach dem entfernen von Text ist plötzlich "&lt;No src line&gt;" erschienen und der Text lässt sich nicht löschen. Was bedeutet das und wie kann das entfernt werden? </para
+></question
+><answer
+><para
+>Der Editor merkt sich für jede gleiche und unterschiedliche Sektion wo sie beginnt und wo sie aufhört. "&lt;No src line&gt;" bedeutet, dass in dieser Sektion nichts mehr existiert, nocht nicht mal mehr das Zeichen für den Zeilenvorschub. Soetwas kann beim automatischen Zusammenführen oder beim Editieren passieren und ist kein Problem, denn der Text erscheint nicht in der gespeicherten Datei. Wenn Sie den Originaltext wiederhaben möchten, klicken Sie in die Sektion und wählen die korrekte Quelle A/B/C aus. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Warum unterstützt KDiff3 keine Syntax-Hervorhebung? </para
+></question
+><answer
+><para
+>KDiff3 benutzt bereits viele Farben zum hervorheben von Unterschieden. Noch mehr Hervorhebung wäre verwirrend und verfehlt den Zweck. Benutzen Sie dafür bitte einen anderen Editor. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Wird Ihre Frage hier nicht beantwortet? </para
+></question
+><answer
+><para
+>Bitte senden Sie mir Ihre Frage zu. Ich bin dankbar für jeden Kommentar. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Dank und Lizenz</title>
+
+<para
+>&kdiff3; - Ein Programm zum vergleichen und zusammenführen von Dateien und Ordnern </para>
+<para
+>Programm-Copyright 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Viele gute Ideen und Fehlerberichte kamen von Kollegen und vielen Leuten aus dem "Wild Wild Web". Vielen Dank! </para>
+
+<para
+>Dokumentations-Copyright &copy; 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+<para
+>Deutsche Übersetzung: Thomas Reitelbach <email
+>tr@erdfunkstelle.de</email
+></para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installation</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Wie Sie &kdiff3; bekommen können</title>
+
+<para
+>Sie können die neueste Version von KDiff3 von der Homepage <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+> herunterladen. </para
+><para
+>Kdiff3 gibt es auch für andere Plattformen. Besuchen Sie für Details bitte die Homepage. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Voraussetzungen</title>
+
+<para
+>Um alle Funktionen von &kdiff3; nutzen zu können, benötigen Sie &kde; 3.1 oder neuer. </para
+><para
+>Informationen, wie Sie KDiff3 auf anderen Plattformen ohne KDE benutzen können finden Sie auf der <ulink url="http://kdiff3.sourceforge.net"
+>Homepage</ulink
+>. </para
+><para
+>Eine Liste der letzten Änderungen finden Sie unter <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> oder in der Datei "ChangeLog" im Quell-Paket. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Kompilieren und Installation</title>
+
+<para
+>Um &kdiff3; auf einem System mit &kde; zu kompilieren und installieren, benutzen Sie folgendes Kommando im Basisordner der &kdiff3;-Distribution:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-dir</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-dir</replaceable
+> gibt den Ordner in Ihrem System an, in dem KDE installiert ist. Wenn Sie unsicher sind, finden Sie weitere Details in der README-Datei. </para>
+<para
+>Da &kdiff3; <command
+>autoconf</command
+> und <command
+>automake</command
+> verwendet, sollten Sie keine Probleme beim Kompilieren haben. Sollten dennoch Schwierigkeiten auftreten, berichten Sie bitte auf den &kde;-Mailinglisten davon.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/de/iteminfo.png b/doc/de/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/de/iteminfo.png
diff --git a/doc/de/letter_by_letter.png b/doc/de/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/de/letter_by_letter.png
diff --git a/doc/de/merge_current.png b/doc/de/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/de/merge_current.png
diff --git a/doc/de/new.png b/doc/de/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/de/new.png
diff --git a/doc/de/open_dialog.png b/doc/de/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/de/open_dialog.png
diff --git a/doc/de/screenshot_diff.png b/doc/de/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/de/screenshot_diff.png
diff --git a/doc/de/screenshot_merge.png b/doc/de/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/de/screenshot_merge.png
diff --git a/doc/de/triple_diff.png b/doc/de/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/de/triple_diff.png
diff --git a/doc/de/white_space.png b/doc/de/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/de/white_space.png
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
new file mode 100644
index 0000000..cd97965
--- /dev/null
+++ b/doc/en/Makefile.am
@@ -0,0 +1,5 @@
+KDE_DOCS = kdiff3
+KDE_LANG = en
+man1_MANS=kdiff3.1
+
+
diff --git a/doc/en/common/appheader.html b/doc/en/common/appheader.html
new file mode 100644
index 0000000..8179348
--- /dev/null
+++ b/doc/en/common/appheader.html
@@ -0,0 +1,36 @@
+<!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">
diff --git a/doc/en/common/artistic-license.html b/doc/en/common/artistic-license.html
new file mode 100644
index 0000000..2069b4e
--- /dev/null
+++ b/doc/en/common/artistic-license.html
@@ -0,0 +1,165 @@
+<!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="kde-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>
diff --git a/doc/en/common/bottom-left.png b/doc/en/common/bottom-left.png
new file mode 100644
index 0000000..254e4f8
--- /dev/null
+++ b/doc/en/common/bottom-left.png
diff --git a/doc/en/common/bottom-middle.png b/doc/en/common/bottom-middle.png
new file mode 100644
index 0000000..eddbc9c
--- /dev/null
+++ b/doc/en/common/bottom-middle.png
diff --git a/doc/en/common/bottom-right.png b/doc/en/common/bottom-right.png
new file mode 100644
index 0000000..178bf3c
--- /dev/null
+++ b/doc/en/common/bottom-right.png
diff --git a/doc/en/common/fdl-license.html b/doc/en/common/fdl-license.html
new file mode 100644
index 0000000..cb1f8a0
--- /dev/null
+++ b/doc/en/common/fdl-license.html
@@ -0,0 +1,353 @@
+<!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="kde-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>
diff --git a/doc/en/common/fdl-notice.html b/doc/en/common/fdl-notice.html
new file mode 100644
index 0000000..44a1c6c
--- /dev/null
+++ b/doc/en/common/fdl-notice.html
@@ -0,0 +1,15 @@
+<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>
diff --git a/doc/en/common/footer.html b/doc/en/common/footer.html
new file mode 100644
index 0000000..b06dfb8
--- /dev/null
+++ b/doc/en/common/footer.html
@@ -0,0 +1,65 @@
+    </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>
+
diff --git a/doc/en/common/gpl-license.html b/doc/en/common/gpl-license.html
new file mode 100644
index 0000000..26ae3af
--- /dev/null
+++ b/doc/en/common/gpl-license.html
@@ -0,0 +1,381 @@
+<!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="kde-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>
diff --git a/doc/en/common/header.html b/doc/en/common/header.html
new file mode 100644
index 0000000..df06da8
--- /dev/null
+++ b/doc/en/common/header.html
@@ -0,0 +1,56 @@
+<?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>
+
+
diff --git a/doc/en/common/headerbg.png b/doc/en/common/headerbg.png
new file mode 100644
index 0000000..b72738a
--- /dev/null
+++ b/doc/en/common/headerbg.png
diff --git a/doc/en/common/kde-default.css b/doc/en/common/kde-default.css
new file mode 100644
index 0000000..35e9d4d
--- /dev/null
+++ b/doc/en/common/kde-default.css
@@ -0,0 +1,327 @@
+/*
+    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);
+}
+
diff --git a/doc/en/common/kde-localised.css.template b/doc/en/common/kde-localised.css.template
new file mode 100644
index 0000000..abcd1ec
--- /dev/null
+++ b/doc/en/common/kde-localised.css.template
@@ -0,0 +1,32 @@
+/*
+    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 kde-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**) { }
diff --git a/doc/en/common/kde_gear_64.png b/doc/en/common/kde_gear_64.png
new file mode 100644
index 0000000..ee74c3b
--- /dev/null
+++ b/doc/en/common/kde_gear_64.png
diff --git a/doc/en/common/kde_logo_bg.png b/doc/en/common/kde_logo_bg.png
new file mode 100644
index 0000000..5ab7542
--- /dev/null
+++ b/doc/en/common/kde_logo_bg.png
diff --git a/doc/en/common/mainfooter.html b/doc/en/common/mainfooter.html
new file mode 100644
index 0000000..a2d753e
--- /dev/null
+++ b/doc/en/common/mainfooter.html
@@ -0,0 +1,68 @@
+    </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>
+
diff --git a/doc/en/common/mainheader.html b/doc/en/common/mainheader.html
new file mode 100644
index 0000000..4ea02fe
--- /dev/null
+++ b/doc/en/common/mainheader.html
@@ -0,0 +1,70 @@
+<?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>
+
+
diff --git a/doc/en/common/top-left.png b/doc/en/common/top-left.png
new file mode 100644
index 0000000..95f055d
--- /dev/null
+++ b/doc/en/common/top-left.png
diff --git a/doc/en/common/top-middle.png b/doc/en/common/top-middle.png
new file mode 100644
index 0000000..fbebf6a
--- /dev/null
+++ b/doc/en/common/top-middle.png
diff --git a/doc/en/common/top-right-konqueror.png b/doc/en/common/top-right-konqueror.png
new file mode 100644
index 0000000..ca1d974
--- /dev/null
+++ b/doc/en/common/top-right-konqueror.png
diff --git a/doc/en/compilation.html b/doc/en/compilation.html
new file mode 100644
index 0000000..9974fea
--- /dev/null
+++ b/doc/en/compilation.html
@@ -0,0 +1,11 @@
+<html><head><title>Compilation and Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Compilation and Installation</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       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 class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="compilation"></a>Compilation and Installation</h2></div></div></div><p>In order to compile and install <span class="application">KDiff3</span> on a system with KDE, type the
+following in the base directory of the <span class="application">KDiff3</span> distribution:</p><pre class="screen"><code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">./configure --prefix=<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>kde-dir</code></em></span></strong></span></span></code></strong>
+<code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">make</strong></span></span></code></strong>
+<code class="prompt">%</code> <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">make</strong></span></span> install</code></strong>
+</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
+<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>
\ No newline at end of file
diff --git a/doc/en/credits.html b/doc/en/credits.html
new file mode 100644
index 0000000..ceb4d5b
--- /dev/null
+++ b/doc/en/credits.html
@@ -0,0 +1,11 @@
+<html><head><title>Chapter 6. Credits and License</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="faq.html" title="Chapter 5. Questions and Answers"><link rel="next" href="installation.html" title="Appendix A. Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Credits and License</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="faq.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="installation.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="credits"></a>Chapter 6. Credits and License</h2></div></div></div><p>
+<span class="application">KDiff3</span> - File and Directory Comparison and Merge Tool
+</p><p>
+Program copyright 2002-2007 Joachim Eibl <code class="email">(joachim.eibl at gmx.de)</code>
+</p><p>
+Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!
+</p><p>
+Documentation Copyright (c) 2002-2007 Joachim Eibl <code class="email">(joachim.eibl at gmx.de)</code>
+</p><p><a name="gnu-fdl"></a>This documentation is licensed under the terms of the <a href="common/fdl-license.html" target="_top">GNU Free Documentation
+License</a>.</p><p>This program is licensed under the terms of the <a href="common/gpl-license.html" target="_top">GNU General Public License</a>.</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="faq.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="installation.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">Questions and Answers </div><div class="navRight"> Installation</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/dirbrowser.png b/doc/en/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/en/dirbrowser.png
diff --git a/doc/en/dirmerge.html b/doc/en/dirmerge.html
new file mode 100644
index 0000000..f83a481
--- /dev/null
+++ b/doc/en/dirmerge.html
@@ -0,0 +1,25 @@
+<html><head><title>Chapter 3. Directory Comparison and Merge with KDiff3</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="preprocessors.html" title="Preprocessor Commands"><link rel="next" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="preprocessors.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="startingdirmerge.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="dirmerge"></a>Chapter 3. Directory Comparison and Merge with <span class="application">KDiff3</span></h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeintro"></a>Introduction into Directory Comparison and Merge</h2></div></div></div><p>
+   Often programmers must modify many files in a directory to achieve their
+   purpose. For this <span class="application">KDiff3</span> also lets you compare and merge complete directories
+   recursively!
+</p><p>
+   Even though comparing and merging directories seems to be quite obvious,
+   there are several details that you should know about. Most important is of
+   course the fact that now many files might be affected by each operation.
+   If you don't have backups of your original data, then it can be very hard
+   or even impossible to return to the original state. So before starting a merge,
+   make sure that your data is safe, and going back is possible. If you make
+   an archive or use some version control system is your decision, but even
+   experienced programmers and integrators need the old sources now and then.
+   And note that even though I (the author of <span class="application">KDiff3</span>) try to do my best, I can't
+   guarantee that there are no bugs. According to the GNU-GPL there is NO WARRANTY
+   whatsoever for this program. So be humble and always keep in mind:
+</p><div class="blockquote"><blockquote class="blockquote"><p>
+   <span class="emphasis"><em>To err is human, but to really mess things up you need a computer.</em></span>
+</p></blockquote></div><p>
+So this is what this program can do for you: <span class="application">KDiff3</span> ...
+</p><div class="itemizedlist"><ul type="disc"><li><p>... reads and compares two or three directories recursively,</p></li><li><p>... takes special care of symbolic links,</p></li><li><p>... lets you browse files on mouse double click,</p></li><li><p>... for each item proposes a merge operation, which you can change
+                         before starting the directory merge,</p></li><li><p>... lets you simulate the merge and lists the actions that would
+                         take  place, without actually doing them,</p></li><li><p>... lets you really do the merge, and lets you interact whenever
+                         manual interaction is needed,</p></li><li><p>... lets you run the selected operation for all items (key F7) or the selected item (key F6),</p></li><li><p>... lets you continue the merge after manual interaction with key F7,</p></li><li><p>... optionally creates backups, with the ".orig" extension,</p></li><li><p>...</p></li></ul></div></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="preprocessors.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="startingdirmerge.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">Preprocessor Commands </div><div class="navRight"> Starting Directory Comparison Or Merge</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/dirmergebig.png b/doc/en/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/en/dirmergebig.png
diff --git a/doc/en/dirmergeoptions.html b/doc/en/dirmergeoptions.html
new file mode 100644
index 0000000..9d126b3
--- /dev/null
+++ b/doc/en/dirmergeoptions.html
@@ -0,0 +1,58 @@
+<html><head><title>Options for Comparing and Merging Directories</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dothemerge.html" title="Doing A Directory Merge"><link rel="next" href="other.html" title="Other Functions in Directory Merge Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Options for Comparing and Merging Directories</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="dothemerge.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="other.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeoptions"></a>Options for Comparing and Merging Directories</h2></div></div></div><p>
+   The <span class="application">KDiff3</span>-preferences (menu "Settings"-&gt;"Configure <span class="application">KDiff3</span>") has
+   a section called "Directory Merge" with these options:
+</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Recursive Directories:</em></span></span></dt><dd><p> Select whether to search directories
+         recursively.</p></dd><dt><span class="term"><span class="emphasis"><em>File Pattern(s):</em></span></span></dt><dd><p> Only files that match any pattern here will
+         be put in the tree. More than one pattern may be specified here by using
+         the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "*.cpp;*.h").
+         Default is "*". This pattern is not used on directories.</p></dd><dt><span class="term"><span class="emphasis"><em>File Anti-Pattern(s):</em></span></span></dt><dd><p> Files that match this pattern
+         will be excluded from the tree. More than one pattern may be specified here
+         via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
+         is "*.orig;*.o;*.obj".</p></dd><dt><span class="term"><span class="emphasis"><em>Directory Anti-Pattern(s):</em></span></span></dt><dd><p> Directories that match this pattern
+         will be excluded from the tree. More than one pattern may be specified here
+         via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
+         is "CVS;deps;.svn".</p></dd><dt><span class="term"><span class="emphasis"><em>Use CVS-Ignore:</em></span></span></dt><dd><p>
+         Ignore files and directories that would also be ignored by CVS.
+         Many automatically generated files are ignored by CVS.
+         The big advantage is that this can be directory specific via a local ".cvsignore"-file.
+         (See <a href="info:/cvs/cvsignore" target="_top">info:/cvs/cvsignore</a>.)</p></dd><dt><span class="term"><span class="emphasis"><em>Find Hidden Files and Directories:</em></span></span></dt><dd><p> On some file systems files
+         have an "Hidden"-attribute. On other systems a filename starting with a dot
+         "." causes it to be hidden. This option allows you to decide whether to
+         include  these files in the tree or not. Default is on.</p></dd><dt><span class="term"><span class="emphasis"><em>Follow File Links:</em></span></span></dt><dd><p> For links to files: When disabled, then
+         the symbolic links are compared. When enabled, then the files behind the
+         links are compared. Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Follow Directory Links:</em></span></span></dt><dd><p> For links to directories: When disabled,
+         then the symbolic links will be compared. When enabled then the link will
+         be treated like a directory and it will be scanned recursively. (Note that
+         the program doesn't check if the link is "recursive". So for example a directory
+         that contains a link to the directory would cause an infinite loop, and after
+         some time when the stack overflows or all memory is used up, crash the program.)
+         Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Case Sensitive Filename Comparison:</em></span></span></dt><dd><p> 
+         Default is false on Windows, true for other operating systems.</p></dd><dt><span class="term"><span class="emphasis"><em>File Comparison Mode:</em></span></span></dt><dd><p>
+<div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Binary Comparison:</em></span></span></dt><dd><p>
+         This is the default file comparison mode.
+         </p></dd><dt><span class="term"><span class="emphasis"><em>Full Analysis:</em></span></span></dt><dd><p>
+         Do a full analysis of each file and show the statistics information columns.
+         (Number of solved, unsolved, nonwhite and white conflicts.)
+         The full analysis is slower than a simple binary analysis, and much
+         slower when used on files that don't contain text. 
+         (Specify the appropriate file-antipatterns.)
+         </p></dd><dt><span class="term"><span class="emphasis"><em>Trust the modification date:</em></span></span></dt><dd><p> If you compare big directories
+         over a slow network, it might be faster to compare the modification dates
+         and file length alone. But this speed improvement comes with the price of
+         a little uncertainty. Use this option with care. Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Trust the size:</em></span></span></dt><dd><p>
+         Similar to trusting the modification date. No real comparison happens. Two
+         files are considered equal if their file-sizes are equal. This is useful
+         when the file-copy operation didn't preserve the modification date.
+         Use this option with care. Default is off.</p></dd></dl></div></p></dd><dt><span class="term"><span class="emphasis"><em>Synchronize Directories:</em></span></span></dt><dd><p> Activates "Sync-Mode" when two directories
+         are compared and no explicit destination directory was specified. In this
+         mode the proposed operations will be chosen so that both source directories
+         are equal afterwards. Also the merge result will be written to both directories.
+         Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Copy newer instead of merging:</em></span></span></dt><dd><p> Instead of merging the proposed
+         operation will copy the newer source if changes happened. (Considered unsafe,
+         because it implies that you know, that the other file hasn't been edited
+         too. Check to make sure in every case.) Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Backup files:</em></span></span></dt><dd><p> If a file or complete directory is replaced
+         by  another or is deleted then the original version will be renamed with an
+         ".orig"  extension. If an old backup file with ".orig" extension already exists
+         then  this will be deleted without backup. This also affects the normal merging
+         of single files, not only in directory-merge mode. Default is on.</p></dd></dl></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="dothemerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="other.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">Doing A Directory Merge </div><div class="navRight"> Other Functions in Directory Merge Window</div><div class="navCenter"><a accesskey="u" href="dirmerge.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>
\ No newline at end of file
diff --git a/doc/en/dirmergevisible.html b/doc/en/dirmergevisible.html
new file mode 100644
index 0000000..fd20589
--- /dev/null
+++ b/doc/en/dirmergevisible.html
@@ -0,0 +1,105 @@
+<html><head><title>Directory Merge Visible Information</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><link rel="next" href="dothemerge.html" title="Doing A Directory Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Directory Merge Visible Information</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="startingdirmerge.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="dothemerge.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergevisible"></a>Directory Merge Visible Information</h2></div></div></div><p>
+   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.
+</p><p>
+   When the directory scan is complete then <span class="application">KDiff3</span> will show a listbox with
+   the results left, ...
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="dirbrowser.png"><hr></div></div><p>
+   ... and details about the currently selected item on the right:
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="iteminfo.png"><hr></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="name"></a>The Name Column</h3></div></div></div><p>
+   Each file and directory that was found during the scan is shown here in
+   a tree. You can select an item by clicking it with the mouse once.
+</p><p>
+   The directories are collapsed by default. You can expand and collapse
+   them by clicking on the "+"/"-" or by double-clicking the item or
+   by using  the left/right-arrow-keys. The "Directory"-menu also contains two
+   actions "Fold all subdirs" and "Unfold all subdirs" with which you can
+   collapse or expand all directories at once.
+</p><p>
+   If you double-click a file item then the file comparison starts and the
+   file-diff-window will appear.
+</p><p>
+   The image in the name column reflects the file type in the first
+   directory  ("A"). It can be one of these:
+</p><div class="itemizedlist"><ul type="disc"><li><p>Normal file</p></li><li><p>Normal directory (directory-image)</p></li><li><p>Link to a file (file-image with a link arrow)</p></li><li><p>Link to a directory (directory-image with a link arrow)</p></li></ul></div><p>
+   If the file type is different in the other directories, then this is visible
+   in the columns A/B/C and in the window that shows the details about the selected
+   item. Note that for such a case no merge operation can be selected automatically.
+   When starting the merge, then the user will be informed of problems of that
+   kind.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="coloring"></a>The Columns A/B/C and the Coloring Scheme</h3></div></div></div><p>
+   As can be seen in the image above the colors red, green, yellow and black
+   are used in the columns A/B/C.
+</p><div class="itemizedlist"><ul type="disc"><li><p>Black: This item doesn't exist in this directory.</p></li><li><p>Green: Newest item.</p></li><li><p>Yellow: Older than green, newer than red.</p></li><li><p>Red: Oldest item.</p></li></ul></div><p>
+   But for items that were identical in the comparison their color also is
+   identical even if the age is not.
+</p><p>
+   Directories are considered equal if all items they contain are identical.
+   Then they also will have the same color. But the age of a directory is not
+   considered for its color.
+</p><p>
+   The idea for this coloring scheme I came upon in
+   <a href="http://samba.org/cgi-bin/cvsweb/dirdiff" target="_top">dirdiff</a>. The colors
+   resemble the colors of a leaf that is green when new, turns yellow later and red
+   when old.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="operation"></a>The Operation Column</h3></div></div></div><p>
+   After comparing the directories <span class="application">KDiff3</span> also evaluates a proposal for a
+   merge  operation. This is shown in the "Operation" column. You can modify
+   the operation  by clicking on the operation you want to change. A small menu
+   will popup and allows you to select an operation for that item. (You can also
+   select the most needed operations via keyboard.
+   Ctrl+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.)
+   This operation will be executed during the merge. It depends on the item and
+   on the merge-mode you are in, what operations are available. The merge-mode is one of
+</p><div class="itemizedlist"><ul type="disc"><li><p>Three directory-merge ("A" is treated as older base of both).</p></li><li><p>Two directory-merge.</p></li><li><p>Two directory-sync-mode (activate via option "Synchronize Directories").</p></li></ul></div><p>
+   In three directory merge the operation proposal will be: If for an item ...
+</p><div class="itemizedlist"><ul type="disc"><li><p>... all three directories are equal: Copy from C</p></li><li><p>... A and C are equal but B is not: Copy from B (or if B does not
+                         exist, delete the destination if exists)</p></li><li><p>... A and B are equal but C is not: Copy from C (or if C does not
+                         exist, delete the destination if exists)</p></li><li><p>... B and C are equal but A is not: Copy from C (or if C does not
+                         exist, delete the destination if exists)</p></li><li><p>... only A exists: Delete the destination (if exists)</p></li><li><p>... only B exists: Copy from B</p></li><li><p>... only C exists: Copy from C</p></li><li><p>... A, B and C are not equal: Merge</p></li><li><p>... A, B and C don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</p></li></ul></div><p>
+   In two directory merge the operation proposal will be: If for an item ...
+</p><div class="itemizedlist"><ul type="disc"><li><p>... both directories are equal: Copy from B</p></li><li><p>... A exists, but not B: Copy from A</p></li><li><p>... B exists, but not A: Copy from B</p></li><li><p>... A and B exist but are not equal: Merge</p></li><li><p>... A and B don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</p></li></ul></div><p>
+   Sync-mode is active if only two directories and no explicit destination
+   were specified and if the option "Synchronize directories" is active. <span class="application">KDiff3</span>
+   then selects a default operation so that both directories are the same afterwards.
+   If for an item ...
+</p><div class="itemizedlist"><ul type="disc"><li><p>... both directories are equal: Nothing will be done.</p></li><li><p>... A exists, but not B: Copy A to B</p></li><li><p>... B exists, but not A: Copy B to A</p></li><li><p>... A and B exist, but are not equal: Merge and store the result
+                         in  both directories. (For the user the visible save-filename is B,
+                         but then <span class="application">KDiff3</span> copies B also to A.)</p></li><li><p>... A and B don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</p></li></ul></div><p>
+   When two directories are merged and the option "Copy newer instead of merging" is selected,
+   then <span class="application">KDiff3</span> looks at the dates and proposes to choose the newer file. If the files are not
+   equal but have equal dates, then the operation will contain
+   "Error: Dates are equal but files are not." While such items exist the
+   directory merge cannot start.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="status"></a>The Status Column</h3></div></div></div><p>
+   During the merge one file after the other will be processed. The status
+   column will show "Done" for items where the merge operation has succeeded,
+   and other texts if something unexpected happened. When a merge is complete,
+   then you should make a last check to see if the status for all items is
+   agreeable.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="statisticscolulmns"></a>Statistics Columns</h3></div></div></div><p>
+   When the file comparison mode "Full Analysis" is enabled in the options, then
+   <span class="application">KDiff3</span> will show extra columns containing the numbers of unsolved, solved, nonwhite and whitespace
+   conflicts. (The solved-column will only show when comparing or merging three directories.)
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="selectingvisiblefiles"></a>Selecting Listed Files</h3></div></div></div><p>   
+   Several options influence which files are listed here. Some are accessible in the 
+   <a href="dirmergeoptions.html" title="Options for Comparing and Merging Directories">settings dialog</a>. The Directory-menu contains the entries:
+</p><p><div class="itemizedlist"><ul type="disc"><li><p>"Show Identical Files": Files that have been detected equal in all input directories.</p></li><li><p>"Show Different Files": Files that exist in two or more directories but are not equal.</p></li><li><p>"Show Files only in A": Files that exist only in A, but not in B or C.</p></li><li><p>"Show Files only in B": Files that exist only in B, but not in A or B.</p></li><li><p>"Show Files only in C": Files that exist only in C, but not in A or B.</p></li></ul></div></p><p>
+   Activate only the "Show"-options for the items you want listed. If for example you only want to list all items that 
+   exist either in A or in B but not in both, you'll have to activate "Show Files only in A" and "Show Files only in B" 
+   and deactivate all others ("Show Identical Files", "Show Different Files", "Show Files only in C").
+   The list will be updated immediately to reflect the change.
+</p><p>
+   These options also apply for directories with one exception: Disabling "Show Different Files" will not hide 
+   any complete directories. This will work only for files within.
+</p><p>
+   Note that of these only the "Show Identical Files"-option is persistant. The others are enabled when starting <span class="application">KDiff3</span>. 
+</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="startingdirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dothemerge.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">Starting Directory Comparison Or Merge </div><div class="navRight"> Doing A Directory Merge</div><div class="navCenter"><a accesskey="u" href="dirmerge.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>
\ No newline at end of file
diff --git a/doc/en/documentation.html b/doc/en/documentation.html
new file mode 100644
index 0000000..9a0ebd6
--- /dev/null
+++ b/doc/en/documentation.html
@@ -0,0 +1,54 @@
+<html><head><title>Chapter 2. File Comparison And Merge</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="features.html" title="More Features"><link rel="next" href="opendialog.html" title="Open-Dialog"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">File Comparison And Merge</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="features.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="opendialog.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="documentation"></a>Chapter 2. File Comparison And Merge</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="commandline"></a>Command-Line Options</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488302"></a>Comparing 2 files: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2</code></em></span>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488321"></a>Merging 2 files: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2</code></em></span> -m
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>outputfile</code></em></span>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488352"></a>Comparing 3 files: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2 file3</code></em></span>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488370"></a>Merging 3 files: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2 file3</code></em></span> -m
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1 file2 file3</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>outputfile</code></em></span>
+</pre><p>
+   Note that <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file1</code></em></span> will be treated as
+   base of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file2</code></em></span> and
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>file3</code></em></span>.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488418"></a>Special case: Files with the same name </h3></div></div></div><p>
+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.:
+</p><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1/filename dir2 dir3</code></em></span>
+</pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488444"></a>Commandline for starting a directory comparison or merge: </h3></div></div></div><p>This is very similar, but now it's about directories.</p><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span>
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span>
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+</pre><p>For directory comparison and merge you can continue to read <a href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3">here</a>.</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488514"></a>Other command line options</h3></div></div></div><p>To see all available command line options type</p><pre class="screen">
+<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> --help
+</pre><p>Example output:</p><pre class="screen">
+Options:
+  -m, --merge               Merge the input.
+  -b, --base file           Explicit base file. For compatibility with certain tools.
+  -o, --output file         Output file. Implies -m. E.g.: -o newfile.txt
+  --out file                Output file, again. (For compatibility with certain tools.)
+  --auto                    No GUI if all conflicts are auto-solvable. (Needs -o file)
+  --qall                    Don't solve conflicts automatically. (For compatibility...)
+  --L1 alias1               Visible name replacement for input file 1 (base).
+  --L2 alias2               Visible name replacement for input file 2.
+  --L3 alias3               Visible name replacement for input file 3.
+  -L, --fname alias         Alternative visible name replacement. Supply this once for every input.
+  --cs string               Override a config setting. Use once for every setting. E.g.: --cs "AutoAdvance=1"
+  --confighelp              Show list of config settings and current values.
+  --config file             Use a different config file.
+</pre><p>The option <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">--cs</code></span> allows you to adjust a configuration value that is otherwise only adjustable via the configure dialogs. 
+But be aware that when <span class="application">KDiff3</span> then terminates the changed value will be stored along with the other settings. 
+With <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">--confighelp</code></span> you can find out the names of the available items and current values.</p><p>Via <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">--config</code></span> you can specify a different config file. When you often use <span class="application">KDiff3</span> 
+with completely different setups this allows you to easily switch between them.</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2488593"></a>Ignorable command line options</h3></div></div></div><p>Many people want to use <span class="application">KDiff3</span> with some version control system. 
+But when that version control system calls <span class="application">KDiff3</span> using command line parameters that <span class="application">KDiff3</span> doesn't recognise, then <span class="application">KDiff3</span> terminates with an error.
+The integration settings allow to specify command line parameters that should be ignored by <span class="application">KDiff3</span>. 
+They will appear in the usage help like in this example:</p><pre class="screen">
+  --<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>foo</code></em></span>                     Ignored. (User defined.)
+</pre><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Command line options to ignore:</em></span></span></dt><dd><p>
+     A list of options, separated via semicolon ';'. When one of these options appears on the commandline, 
+     then <span class="application">KDiff3</span> will ignore it and run without reporting an error. 
+     (Default is "u;query;html;abort").</p></dd></dl></div><p>When this isn't enough, then it is recommended to write a shell script that does the option translation.</p></div></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="features.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="opendialog.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">More Features </div><div class="navRight"> Open-Dialog</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/dothemerge.html b/doc/en/dothemerge.html
new file mode 100644
index 0000000..1bf4d11
--- /dev/null
+++ b/doc/en/dothemerge.html
@@ -0,0 +1,65 @@
+<html><head><title>Doing A Directory Merge</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergevisible.html" title="Directory Merge Visible Information"><link rel="next" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Doing A Directory Merge</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="dirmergevisible.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="dirmergeoptions.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dothemerge"></a>Doing A Directory Merge</h2></div></div></div><p>
+   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.
+</p><p>
+   Be aware that if you didn't specify a destination directory explicitely,
+   then the destination will be "C" in three directory mode, "B" in two directory
+   merge mode, and in sync-mode it will be "A" or/and "B".
+</p><p>
+   If you have specified a destination directory also check that all items
+   that should be in the output, are in the tree. There are some options that
+   cause certain items to be omitted from the directory comparison and merge.
+   Check these options to avoid unpleasant surprises:
+</p><div class="itemizedlist"><ul type="disc"><li><p>"Recursive Directories": If this is off, then items in subdirectories
+                     will not be found.</p></li><li><p>"Pattern"/"Anti-Pattern": Include/exclude items that match</p></li><li><p>"Exclude Hidden Files"</p></li><li><p><a href="dirmergevisible.html#selectingvisiblefiles" title="Selecting Listed Files">"Show"-options</a> (Show Identical/Different Files, Files only in A/B/C)</p></li></ul></div><p>
+   If you change the settings in order to list more files, you must do a rescan via menu "Directory"-&gt;"Rescan" yourself.
+   (The reason for this is that for faster comparison-speed <span class="application">KDiff3</span> omits the comparison for files suppressed by these criteria.)
+   If you changed your file and dir patterns to exclude files, then the file-list will immediately be updated on closing
+   the options-dialog.
+</p><p>
+   Note that when you write to a completely new directory then you usually also want to copy the identical files.
+   In that case enable the "Show Identical Files"-option. If your destination-directory is one of the inputs, 
+   then this isn't necessary because the file is already there.
+</p><p>
+   If you are satisfied so far, the rest is easy.
+</p><p>
+   To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu
+   or press F7 (which is the default shortcut).
+   To merge only the current item: Select "Run Operation For Current Item"
+   or press F6.
+</p><p>
+   If due to conflicting filetypes still some items with invalid operations
+   exist, then a messagebox will appear and these items will be pointed out,
+   so you can select a valid operation for the item.
+</p><p>
+   If you merge all items a dialog will appear giving you the options "Do it", "Simulate
+   it" and "Cancel".
+</p><div class="itemizedlist"><ul type="disc"><li><p>Select "Simulate it" if you want to see what would be done without
+                     actually doing it. A verbose list of all operations will be shown.</p></li><li><p>Otherwise select "Do it" to really start merging.</p></li></ul></div><p>
+   Then <span class="application">KDiff3</span> will run the specified operation for all items. If manual
+   interaction  is required (single file merge), then a merge window will open
+   (<a href="screenshots.html#dirmergebigscreenshot">see the big screenshot</a>).
+</p><p>
+   When you have finished with manually merging a file, again select "Start/Continue directory
+   merge" or the key F7. If you haven't saved it yet, a dialog will ask you to
+   do so. Then <span class="application">KDiff3</span> will continue with the next item.
+</p><p>
+   When <span class="application">KDiff3</span> encounters an error, it will tell you so and will show the
+   verbose-status-information. At the bottom of this list, there will be some
+   error messages which should help you to understand the cause of the problem.
+   When you continue merging (F7 key) <span class="application">KDiff3</span> will give you the choice to retry
+   or skip the item that caused the problem. This means that before continuing
+   you can choose another operation or solve the problem by other means.
+</p><p>
+   When the merge is complete, then <span class="application">KDiff3</span> will inform you via a message
+   box.
+</p><p>
+   If some items were merged individually before running the directorymerge then 
+   <span class="application">KDiff3</span> remembers this (while this
+   merge-session goes on), and doesn't merge them again when later the merge for
+   all items is run. Even when the merge was skipped or nothing was saved these
+   items count as completed. Only when you change the merge operation the 
+   "Done"-status of the item will be removed and it can be merged again.
+</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="dirmergevisible.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergeoptions.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">Directory Merge Visible Information </div><div class="navRight"> Options for Comparing and Merging Directories</div><div class="navCenter"><a accesskey="u" href="dirmerge.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>
\ No newline at end of file
diff --git a/doc/en/faq.html b/doc/en/faq.html
new file mode 100644
index 0000000..530e30e
--- /dev/null
+++ b/doc/en/faq.html
@@ -0,0 +1,132 @@
+<html><head><title>Chapter 5. Questions and Answers</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="kpart.html" title="Using KDiff3 as a KPart"><link rel="next" href="credits.html" title="Chapter 6. Credits and License"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Questions and Answers</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="kpart.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="credits.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="faq"></a>Chapter 5. Questions and Answers</h2></div></div></div><p>This document may have been updated since your installation.
+You can find the latest version at <a href="http://docs.kde.org/development/en/extragear-utils/" target="_top">http://docs.kde.org/development/en/extragear-utils/</a>.</p><div class="qandaset"><dl><dt>5.1. <a href="faq.html#id2570336">
+   Why is it called "KDiff3"?
+</a></dt><dt>5.2. <a href="faq.html#id2569721">
+   Why did I release it under GPL?
+</a></dt><dt>5.3. <a href="faq.html#id2569735">
+   Some buttons and functions are missing. What's wrong?
+</a></dt><dt>5.4. <a href="faq.html#id2569763">
+   Often lines that are similar but not identical appear next to each other
+   but sometimes not. Why?
+</a></dt><dt>5.5. <a href="faq.html#id2569787">
+   Why must all conflicts be solved before the merge result can be saved?
+</a></dt><dt>5.6. <a href="faq.html#id2569806">
+   How can I synchronise the diff and merge views, so that all views show the same text position?
+</a></dt><dt>5.7. <a href="faq.html#id2569826">
+   Why does the editor in the merge result window not have an "undo"-function?
+</a></dt><dt>5.8. <a href="faq.html#id2569841">
+   When I removed some text, then suddenly "&lt;No src line&gt;" appeared
+   and cannot be deleted. What does that mean and how can one remove this?
+</a></dt><dt>5.9. <a href="faq.html#id2569879">
+   Why doesn't KDiff3 support syntax-highlighting?
+</a></dt><dt>5.10. <a href="faq.html#id2569900">
+   Can I use KDiff3 to compare OpenOffice.Org, Word, Excel, PDF-, etc. files?
+</a></dt><dt>5.11. <a href="faq.html#id2569967">
+   Where has the the directory option "List only deltas" gone?
+</a></dt><dt>5.12. <a href="faq.html#id2569988">
+   How can I make a big selection in the diff input window
+   because scrolling takes so long?
+</a></dt><dt>5.13. <a href="faq.html#id2570009">
+   There is so much information here, but your question is still not answered?
+</a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="id2570336"></a><a name="id2570338"></a><b>5.1.</b></td><td align="left" valign="top"><p>
+   Why is it called "<span class="application">KDiff3</span>"?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   Tools named "KDiff" and "KDiff2" (now called "Kompare") already exist. Also "KDiff3" should suggest
+   that it can merge like the "diff3"-tool in the Diff-Tool collection.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569721"></a><a name="id2569723"></a><b>5.2.</b></td><td align="left" valign="top"><p>
+   Why did I release it under GPL?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   I'm using GPL programs for a very long time now and learned very much
+   by  having a look at many of the sources. Hence this is my "Thank You"
+   to   all  programmers that also did so or will do the same.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569735"></a><a name="id2569748"></a><b>5.3.</b></td><td align="left" valign="top"><p>
+   Some buttons and functions are missing. What's wrong?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   You compiled from source but you probably didn't specify the correct KDE-prefix
+   with configure. By default configure wants to install in /usr/local but then KDE can't
+   find the user-interface ressource file (i.e. kdiff3ui.rc). The README-file contains
+   more information about the correct prefix.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569763"></a><a name="id2569764"></a><b>5.4.</b></td><td align="left" valign="top"><p>
+   Often lines that are similar but not identical appear next to each other
+   but sometimes not. Why?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   Lines where only the amount of white space characters is different
+   are   treated as "equal" at first, while just one different non-white character
+   causes the lines to be "different". If similar lines appear next to each
+   other, this actually is coincidence but this fortunately is often the case.
+   See also <a href="interpretinginformation.html#manualdiffhelp" title="Manually Aligning Lines">Manual Diff Help</a>.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569787"></a><a name="id2569789"></a><b>5.5.</b></td><td align="left" valign="top"><p>
+   Why must all conflicts be solved before the merge result can be saved?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   For each equal or different section the editor in the merge result
+   window    remembers where it begins or ends. This is needed so that conflicts
+   can  be solved manually by simply selecting the source button (A, B or C).
+   This  information is lost while saving as text and it is too much effort to
+   create  a special file format that supports saving and restoring all necessary
+   information.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569806"></a><a name="id2569807"></a><b>5.6.</b></td><td align="left" valign="top"><p>
+   How can I synchronise the diff and merge views, so that all views show the same text position?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+  Click into the summary column left of the text. (<a href="merging.html#synchronise_views" title="Setting The Current Group And Synchronising Merge And Diff View Position">See also here.</a>)
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569826"></a><a name="id2569827"></a><b>5.7.</b></td><td align="left" valign="top"><p>
+   Why does the editor in the merge result window not have an "undo"-function?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+  This was too much effort until now. You can always
+  restore a version from one source (A, B or C) by clicking the respective
+  button. For big editing the use of another editor is recommended anyway.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569841"></a><a name="id2569843"></a><b>5.8.</b></td><td align="left" valign="top"><p>
+   When I removed some text, then suddenly "&lt;No src line&gt;" appeared
+   and cannot be deleted. What does that mean and how can one remove this?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   For each equal or different section the editor in the merge result
+   window    remembers where it begins or ends. "&lt;No src line&gt;" means
+   that    there is nothing left in a section, not even a new line character.
+   This  can happen either while merging automatically or by editing. This is
+   no problem,   since this hint won't appear in the saved file. If you want
+   the orignal source  back just select the section (click on the left summary
+   column) and then click the source button with the needed contents (A/B or
+   C).
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569879"></a><a name="id2569881"></a><b>5.9.</b></td><td align="left" valign="top"><p>
+   Why doesn't <span class="application">KDiff3</span> support syntax-highlighting?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   <span class="application">KDiff3</span> already uses many colors for difference highlighting. More
+   highlighting    would be confusing. Use another editor for this.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569900"></a><a name="id2569901"></a><b>5.10.</b></td><td align="left" valign="top"><p>
+   Can I use <span class="application">KDiff3</span> to compare OpenOffice.Org, Word, Excel, PDF-, <span class="abbrev">etc.</span> files?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   Although <span class="application">KDiff3</span> will analyse any kind of file the result will probably
+   not be very satisfactory for you.
+</p><p>
+   <span class="application">KDiff3</span> was made to compare pure text files. OpenOffice, Word, Excel etc.
+   store much more information in the files (about fonts, pictures, pages,
+   colors etc.) which <span class="application">KDiff3</span> doesn't know about. So <span class="application">KDiff3</span> will 
+   show you the contents of the file interpreted as pure text, but 
+   this might be unreadable or at least it will look very odd.
+</p><p>
+   Since most programs nowadays store their contents in XML-format, you might 
+   be able to read it as pure text. So if the change was only small,
+   <span class="application">KDiff3</span> still might help you.
+</p><p>
+   The best solution if you only want to compare the text (without embedded 
+   objects like pictures) is to use "Select All" and "Copy" in your program 
+   to copy the interesting text to the clipoard and then in <span class="application">KDiff3</span> paste the 
+   text into either diff input window. 
+   (See also <a href="selections.html" title="Select, Copy And Paste">Select, Copy And Paste</a>.)
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569967"></a><a name="id2569969"></a><b>5.11.</b></td><td align="left" valign="top"><p>
+   Where has the the directory option "List only deltas" gone?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   There are now several <a href="dirmergevisible.html#selectingvisiblefiles" title="Selecting Listed Files">"Show"-options</a> in the directory menu.
+   Disabling "Show identical files" will achieve what enabling "List only deltas" used to do.
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2569988"></a><a name="id2569989"></a><b>5.12.</b></td><td align="left" valign="top"><p>
+   How can I make a big selection in the diff input window
+   because scrolling takes so long?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   Start the selection as usual (click and hold the left mouse button). 
+   Then use the navigation keys (e.g. page up, page down) while holding the left mouse button down.
+   (See also <a href="selections.html" title="Select, Copy And Paste">Select, Copy And Paste</a>.)
+</p></td></tr><tr class="question"><td align="left" valign="top"><a name="id2570009"></a><a name="id2570011"></a><b>5.13.</b></td><td align="left" valign="top"><p>
+   There is so much information here, but your question is still not answered?
+</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>
+   Please send me your question. I appreciate every comment.
+</p></td></tr></tbody></table></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="kpart.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="credits.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">Using <span class="application">KDiff3</span> as a KPart </div><div class="navRight"> Credits and License</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/features.html b/doc/en/features.html
new file mode 100644
index 0000000..e5ac9ed
--- /dev/null
+++ b/doc/en/features.html
@@ -0,0 +1,22 @@
+<html><head><title>More Features</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="screenshots.html" title="Screenshots and Features"><link rel="next" href="documentation.html" title="Chapter 2. File Comparison And Merge"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">More Features</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="screenshots.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="documentation.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="features"></a>More Features</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490911"></a> Line-By-Line And Char-By-Char Diff-Viewer</h3></div></div></div><p>By using the possiblities of a graphical color display <span class="application">KDiff3</span> shows
+   exactly what the difference is. When you have to do many code-reviews, you will like this.
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="letter_by_letter.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490942"></a> See White-Space Differences At One Glance</h3></div></div></div><p>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
+   column on the left side. (No more worries when people change the indentation.)
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="white_space.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2490972"></a> Triple-Diff</h3></div></div></div><p> Analyze three files and see where they differ.
+</p><p>
+   The left/middle/right windows are named A/B/C and have the blue/green/magenta
+   color respectively.
+</p><p>
+   If one file is the same and one file is different on a line then the
+   color   shows which file is different. The red color means that both other
+   files  are different.
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="triple_diff.png"><hr></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491007"></a> Comfortable Merge Of Two Or Three Input Files</h3></div></div></div><p> <span class="application">KDiff3</span> can be used to merge two or three input files and automatically
+   merges as much as possible. The result is presented in an editable window
+   where most conflicts can be solved with a single mouseclick: Select the
+   buttons  A/B/C from the button-bar to select the source that should be used.
+   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.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2491031"></a>And ...</h3></div></div></div><div class="itemizedlist"><ul type="disc"><li><p>Fast navigation via buttons.</p></li><li><p>A mouse-click into a summary column sync's all windows to show the same position.</p></li><li><p>Select and copy from any window and paste into the merge result window.</p></li><li><p>Overview column that shows where the changes and conflicts are.</p></li><li><p>The colors are adjustable to your specific preferences.</p></li><li><p>Adjustable Tab size.</p></li><li><p>Option to insert spaces instead of tabs.</p></li><li><p>Open files comfortably via dialog or specify files on the command line.</p></li><li><p>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</p></li><li><p>Show the line numbers for each line. </p></li><li><p>Paste clipboard or drag text into a diff input window.</p></li><li><p>Networktransparency via KIO.</p></li><li><p>Can be used as diff-viewer in KDevelop 3.</p></li><li><p>Word-wrap for long lines.</p></li><li><p>Support for Unicode, UTF-8 and other codecs.</p></li><li><p>Support for right to left languages.</p></li><li><p>...</p></li></ul></div></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="screenshots.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="documentation.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">Screenshots and Features </div><div class="navRight"> File Comparison And Merge</div><div class="navCenter"><a accesskey="u" href="introduction.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>
\ No newline at end of file
diff --git a/doc/en/find.html b/doc/en/find.html
new file mode 100644
index 0000000..ead358b
--- /dev/null
+++ b/doc/en/find.html
@@ -0,0 +1,10 @@
+<html><head><title>Finding Strings</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="saving.html" title="Saving"><link rel="next" href="printing.html" title="Printing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Finding Strings</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="saving.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="printing.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="find"></a>Finding Strings</h2></div></div></div><p>
+   You can search for a string in any text-window of <span class="application">KDiff3</span>. 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.
+   Searching will always start at the top. Use the "Find Next"-command (F3)
+   to proceed to the next occurrence. If you select to search several windows then the first
+   window will be searched from top to bottom before the search starts in the next
+   window at the top again, etc.
+</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="saving.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="printing.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">Saving </div><div class="navRight"> Printing</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>
\ No newline at end of file
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
new file mode 100644
index 0000000..50425ed
--- /dev/null
+++ b/doc/en/index.docbook
@@ -0,0 +1,2135 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application>KDiff3</application>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "extragear-utils">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title>The &kdiff3; Handbook</title>
+
+<authorgroup>
+<author>
+<!--<personname>-->
+<firstname>Joachim</firstname>
+<surname>Eibl</surname>
+<!--</personname>-->
+<affiliation><address>
+   <email>joachim.eibl at gmx.de</email>
+</address></affiliation>
+</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<copyright>
+<year>2002-2007</year>
+<holder>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date>2007-31-03</date>
+<releaseinfo>0.9.92</releaseinfo>
+
+
+<abstract>
+<para>
+   &kdiff3; is a file and directory diff and merge tool which
+<itemizedlist>
+<listitem><para>compares and merges two or three text input files or directories,</para></listitem>
+<listitem><para>shows the differences line by line and character by character(!),</para></listitem>
+<listitem><para>provides an automatic merge-facility,</para></listitem>
+<listitem><para>has an editor for comfortable solving of merge-conflicts,</para></listitem>
+<listitem><para>provides networktransparency via KIO,</para></listitem>
+<listitem><para>has options to highlight or hide changes in white-space or comments,</para></listitem>
+<listitem><para>supports Unicode, UTF-8 and other file encodings,</para></listitem>
+<listitem><para>prints differences,</para></listitem>
+<listitem><para>supports version control keyword and history merging.</para></listitem>
+</itemizedlist>
+</para><para>
+   This document describes &kdiff3;-version 0.9.92.
+</para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword>KDE</keyword>
+<keyword>kdeextragear</keyword>
+<keyword>kdiff3</keyword>
+<keyword>diff</keyword>
+<keyword>merge</keyword>
+<keyword>CVS</keyword>
+<keyword>triplediff</keyword>
+<keyword>compare</keyword>
+<keyword>files</keyword>
+<keyword>directories</keyword>
+<keyword>version control</keyword>
+<keyword>three-way-merge</keyword>
+<keyword>in-line-differences</keyword>
+<keyword>synchronise</keyword>
+<keyword>kpart</keyword>
+<keyword>kio</keyword>
+<keyword>networktransparent</keyword>
+<keyword>editor</keyword>
+<keyword>white space</keyword>
+<keyword>comments</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"><title>Introduction</title>
+<sect1 id="why"><title>Yet Another Diff Frontend?</title>
+<para>
+Several graphical diff tools exist. Why choose &kdiff3;? Let me say, why I wrote it.
+</para><para>
+&kdiff3; started because I had to do a difficult merge. Merging is necessary when several
+people work on the same files in a project. A merge can be somewhat automated, when the
+merge-tool not only has the new modified files (called "branches"), but also the original file
+(called "base"). The merge tool will automatically choose any modification that was only
+done in one branch. When several contributors change the same lines, then the merge tool
+detects a conflict which must be solved manually.
+</para><para>
+The merge then was difficult because one contributor had changed many things and corrected
+the indentation in many places. Another contributor also had changed much text in the same file,
+which resulted in several merge conflicts.
+</para><para>
+The tool I used then, only showed the changed lines, but not what had changed within these
+lines. And there was no information about where only the indentation was changed. The merge
+was a little nightmare.
+</para><para>
+So this was the start. The first version could show differences within a line and showed white space differences.
+Later many other features were added to increase the usefulness.
+</para><para>
+For example if you want to compare some text quickly, then you can copy it to the clipboard and
+paste it into either diff window.
+</para><para>
+A feature that required a big effort was the directory comparison and merge facility, which turned
+the program almost into a full file browser.
+</para><para>
+I hope &kdiff3; works for you too. Have fun!
+</para><para>
+Joachim Eibl (2003)
+</para>
+</sect1>
+
+<sect1 id="screenshots"><title>Screenshots and Features</title>
+<para>This screenshot shows the difference between two text files</para>
+<para>(Using an early version of &kdiff3;):</para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+
+<para>
+   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.
+   The merge-editor below the diff-windows allows you to solve conflicts, while showing you the output you will get.
+   You can even edit the output.
+   This screenshot shows three input files being merged:
+</para><para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot">&kdiff3; also helps you to compare and merge complete directories.
+This screenshot shows &kdiff3; during a directory merge:
+</para><para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"><title>More Features</title>
+<sect2><title> Line-By-Line And Char-By-Char Diff-Viewer</title>
+<para>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.
+</para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+</sect2>
+
+<sect2><title> See White-Space Differences At One Glance</title>
+<para>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
+   column on the left side. (No more worries when people change the indentation.)
+</para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+</sect2>
+
+<sect2><title> Triple-Diff</title>
+<para> Analyze three files and see where they differ.
+</para><para>
+   The left/middle/right windows are named A/B/C and have the blue/green/magenta
+   color respectively.
+</para><para>
+   If one file is the same and one file is different on a line then the
+   color   shows which file is different. The red color means that both other
+   files  are different.
+</para>
+<screenshot><mediaobject>
+   <imageobject><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+</sect2>
+
+<sect2><title> Comfortable Merge Of Two Or Three Input Files</title>
+<para> &kdiff3; can be used to merge two or three input files and automatically
+   merges as much as possible. The result is presented in an editable window
+   where most conflicts can be solved with a single mouseclick: Select the
+   buttons  A/B/C from the button-bar to select the source that should be used.
+   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.
+</para>
+</sect2>
+
+<sect2><title>And ...</title>
+<itemizedlist>
+   <listitem><para>Fast navigation via buttons.</para></listitem>
+   <listitem><para>A mouse-click into a summary column sync's all windows to show the same position.</para></listitem>
+   <listitem><para>Select and copy from any window and paste into the merge result window.</para></listitem>
+   <listitem><para>Overview column that shows where the changes and conflicts are.</para></listitem>
+   <listitem><para>The colors are adjustable to your specific preferences.</para></listitem>
+   <listitem><para>Adjustable Tab size.</para></listitem>
+   <listitem><para>Option to insert spaces instead of tabs.</para></listitem>
+   <listitem><para>Open files comfortably via dialog or specify files on the command line.</para></listitem>
+   <listitem><para>Search for strings in all text windows. Find (Ctrl-F) and Find Next (F3)</para></listitem>
+   <listitem><para>Show the line numbers for each line. </para></listitem>
+   <listitem><para>Paste clipboard or drag text into a diff input window.</para></listitem>
+   <listitem><para>Networktransparency via KIO.</para></listitem>
+   <listitem><para>Can be used as diff-viewer in KDevelop 3.</para></listitem>
+   <listitem><para>Word-wrap for long lines.</para></listitem>
+   <listitem><para>Support for Unicode, UTF-8 and other codecs.</para></listitem>
+   <listitem><para>Support for right to left languages.</para></listitem>
+   <listitem><para>...</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"><title>File Comparison And Merge</title>
+
+<sect1 id="commandline"><title>Command-Line Options</title>
+
+<sect2><title>Comparing 2 files: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>file1 file2</replaceable>
+</screen>
+</sect2>
+
+<sect2><title>Merging 2 files: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>file1 file2</replaceable> -m
+   <command>kdiff3</command> <replaceable>file1 file2</replaceable> -o <replaceable>outputfile</replaceable>
+</screen>
+</sect2>
+
+<sect2><title>Comparing 3 files: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable>
+</screen>
+</sect2>
+
+<sect2><title>Merging 3 files: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -m
+   <command>kdiff3</command> <replaceable>file1 file2 file3</replaceable> -o <replaceable>outputfile</replaceable>
+</screen>
+<para>
+   Note that <replaceable>file1</replaceable> will be treated as
+   base of <replaceable>file2</replaceable> and
+   <replaceable>file3</replaceable>.
+</para>
+</sect2>
+
+<sect2><title>Special case: Files with the same name </title>
+<para>
+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.:
+</para>
+<screen>
+   <command>kdiff3</command> <replaceable>dir1/filename dir2 dir3</replaceable>
+</screen>
+</sect2>
+
+<sect2><title>Commandline for starting a directory comparison or merge: </title>
+<para>This is very similar, but now it's about directories.</para>
+<screen>
+   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable>
+   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o <replaceable>destdir</replaceable>
+   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>
+   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o <replaceable>destdir</replaceable>
+</screen>
+<para>For directory comparison and merge you can continue to read <link linkend="dirmerge">here</link>.</para>
+</sect2>
+
+<sect2><title>Other command line options</title>
+<para>To see all available command line options type</para>
+<screen>
+<command>kdiff3</command> --help
+</screen>
+<para>Example output:</para>
+<screen>
+Options:
+  -m, --merge               Merge the input.
+  -b, --base file           Explicit base file. For compatibility with certain tools.
+  -o, --output file         Output file. Implies -m. E.g.: -o newfile.txt
+  --out file                Output file, again. (For compatibility with certain tools.)
+  --auto                    No GUI if all conflicts are auto-solvable. (Needs -o file)
+  --qall                    Don't solve conflicts automatically. (For compatibility...)
+  --L1 alias1               Visible name replacement for input file 1 (base).
+  --L2 alias2               Visible name replacement for input file 2.
+  --L3 alias3               Visible name replacement for input file 3.
+  -L, --fname alias         Alternative visible name replacement. Supply this once for every input.
+  --cs string               Override a config setting. Use once for every setting. E.g.: --cs "AutoAdvance=1"
+  --confighelp              Show list of config settings and current values.
+  --config file             Use a different config file.
+</screen>
+<para>The option <option>--cs</option> allows you to adjust a configuration value that is otherwise only adjustable via the configure dialogs. 
+But be aware that when &kdiff3; then terminates the changed value will be stored along with the other settings. 
+With <option>--confighelp</option> you can find out the names of the available items and current values.</para>
+<para>Via <option>--config</option> you can specify a different config file. When you often use &kdiff3; 
+with completely different setups this allows you to easily switch between them.</para>
+</sect2>
+<sect2><title>Ignorable command line options</title>
+<para>Many people want to use &kdiff3; with some version control system. 
+But when that version control system calls &kdiff3; using command line parameters that &kdiff3; doesn't recognise, then &kdiff3; terminates with an error.
+The integration settings allow to specify command line parameters that should be ignored by &kdiff3;. 
+They will appear in the usage help like in this example:</para>
+<screen>
+  --<replaceable>foo</replaceable>                     Ignored. (User defined.)
+</screen>
+<variablelist>
+  <varlistentry><term><emphasis>Command line options to ignore:</emphasis></term><listitem><para>
+     A list of options, separated via semicolon ';'. When one of these options appears on the commandline, 
+     then &kdiff3; will ignore it and run without reporting an error. 
+     (Default is "u;query;html;abort").</para></listitem></varlistentry>
+</variablelist>
+<para>When this isn't enough, then it is recommended to write a shell script that does the option translation.</para>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"><title>Open-Dialog</title>
+<para>
+   Since many input files must be selectable, the program has a special open dialog:
+</para>
+<screenshot><mediaobject>
+<imageobject><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+<para>
+   The open dialog allows to edit the filenames by hand, selecting a file
+   via  the file-browser ("File...") or allows to choose recent files from
+   the drop-down lists. If you open the dialog again, then the current names
+   still remain there. The third input file is not required. If the
+   entry   for "C" remains empty, then only a two file diff analysis will be
+   done.
+</para><para>
+   You can also select a directory via "Dir...". If for A a directory is specified
+   then a directory-comparison/merge starts. If A specifies a file but B, C or
+   the output specify a directory, then &kdiff3; uses the filename from A in the
+   specified directories.
+</para><para>
+   If "Merge" is selected, then the "Output"-line becomes editable. But it
+   is not required to specify the output filename immediately. You can also
+   postpone this until saving.
+</para><para>
+   The "Configure..."-button opens the options-dialog, so that you can set
+   the options before running the analysis.
+</para>
+</sect1>
+
+<sect1 id="pasteinput"><title>Paste and Drop Input</title>
+<para>
+   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.
+   In the open dialog you need not specify files then, but just close it via "Cancel".
+</para><para>
+   You can also use drag and drop: Drag a file from a file manager
+   or selected text from an editor and drop it onto a diff input window.
+</para><para>
+   What's the idea? Sometimes a file contains two similar functions, but checking how similar
+   they really are is a big effort if you first must create two files and then load them. Now
+   you can simply copy, paste and compare the relevant sections.
+</para><para>
+   Note: Currently you cannot drag anything from &kdiff3;. Only dropping in the diff input
+   is supported.
+</para><para>
+   Warning: Some editors still interpret the drag and drop into another program like cut
+   (instead of copy) and paste. Your original data might be lost then.
+</para>
+</sect1>
+
+<sect1 id="interpretinginformation"><title>Comparing Files And Interpreting The Information In The Input Windows</title>
+<screenshot><mediaobject>
+<imageobject><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+<sect2><title>Info Line</title><para>
+   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. 
+   (Note that window "C" is  optional.) Each info line appears in a different color.
+</para><para>
+   When you selected another file via browsing or finished editing the filename here 
+   by pressing enter, the new file will be loaded and 
+   compared with the already loaded file(s).
+</para></sect2><sect2><title>Coloring</title><para>
+   The three input windows are assigned the letters "A", "B" and "C".
+   "A"   has  color blue, "B" has green and "C" has magenta. (These are the
+   defaults,   but  can be changed in the Settings-Menu.)
+</para><para>
+   When a difference is detected then the color shows which input file
+   differs.   When both other input files differ then the color used to express
+   this is   red by default ("Conflict color" in the Settings).
+   This colorscheme is especially useful in the case of three input files, which will be
+   seen in the next section (<link linkend="merging">Merging</link>).
+</para></sect2><sect2><title>Summary Column</title><para>
+   Left of each text is the "summary column". If differences occurred on a
+   line then the summary column shows the respective color. For a white-space-only
+   difference the summary is chequered. For programming languages where white
+   space is not so important this is useful to see at one glance if anything
+   of importance was modified. (In C/C++ white space is only interesting within
+   strings, comments, for the preprocessor, and some only very esoteric situations.)
+</para><para>
+   The vertical line separating the summary column and the text is interrupted
+   if the input file had no lines there. When word-wrap is enabled then this vertical 
+   line appears dotted for wrapped lines.
+</para></sect2><sect2><title>Overview Column</title><para>
+   On the right side a "overview"-column is visible left of the vertical scrollbar.
+   It shows the compressed summary column of input "A". All the differences
+   and conflicts are visible at one glance. When only two input windows are
+   used, then all differences appear red here because every difference is
+   also   a conflict. A black rectangle frames the visible part of the inputs.
+   For  very long input files, when the number of input lines is bigger than
+   the height of the overview column in pixels, then several input lines share
+   one overview line. A conflict then has top priority over simple differences,
+   which have priority over no change, so that no difference or conflict is
+   lost here.  By clicking into this overview column the corresponding text
+   will be shown.
+</para></sect2><sect2 id="manualdiffhelp"><title>Manually Aligning Lines</title><para>
+   Sometimes the algorithm places the wrong lines next to each other. Or you want to compare 
+   one piece of text with text at a completely different position in the other file.
+   For these situations you can manually instruct &kdiff3; to align certain lines. 
+   Mark the text for which you want to improve the alignment with the mouse as you would 
+   for copy and paste in the first diff view and then choose "Add Manual Diff Alignment" 
+   in the "Diffview"-menu (keyboard shortcut "Ctrl-Y") . An orange bar will appear in 
+   the summary column next to the chosen text. Repeat this for the second and 
+   (if available) third diff view. &kdiff3; will immediately recalculate the differences everytime you do this.
+   and will align the chosen lines. Of course some of the previously matching lines in between 
+   might not match anymore.
+</para><para>
+   Currently merging doesn't support the use of manual diff help.
+</para></sect2><sect2 id="joinsplitsections"><title>Manually Joining and Splitting Diff Sections</title><para>
+   In some cases &kdiff3; will see too many or too few diff sections for merging. In such a 
+   case you can join or split existing sections.
+</para><para>
+   Add new sections by first selecting text in the lines that belong together in either input window (as for copying to the clipboard). 
+   Then choose "Split Diff At Selection" in the "Merge" menu.
+   Splits will be added above the first line and below the last line of the selected text.
+   If you only want to add one section, then select text beginning at another section-split.
+</para><para>
+   For joining sections in either input window select something in the lines from the sections to join.
+   (You can join several sections in one step too.) Then choose "Join selected Diffs" in the "Merge"-menu.
+</para></sect2>
+</sect1>
+
+
+<sect1 id="merging"><title>Merging And The Merge Output Editor Window</title>
+<screenshot><mediaobject>
+<imageobject><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject></screenshot>
+<para>
+   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
+   contain conflicts.
+</para><para>
+   !!! Saving is disabled until all conflicts are resolved !!! (Use the "Go
+   to prev/next unsolved conflicts"-buttons to find the remaining conflicts.)
+</para><para>
+   With only two input files every difference is also a conflict that must
+   be solved manually.
+</para><para>
+   With three input files the first file is treated as base, while the
+   second   and third input files contain modifications. When at any line only
+   either   input B or input C have changed but not both then the changed source
+   will   automatically be selected. Only when B and C have changed on the same
+   lines,   then the tool detects a conflict that must be solved manually.
+   When B and C are the same, but not the same as A, then C is selected.
+</para><sect2><title>The Summary Column</title><para>
+   The merge output editor window also has a summary column on the left. It shows the
+   letter of the input from which a line was selected or nothing if all three
+   sources where equal on a line. For conflicts it shows a questionmark "?"
+   and the line shows "&lt;Merge Conflict&gt;", all in red. Because solving
+   conflicts  line by line would take very long, the lines are grouped into
+   groups that  have the same difference and conflict characteristics.
+   But only-white-space-conflicts are separated from non-white-space-conflicts
+   in order to ease the merging of files were the indentation changed for many
+   lines.
+</para></sect2><sect2 id="synchronise_views"><title>Setting The Current Group And Synchronising Merge And Diff View Position</title><para>
+   When clicking into  the summary column with the left mouse button in either
+   window then the beginning of the group belonging to that line will shown in all windows.
+   This group then becomes the "current group". It is highlighted with the
+   "Current range (diff) background color" and
+   a black bar appears on the left side of the text.
+</para></sect2><sect2><title>Choosing Inputs A, B or C For Current Conflict And Editing</title><para>
+   The button bar below the menubar contains three input selector buttons 
+   containing the letters "A", "B" and "C". Click the input selector 
+   button to insert (or remove if already inserted) the lines from the respective source.
+   To choose the lines from several inputs click the respective buttons in the
+   needed order. For example if you want that the lines from "B" appear before 
+   the lines from "A" in the output, first click "B", then "A".
+</para><para>
+   If you use the auto-advance option 
+   (<link linkend="autoadvance">"Automatically go to next unsolved conflict after source selection"</link>),
+   you should disable this before choosing lines from several inputs or if you want to
+   edit the lines after your choice. Otherwise &kdiff3; will jump to the next
+   conflict after choosing the first input.
+</para><para>
+   It is often helpful directly edit the merge output. 
+   The summary column will show "m" for every line that was manually modified. 
+   When for instance the differences are aligned in a way that simply choosing 
+   the inputs won't be satisfactory, then you can mark the needed text and use 
+   normal <link linkend="selections">copy and paste</link> to put it into the merge output.
+</para><para>
+   Sometimes, when a line is removed either by automatic merge or by editing
+   and no other lines remain in that group, then the text &lt;No src line&gt;
+   will appear in that line. This is just a placeholder for the group for
+   when  you might change your mind and select some source again. This text won't
+   appear in the saved file or in any selections you want to copy and paste.
+</para><para>
+   The text "&lt;Merge Conflict&gt;" will appear in the clipboard if you
+   copy and   paste some text containing such a line. But still be careful to
+   do so.
+</para></sect2><sect2><title>Choosing Input A, B, or C for All Conflicts</title><para>
+   The normal merge will start by solving simple conflicts automatically.
+   But the "Merge"-menu provides some actions for other common needs.
+   If you have to select the same source for most conflicts, then you can
+   choose "A", "B" or "C" everywhere, or only for the remaining unsolved
+   conflicts, or for unsolved white space conflicts. If you want to decide every
+   single delta yourself, you can "Set deltas to conflicts". Or if you want to
+   return to the automatic choices of &kdiff3; then select
+   "Automatically solve simple conflicts". &kdiff3; then restarts the merge.
+   For actions that change your previous modifications &kdiff3; will ask for your
+   confirmation before proceeding.
+</para><para>
+   Note: When choosing either source for unsolved white space conflicts and
+   the options "Ignore Numbers" or "Ignore C/C++ Comments" are used then changes in
+   numbers or comments will be treated like white space too.
+
+</para></sect2><sect2 id="vcskeywordsmergesupport"><title>Automatic Merge of Version Control Keywords and History (Log)</title><para>
+Many version control systems support special keywords in the file. (e.g. "&#36;Date&#36;", 
+"&#36;Header&#36;", "&#36;Author&#36;", "&#36;Log&#36;" etc.) During the 
+check-in the version control system (VCS) changes these lines. For instance 
+"&#36;Date&#36;" will turn into "&#36;Date: 2005/03/22 18:45:01 &#36;". Since this line will 
+be different in every version of the file, it would require manual interaction 
+during the merge.
+</para><para>
+&kdiff3; offers automatic merge for these items. For simple lines that match the 
+"Auto merge regular expression"-option in all input-files &kdiff3; will choose 
+the line from B or - if available - from C. (Additionally it is necessary that the lines 
+in question line up in the comparison and the previous line contains no conflict.)
+This auto merge can either be run immediately after a merge starts (activate the option 
+"Run regular expression auto merge on merge start") or later via the merge 
+menu "Run Regular Expression Auto Merge".
+</para><para>
+Automatic merge for version control history (also called "log") is also supported.
+The history automerge can either run immediately when the merge starts by activating the 
+option "Merge version control history on merge start" or later via the merge menu 
+"Automatically Solve History Conflicts".
+</para><para>
+Usually the version control history begins with a line containing the keyword "&#36;Log&#36;".
+This must be matched by the "History start regular expression"-option.
+&kdiff3; detects which subsequent lines are in the history by analysing the leading characters 
+that came before the "&#36;Log&#36;"-keyword. If the same "leading comment"-characters also appears in the following
+lines, then they are also included in the history.
+</para><para>
+During each check-in the VCS writes a unique line specifying version-, date- and time-information 
+followed by lines with user comments.
+These lines form one history-entry. This history section grows with every check-in and the 
+most recent entries appear at the top (after the history start line). 
+</para><para>
+When for parallel development two or more developers check-in a branch of the file then 
+the merge history will contain several entries that appear as conflicts during the merge 
+of the branches. Since merging these can become very tedious, &kdiff3; offers support with two 
+possible strategies: Just insert the history information from both contributors at the top
+or sort the history information by a user defined key.
+</para><para>
+The just-insert-all-entries-method is easier to configure. &kdiff3; just needs a method to
+detect, which lines belong to one history entry. Most VCS insert an empty line after each
+history entry. If there are no other empty lines, this is a sufficient criterion for &kdiff3;.
+Just set an empty "History entry start regular expression". If the empty line criterion 
+isn't sufficient, you can specify a regular expression to detect the history entry start.
+</para><para>
+Note that &kdiff3; will remove duplicate history entrys. If a history entry appeared several times
+in the history of a input file, only one entry will remain in the output.
+</para><para>
+If you want to sort the history, then you have to specify how the sort key should be built.
+Use parentheses in the "History entry start regular expression" to group parts of the regular 
+expression that should later be used for the sort key.
+Then specify the "History entry start sort key order" specifying a comma "," separated list of 
+numbers referring to the position of the group in the regular expression.
+</para><para>
+Because this is not so easy to get right immediately, you are able to test and improve
+the regular expressions and key-generation in a dedicated dialog by pressing the 
+"Test your regular expressions"-button.
+</para><para>Example: Assume a history that looks like this:
+<screen>
+/**************************************************************************
+** HISTORY:    &#36;Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp &#36;
+**
+**     \main\integration_branch_12   2 Apr 2001 10:45:41   tom
+**  Merged branch simon_branch_15.
+**
+**     \main\henry_bugfix_branch_7\1   30 Mar 2001 19:22:05   henry
+**  Improved the speed for subroutine convertToMesh().
+**  Fixed crash.
+**************************************************************************/
+</screen>
+The history start line matches the regular expression ".*\&#36;Log.*\&#36;.*". Then follow 
+the history entries.
+</para><para>
+The line with the "&#36;Log&#36;"-keyword begins with two "*" after which follows a space. 
+&kdiff3; uses the first non-white-space string as "leading comment" and assumes that
+the history ends in the first line without this leading comment. In this example the
+last line ends with a string that also starts with two "*", but instead of a space 
+character more "*" follow. Hence this line ends the history.
+</para><para>
+If history sorting isn't required then the history entry start line regular expression
+could look like this. (This line is split in two because it wouldn't fit otherwise.)
+<screen>
+\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</screen>
+For details about regular expressions please see the
+<ulink url="http://doc.trolltech.com/3.3/qregexp.html#details">regular expression documentation by Trolltech</ulink>.
+Note that "\s" (with lowercase "s") matches any white space and "\S" (with uppercase "S") matches any non-white-space.
+In our example the history entry start contains first the version info with reg. exp. "\\main\\\S+", the date consisting of day "[0-9]+", month "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" and year "[0-9][0-9][0-9][0-9]", the time "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" and finally the developers login name ".*".
+</para><para>
+Note that the "leading comment"-characters (in the example "**") will already be removed by &kdiff3; 
+before trying to match, hence the regular expression begins with a match for none or more white-space characters "\s*".
+Because comment characters can differ in each file (e.g. C/C++ uses other comment characters than a Perl script)
+&kdiff3; takes care of the leading comment characters and you should not specify them in the regular expression.
+</para><para>
+If you require a sorted history. Then the sortkey must be calculated. For this the 
+relevant parts in the regular expression must be grouped by parentheses. 
+(The extra parentheses can also stay in if history sorting is disabled.)
+<screen>
+\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</screen>
+The parentheses now contain 1. version info, 2. day, 3. month, 4. year, 5. time, 6. name. 
+But if we want to sort by date and time, we need to construct a key with the elements in a different order of appearance:
+First the year, followed by month, day, time, version info and name. Hence the sortkey order to specify is "4,3,2,5,1,6".
+</para><para>
+Because  month names aren't good for sorting ("Apr" would be first) &kdiff3; detects in which order 
+the month names were given and uses that number instead ("Apr"->"04"). 
+And if a pure number is found it will be transformed to a 4-digit value with leading zeros for sorting.
+Finally the resulting sort key for the first history entry start line will be:
+<screen>
+2001 04 0002 10:45:41 integration_branch_12   tom 
+</screen>
+</para><para>
+For more information also see <link linkend="mergeoptions">Merge Settings</link>.
+</para>
+</sect2>
+</sect1>
+
+<sect1 id="navigation"><title>Navigation And Editing</title>
+<para>
+   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,
+   home,  end, ctrl-home, ctrl-end as you would in other programs. The overview-column
+   next to the vertical scroll bar of the input files can also be used  for
+   navigating by clicking into it.
+</para><para>
+   You can also use the wheel mouse to scroll up and down.
+</para><para>
+   In the merge output editor you can also use the other keys for editing.
+   You can toggle between insert and overwrite mode with the insert key. (Default
+   is insert-mode.)
+</para><para>
+   A left-mouse-button-click into any summary column will synchronise all
+   windows to show the beginning of the same group of lines (as explained
+   in section <link linkend="synchronise_views">"Setting The Current Group And Synchronising Merge And Diff View Position"</link>).
+</para><para>
+   The button bar also contains nine navigation buttons with which you can
+   jump to the current/first/last difference, to the next/previous difference
+   (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup),
+   or to the next/previous unsolved conflict. Note that for &kdiff3; a "conflict"
+   that was not automatically solved at the start of the merge stays a "conflict"
+   even if it is solved. Hence the necessity to distinguish "unsolved conflicts".
+</para>
+<sect2 id="autoadvance"><title>Auto-Advance</title>
+<para>
+   There also is a button "Automatically go to next unsolved conflict after
+   source selection" (Auto-Advance). If you enable this, then, when one source
+   is selected, &kdiff3; will jump to and select the next unsolved conflict
+   automatically. This can help when you always want to choose one source only.
+   When you need both sources, or you want to edit after selecting, then you
+   probably want to switch this off. Before proceeding to the next unsolved conflict
+   &kdiff3; shows you the effect of your choice for a short time. This delay is
+   adjustable in the Diff- &amp; Merge-Settings: You can
+   specify the "Auto-Advance delay" in milli seconds between 0 and 2000. Hint:
+   Tired of many clicks? - Use a small Auto-Advance-delay and the shortcuts
+   Ctrl-1/2/3 to select A/B/C for many conflicts.
+</para>
+</sect2>
+</sect1>
+
+<sect1 id="selections"><title>Select, Copy And Paste</title>
+<para>
+   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
+   button   again. You can also select a word by double clicking it. In the merge
+   output   editor you can also select via the keyboard by holding the "shift"-button
+   and navigation with the cursor keys.
+</para><para>
+   If the selection exceeds the visible range you can move the mouse over the 
+   window borders which causes &kdiff3; to scroll in that direction. 
+</para><para>
+   For very large selections you can also use the navigation keys while holding down 
+   the mouse. E.g. use page up and page down to quickly go to a certain position. At the 
+   end position release the mouse button.
+</para><para>
+   In order to select everything in the current window use menu "Edit"->"Select All" (Ctrl-A).
+</para><para>
+   To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert).
+   But there exists an option "Auto Copy Selection". If this is enabled,
+   then whatever you select is copied immediately and you don't need to explicitely
+   copy. But pay attention when using this because the contents of the clipboard
+   might then be destroyed accidentally.
+</para><para>
+   "Cut" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the
+   selected text.
+</para><para>
+   "Paste" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at the 
+   cursorposition or over the current selection.
+   If you paste to either diff input window the contents of the clipboard will 
+   be shown in that window and the comparison will restart immediately. This is 
+   useful if you want to quickly grab a piece of text from somewhere and 
+   compare it with something else without first creating files.
+</para>
+</sect1>
+
+<sect1 id="saving"><title>Saving</title>
+<para>
+   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
+   it will be deleted. When you exit or start another diff-analysis and data
+   wasn't saved yet, then &kdiff3; will ask if you want to save, cancel or proceed
+   without saving. (&kdiff3; does not catch any signals. So if you "kill" &kdiff3;
+   then your data will be lost.)
+</para><para>
+   Line endings are saved according to the normal method on the underlying
+   operating system. For Unices each line ends with an linefeed-character "\n",
+   while for Win32-based systems each line ends with a carriage-return + a linefeed
+   "\r\n". &kdiff3; does not preserve the line-endings of the input files, which
+   also means that you shouldn't use &kdiff3; with binary files.
+</para>
+</sect1>
+
+<sect1 id="find"><title>Finding Strings</title>
+<para>
+   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.
+   Searching will always start at the top. Use the "Find Next"-command (F3)
+   to proceed to the next occurrence. If you select to search several windows then the first
+   window will be searched from top to bottom before the search starts in the next
+   window at the top again, etc.
+</para>
+</sect1>
+
+<sect1 id="printing"><title>Printing</title>
+<para>
+   &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.
+</para><para>
+   There are several possibilities to adjust the range. Due to different printing 
+   dialogs on different operating systems, the method to achieve certain range selections varies.
+</para>
+<variablelist>
+   <varlistentry><term>All:</term><listitem><para>Print everything.</para></listitem></varlistentry>
+   <varlistentry><term>Current:</term><listitem><para>Print a page starting at the first visible line in the window. 
+       (On systems without this option this can be achived by specifying page number 10000 for printing.)</para></listitem></varlistentry>
+   <varlistentry><term>Selection:</term><listitem><para>
+       Before choosing to print select text with the mouse (like for copy and paste) 
+       in one of the diff input windows to define the start and end line. If no text 
+       in one of the diff input windows was selected, then this won't be an available 
+       choice. (On systems without this option this can be achived by specifying page 
+       number 9999 for printing.)</para></listitem></varlistentry>
+   <varlistentry><term>Range:</term><listitem><para>Specify the first and last page.
+       </para></listitem></varlistentry>
+</variablelist>
+<para>
+   Other important options for printing will be taken from the normal options:
+</para><itemizedlist>
+   <listitem><para>Font, font size</para></listitem>
+   <listitem><para>Show line numbers</para></listitem>
+   <listitem><para>Word wrap</para></listitem>
+   <listitem><para>Colors</para></listitem>
+   <listitem><para>etc.</para></listitem>
+</itemizedlist>
+<para>
+   Landscape formatting is also recommended for printing.
+</para>
+</sect1>
+
+<sect1 id="options"><title>Options</title>
+<para>
+   Options and the recent-file-list will be saved when you exit the program,
+   and reloaded when you start it. (Menu Settings->Configure &kdiff3; ...)
+</para>
+<sect2><title>Font</title>
+<para>
+   Select a fixed width font. (On some systems this dialog will also
+   present    variable width fonts, but you should not use them.)
+</para>
+<variablelist>
+   <varlistentry><term><emphasis>Italic Font for Deltas:</emphasis></term><listitem><para> If you select this, then text differences
+       will be drawn with the italic version of the selected font. If the font
+       doesn't  support italic, then this does nothing.</para>
+   </listitem></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2><title>Colors</title>
+<variablelist>
+   <varlistentry><term><emphasis>Foreground color:</emphasis></term><listitem><para> Usually black. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Background color:</emphasis></term><listitem><para> Usually white. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Diff Background color:</emphasis></term><listitem><para> Usually light gray. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Color A:</emphasis></term><listitem><para> Usually dark blue. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Color B:</emphasis></term><listitem><para> Usually dark green. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Color C:</emphasis></term><listitem><para> Usually dark magenta. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Conflict Color:</emphasis></term><listitem><para> Usually red.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Current range background color:</emphasis></term><listitem><para> Usually light yellow.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Current range diff background color:</emphasis></term><listitem><para> Usually dark yellow.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Color for manually selected diff ranges:</emphasis></term><listitem><para> Usually orange.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Newest file color in directory comparison:</emphasis></term><listitem><para> Usually green.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Oldest file color in directory comparison:</emphasis></term><listitem><para> Usually red.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Middle age file color in directory comparison:</emphasis></term><listitem><para> Usually dark yellow.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Color for missing files in directory comparison:</emphasis></term><listitem><para> Usually black.</para></listitem></varlistentry>
+</variablelist>
+<para>
+   Changing the colors for directory comparison will be effective only when starting the next directory comparison.
+</para>
+<para>
+   On systems with only 16 or 256 colors some colors are not available in pure
+   form. On such systems the "Defaults"-button will choose a pure color.
+</para>
+</sect2>
+
+<sect2><title>Editor Settings</title>
+<variablelist>
+   <varlistentry><term><emphasis>Tab inserts spaces:</emphasis></term><listitem><para> If this is disabled and you press the
+      tabulator key,   a tab-character is inserted, otherwise the appropriate
+      amount  of characters   is inserted.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>   Tab size:</emphasis></term><listitem><para> Can be adjusted for your specific needs. Default is 8. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>   Auto indentation:</emphasis></term><listitem><para> When pressing Enter or Return the indentation
+      of the previous  line is used for the new line. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>   Auto copy selection:</emphasis></term><listitem><para> Every selection is immediately copied
+      to the clipboard   when active and you needn't explicitely copy it. </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>   Line end style:</emphasis></term><listitem><para> When saving you can select what line 
+      end style you prefer. The default setting is the common choice for the used operating system. </para></listitem></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="diffoptions"><title>Diff Settings</title>
+<para>
+   When comparing files, &kdiff3; first it tries to match lines that are equal
+   in all input files. Only during this step it might ignore white space. The
+   second step compares each line. In this step white space will not be ignored.
+   Also during the merge white space will not be ignored.
+</para>
+
+<variablelist>
+   <varlistentry><term><emphasis>Preserve Carriage Return:</emphasis></term><listitem><para> Some editors (on some systems) save
+      carriage return '\r' and linefeed '\n'-characters at the end of line, while
+      others will only save the linefeed '\n'. Usually &kdiff3; ignores the carriage
+      return, but then files that don't have equal sizes, look equal in side by
+      side comparison. When this option is on, then the carriage return characters
+      are made visible but are treated as white space. This option must be off
+      during a merge. Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Ignore numbers:</emphasis></term><listitem><para> Default is off. Number characters ('0'-'9', '.', '-')
+      will be ignored  in the first  part of the analysis in which the line matching is
+      done. In the result the differences will be shown nevertheless, but they are treated
+      as white space.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Ignore C/C++ comments:</emphasis></term><listitem><para> Default is off.
+      Changes in comments will be treated like changes in white space.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Ignore case:</emphasis></term><listitem><para>  Default is off. 
+      Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Preprocessor-Command:</emphasis></term><listitem><para>
+   See <link linkend="preprocessors">next section</link>.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Line-Matching Preprocessor-Command:</emphasis></term><listitem><para>
+   See <link linkend="preprocessors">next section</link>.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Try Hard:</emphasis></term><listitem><para>
+      Try hard to find an even smaller delta. (Default is on.) This will probably
+      be effective for complicated and big files. And slow for very big files.
+   </para></listitem></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="mergeoptions"><title>Merge Settings</title>
+<variablelist>
+   <varlistentry><term><emphasis>Auto Advance Delay (ms):</emphasis></term><listitem><para> When in auto-advance-mode this setting specifies
+      how long to show the result of the selection before jumping to the next unsolved
+      conflict.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>White space 2/3-file merge default:</emphasis></term><listitem><para>
+      Automatically solve all white-space conflict by choosing the specified file.
+      (Default is manual choice.) Useful if white space really isn't important in many files.
+      If you need this only occasionally better use "Choose A/B/C For All Unsolved Whitespace Conflicts"
+      in the merge menu. Note that if you enable either "Ignore numbers" or "Ignore C/C++ comments"
+      then this auto-choice also applies for conflicts in numbers or comments.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Auto merge regular expression:</emphasis></term><listitem><para>
+      Regular expression for lines where &kdiff3; should automatically choose one source. See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Run regular expression auto merge on merge start:</emphasis></term><listitem><para>
+      If activated &kdiff3; runs the automatic merge using the "Auto merge regular expression" when a merge is started.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>History start regular expression:</emphasis></term><listitem><para>
+      Regular expression for the start of the merge history entry.
+      Usually this line contains the "&#36;Log&#36;"-keyword.
+      Default value: ".*\&#36;Log.*\&#36;.*"
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>History entry start regular expression:</emphasis></term><listitem><para>
+      A merge history entry consists of several lines.
+      Specify the regular expression to detect the first line (without the leading comment).
+      Use parentheses to group the keys you want to use for sorting.
+      If left empty, then &kdiff3; assumes that empty lines separate history entries.
+      See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>History merge sorting:</emphasis></term><listitem><para>
+      Enable version control history sorting.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>History entry start sort key order:</emphasis></term><listitem><para>
+      Each parentheses used in the regular expression for the history start entry
+      groups a key that can be used for sorting.
+      Specify the list of keys (that are numbered in order of occurrence
+      starting with 1) using ',' as separator (e.g. "4,5,6,1,2,3,7").
+      If left empty, then no sorting will be done.
+      See also <link linkend="vcskeywordsmergesupport">Automatic Merge ...</link>
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Merge version control history on merge start:</emphasis></term><listitem><para>
+      If activated &kdiff3; runs the automatic history merging using aforementioned options when a merge is started.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Max number of history entries:</emphasis></term><listitem><para>
+      &kdiff3; truncates the history list after the specified number of entries. Use -1 to avoid truncation. (Default is -1).
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Test your regular expressions</emphasis></term><listitem><para>
+      This button shows a dialog that allows you to improve and test the regular expressions above.
+      Just copy the respective data from your files into the example lines. The "Match results" 
+      will immediately show whether the match succeeds or not.
+      The "Sort key result" will display the key used for history merge sorting.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Irrelevant merge command:</emphasis></term><listitem><para>
+      Specify a command of your own that should be called when &kdiff3; detects 
+      that for a three file merge the file from B doesn't contribute any 
+      relevant data that isn't already contained in the file from C.
+      The command is called with the three filenames as parameters.
+      Data matched by the "Auto merge regular expression" or in the 
+      history isn't considered relevant.
+   </para></listitem></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2><title>Directory Merge</title>
+<para>
+   These options are concerned with scanning the directory and handling the
+   merge: See the <link linkend="dirmergeoptions">Directory Comparison/Merge
+   Docs</link> for details.
+</para><para>
+Yet there is one option here that is also relevant for saving single files:
+</para>
+<variablelist>
+   <varlistentry><term><emphasis>Backup files:</emphasis></term><listitem><para> When a file is saved and an older version already
+      exists, then the original version will be renamed with an ".orig" extension.
+      If an old backup file with ".orig" extension already exists then this will
+      be deleted without backup.
+   </para></listitem></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2><title>Regional and Language Options</title>
+  <variablelist>
+    <varlistentry><term><emphasis>Language:</emphasis></term><listitem><para>Adjust the language of the user interface. Changing this option doesn't affect the running program. You have to exit and restart &kdiff3; so that the language is changed. (This option is not available in the KDE version of &kdiff3; because the language is adjustable in the global KDE settings.) 
+	</para></listitem></varlistentry>
+    <varlistentry><term><emphasis>Use the same encoding for everything:</emphasis></term><listitem><para> The following encoding options can be adjusted separately for each item or if this option is true, all values will take the first value.
+	</para></listitem></varlistentry>
+    <varlistentry><term><emphasis>Local Encoding:</emphasis></term><listitem><para>Above the codec-selectors appears a note that tells you what the local encoding is. (This is not adjustable but for your information just in case you don't know your local encoding, but need to select it.)
+	</para></listitem></varlistentry>
+    <varlistentry><term><emphasis>File Encoding for A/B/C:</emphasis></term><listitem><para> 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.
+	</para></listitem></varlistentry>
+    <varlistentry><term><emphasis>File Encoding for Merge Output and Saving:</emphasis></term><listitem><para> When you have edited a file, then you can adjust which encoding will be used when saving to disk.
+	</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.
+	</para></listitem></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2><title>Miscellaneous</title>
+<para>(These options and actions are available in menus or the buttonbar.)</para>
+<variablelist>
+  <varlistentry><term><emphasis>Show line numbers:</emphasis></term><listitem><para> You can select if line numbers should be
+     shown for the input files.</para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Show space and tabulator characters for differences:</emphasis></term><listitem><para> Sometimes
+     the visible spaces and tabs are disturbing. You can turn this off.</para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Show white space:</emphasis></term><listitem><para> Turn this off to suppress
+      any highlighting of white-space-only changes in the text or overview-columns.
+      (Note that this also applies to changes in numbers or comments if the options "Ignore numbers"
+      or "Ignore C/C++ comments" are active.)</para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Overview options:</emphasis></term><listitem><para>
+     These choices are only available when you compare three files. In normal mode all
+     differences are shown in one color-coded overview-column. But sometimes you are  
+     especially interested in the differences between only two of these three files.
+     Selecting "A vs. B", "A vs. C" or "B vs. C"-overview will show a second overview 
+     column with the required information next to the normal overview.
+  </para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Word wrap diff windows:</emphasis></term><listitem><para>
+     Wrap lines when their length would exceed the width of a window.
+  </para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Show Window A/B/C:</emphasis></term><listitem><para> Sometimes you want to use the space on
+      the screen better for long lines. Hide the windows that are not important.
+      (In the Windows-menu.)</para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Toggle Split Orientation:</emphasis></term><listitem><para>
+      Switch between diff windows shown next to each other (A left of B left of C) or above
+      each other (A above B above C). This should also help for long lines. (In the Windows-menu.)
+      </para></listitem></varlistentry>
+  <varlistentry><term><emphasis>Start a merge quickly:</emphasis></term><listitem><para>
+      Sometimes you are viewing the deltas and decide to merge.
+      <inlinemediaobject><imageobject><imagedata fileref="merge_current.png" format="PNG"/></imageobject></inlinemediaobject>
+      "Merge current file" in the Directory-menu also works if you only compare
+      two files. A single click starts the merge and uses the filename of the last
+      input-file as the default output filename. (When this is used to restart
+      a merge, then the output filename will be preserved.)</para></listitem></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"><title>Configuring Keyboard-Shortcuts</title>
+<para>
+   Currently only the KDE-version supports user-configurable keyboard-shortcuts.
+   (Menu Settings->Configure Shortcuts...)
+</para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"><title>Preprocessor Commands</title>
+<para>
+&kdiff3; supports two preprocessor options.
+</para><para>
+<variablelist>
+   <varlistentry><term><emphasis>Preprocessor-Command:</emphasis></term><listitem><para>
+      When any file is read, it will be piped through this external command.
+      The output of this command will be visible instead of the original file.
+      You can write your own preprocessor that fulfills your specific needs.
+      Use this to cut away disturbing parts of the file, or to automatically
+      correct the indentation etc.
+   </para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Line-Matching Preprocessor-Command:</emphasis></term><listitem><para>
+      When any file is read, it will be piped through this external command. If
+      a preprocessor-command (see above) is also specified, then the output of the
+      preprocessor is the input of the line-matching preprocessor.
+      The output will only be used during the line matching phase of the analysis.
+      You can write your own preprocessor that fulfills your specific needs.
+      Each input line must have a corresponding output line.
+   </para></listitem></varlistentry>
+</variablelist>
+</para>
+<para>
+The idea is to allow the user greater flexibility while configuring the diff-result.
+But this requires an external program, and many users don't want to write one themselves.
+The good news is that very often <command>sed</command> or <command>perl</command> 
+will do the job. 
+</para>
+<para>Example: Simple testcase: Consider file a.txt (6 lines):
+<screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen>
+And file b.txt (3 lines):
+<screen>
+      cg
+      dg
+      eg
+</screen>
+Without a preprocessor the following lines would be placed next to each other:
+<screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen>
+This is probably not wanted since the first letter contains the actually interesting information.
+To help the matching algorithm to ignore the second letter we can use a line matching preprocessor 
+command, that replaces 'g' with 'a':
+<screen>
+   <command>sed</command> 's/g/a/'
+</screen>
+With this command the result of the comparison would be:
+<screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen>
+Internally the matching algorithm sees the files after running the line matching preprocessor,
+but on the screen the file is unchanged. (The normal preprocessor would change the data also on 
+the screen.)
+</para>
+
+<sect2 id="sedbasics"><title><command>sed</command> Basics</title>
+<para>
+This section only introduces some very basic features of <command>sed</command>. For more
+information see <ulink url="info:/sed">info:/sed</ulink> or 
+<ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html">
+http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink>.
+A precompiled version for Windows can be found at <ulink url="http://unxutils.sourceforge.net">
+http://unxutils.sourceforge.net</ulink>.
+Note that the following examples assume that the <command>sed</command>-command is in some 
+directory in the PATH-environment variable. If this is not the case, you have to specify the full absolute
+path for the command. 
+</para>
+<note><para>Also note that the following examples use the single quotation mark (') which won't work for Windows. 
+On Windows you should use the double quotation marks (") instead.</para></note>
+<para>
+In this context only the <command>sed</command>-substitute-command is used:
+<screen>
+   <command>sed</command> 's/<replaceable>REGEXP</replaceable>/<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'
+</screen>
+Before you use a new command within &kdiff3;, you should first test it in a console.
+Here the <command>echo</command>-command is useful. Example:
+<screen>
+   <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/'
+   -> obrakadabra
+</screen>
+This example shows a very simple sed-command that replaces the first occurance 
+of "a" with "o". If you want to replace all occurances then you need the "g"-flag:
+<screen>
+   <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g'
+   -> obrokodobro
+</screen>
+The "|"-symbol is the pipe-command that transfers the output of the previous 
+command to the input of the following command. If you want to test with a longer file
+then you can use <command>cat</command> on Unix-like systems or <command>type</command> 
+on Windows-like systems. <command>sed</command> will do the substitution for each line.
+<screen>
+   <command>cat</command> <replaceable>filename</replaceable> | <command>sed</command> <replaceable>options</replaceable>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"><title>Examples For <command>sed</command>-Use In &kdiff3;</title>
+<sect3><title>Ignoring Other Types Of Comments</title>
+<para>
+Currently &kdiff3; understands only C/C++ comments. Using the
+Line-Matching-Preprocessor-Command you can also ignore
+other types of comments, by converting them into C/C++-comments.
+
+Example: To ignore comments starting with "#", you would like to convert them
+to "//". Note that you also must enable the "Ignore C/C++-Comments" option to get 
+an effect. An appropriate Line-Matching-Preprocessor-Command would be:
+
+<screen>
+   <command>sed</command> 's/#/\/\//'
+</screen>
+Since for <command>sed</command> the "/"-character has a special meaning, it is necessary to place the 
+"\"-character before each "/" in the replacement-string. Sometimes the "\" is required
+to add or remove a special meaning of certain characters. The single quotation marks (') before 
+and after the substitution-command are important now, because otherwise the shell will
+try to interpret some special characters like '#', '$' or '\' before passing them to 
+<command>sed</command>. <emphasis>Note that on Windows you will need the double quotation marks (") here. Windows
+substitutes other characters like '%', so you might have to experiment a little bit.</emphasis>
+</para>
+</sect3>
+<sect3><title>Caseinsensitive Diff</title>
+<para>
+Use the following Line-Matching-Preprocessor-Command to convert all input to uppercase:
+<screen>
+   <command>sed</command> 's/\(.*\)/\U\1/'
+</screen>
+Here the ".*" is a regular expression that matches any string and in this context matches 
+all characters in the line. 
+The "\1" in the replacement string refers to the matched text within the first pair of "\(" and "\)".
+The "\U" converts the inserted text to uppercase.
+</para>
+</sect3>
+
+<sect3><title>Ignoring Version Control Keywords</title>
+<para>
+CVS and other version control systems use several keywords to insert automatically
+generated strings (<ulink url="info:/cvs/Keyword substitution">info:/cvs/Keyword substitution</ulink>).
+All of them follow the pattern "$KEYWORD generated text$". We now need a
+Line-Matching-Preprocessor-Command that removes only the generated text:
+<screen>
+   <command>sed</command> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen>
+The "\|" separates the possible keywords. You might want to modify this list 
+according to your needs.
+The "\" before the "$" is necessary because otherwise the "$" matches the end of the line.
+</para>
+<para>
+While experimenting with <command>sed</command> you might come to understand and even like
+these regular expressions. They are useful because there are many other programs that also 
+support similar things.
+</para>
+</sect3>
+
+<sect3><title>Ignoring Numbers</title>
+<para>
+Ignoring numbers actually is a built-in option. But as another example, this is how
+it would look as a Line-Matching-Preprocessor-command.
+<screen>
+   <command>sed</command> 's/[0123456789.-]//g'
+</screen>
+Any character within '[' and ']' is a match and will be replaced with nothing.
+</para>
+</sect3>
+
+<sect3><title>Ignoring Certain Columns</title>
+<para>
+Sometimes a text is very strictly formatted, and contains columns that you always want to ignore, while there are
+other columns you want to preserve for analysis. In the following example the first five columns (characters) are 
+ignored, the next ten columns are preserved, then again five columns are ignored and the rest of the line is preserved.
+<screen>
+   <command>sed</command> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen>
+Each dot '.' matches any single character. The "\1" and "\2" in the replacement string refer to the matched text within the first 
+and second pair of "\(" and "\)" denoting the text to be preserved.
+</para>
+</sect3>
+
+<sect3><title>Combining Several Substitutions</title>
+<para>
+Sometimes you want to apply several substitutions at once. You can then use the 
+semicolon ';' to separate these from each other. Example:
+<screen>
+   <command>echo</command> abrakadabra | <command>sed</command> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3><title>Using <command>perl</command> instead of <command>sed</command></title>
+<para>
+Instead of <command>sed</command> you might want to use something else like 
+<command>perl</command>.
+<screen>
+   <command>perl</command> -p -e 's/<replaceable>REGEXP</replaceable>/<replaceable>REPLACEMENT</replaceable>/<replaceable>FLAGS</replaceable>'
+</screen>
+But some details are different in <command>perl</command>. Note that where 
+<command>sed</command> needed "\(" and "\)" <command>perl</command>
+requires the simpler "(" and ")" without preceding '\'. Example:
+<screen>
+   <command>sed</command> 's/\(.*\)/\U\1/'
+   <command>perl</command> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2><title>Order Of Preprocessor Execution</title>
+<para>
+The data is piped through all internal and external preprocessors in the 
+following order:
+</para>
+<itemizedlist>
+<listitem><para>Normal preprocessor,</para></listitem>
+<listitem><para>Line-Matching-Preprocessor,</para></listitem>
+<listitem><para>Ignore case (conversion to uppercase),</para></listitem>
+<listitem><para>Detection of C/C++ comments,</para></listitem>
+<listitem><para>Ignore numbers,</para></listitem>
+<listitem><para>Ignore white space</para></listitem>
+</itemizedlist>
+<para>
+The data after the normal preprocessor will be preserved for display and merging. The
+other operations only modify the data that the line-matching-diff-algorithm sees.
+</para><para>
+In the rare cases where you use a normal preprocessor note that 
+the line-matching-preprocessor sees the output of the normal preprocessor as input.
+</para>
+</sect2>
+
+<sect2><title>Warning</title>
+<para>
+The preprocessor-commands are often very useful, but as with any option that modifies
+your texts or hides away certain differences automatically, you might accidentally overlook 
+certain differences and in the worst case destroy important data.
+</para><para>
+For this reason during a merge if a normal preprocessor-command is being used &kdiff3; 
+will tell you so and ask you if it should be disabled or not. 
+But it won't warn you if a Line-Matching-Preprocessor-command is active. The merge will not complete until
+all conflicts are solved. If you disabled "Show White Space" then the differences that
+were removed with the Line-Matching-Preprocessor-command will also be invisible. If the 
+Save-button remains disabled during a merge (because of remaining conflicts), make sure to enable 
+"Show White Space". If you don't wan't to merge these less important differences manually
+you can select "Choose [A|B|C] For All Unsolved White space Conflicts" in the Merge-menu.
+</para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"><title>Directory Comparison and Merge with &kdiff3;</title>
+<sect1 id="dirmergeintro"><title>Introduction into Directory Comparison and Merge</title>
+<para>
+   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!
+</para><para>
+   Even though comparing and merging directories seems to be quite obvious,
+   there are several details that you should know about. Most important is of
+   course the fact that now many files might be affected by each operation.
+   If you don't have backups of your original data, then it can be very hard
+   or even impossible to return to the original state. So before starting a merge,
+   make sure that your data is safe, and going back is possible. If you make
+   an archive or use some version control system is your decision, but even
+   experienced programmers and integrators need the old sources now and then.
+   And note that even though I (the author of &kdiff3;) try to do my best, I can't
+   guarantee that there are no bugs. According to the GNU-GPL there is NO WARRANTY
+   whatsoever for this program. So be humble and always keep in mind:
+</para>
+<blockquote><para>
+   <emphasis>To err is human, but to really mess things up you need a computer.</emphasis>
+</para></blockquote>
+<para>
+So this is what this program can do for you: &kdiff3; ...
+</para>
+<itemizedlist>
+     <listitem><para>... reads and compares two or three directories recursively,</para></listitem>
+     <listitem><para>... takes special care of symbolic links,</para></listitem>
+     <listitem><para>... lets you browse files on mouse double click,</para></listitem>
+     <listitem><para>... for each item proposes a merge operation, which you can change
+                         before starting the directory merge,</para></listitem>
+     <listitem><para>... lets you simulate the merge and lists the actions that would
+                         take  place, without actually doing them,</para></listitem>
+     <listitem><para>... lets you really do the merge, and lets you interact whenever
+                         manual interaction is needed,</para></listitem>
+     <listitem><para>... lets you run the selected operation for all items (key F7) or the selected item (key F6),</para></listitem>
+     <listitem><para>... lets you continue the merge after manual interaction with key F7,</para></listitem>
+     <listitem><para>... optionally creates backups, with the ".orig" extension,</para></listitem>
+     <listitem><para>...</para></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"><title>Starting Directory Comparison Or Merge</title>
+<para>
+   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.
+</para>
+<sect2><title>Compare/Merge two directories: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable>
+   <command>kdiff3</command> <replaceable>dir1 dir2</replaceable> -o <replaceable>destdir</replaceable>
+</screen>
+<para>
+   If no destination directory is specified, then &kdiff3; will use <replaceable>dir2</replaceable>.
+</para>
+</sect2>
+
+<sect2><title>Compare/Merge three directories: </title>
+<screen>
+   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable>
+   <command>kdiff3</command> <replaceable>dir1 dir2 dir3</replaceable> -o <replaceable>destdir</replaceable>
+</screen>
+<para>
+   When three directories are merged then <replaceable>dir1</replaceable>
+   is used as the base for the merge.
+   If no destination directory is specified, then &kdiff3; will use <replaceable>dir3</replaceable>
+   as the  destination directory for the merge.
+</para>
+
+<para>
+   Note that only the comparison starts automatically, not the merge. For this you first must
+   select a menu entry or the key F7. (More details later.)
+</para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"><title>Directory Merge Visible Information</title>
+<para>
+   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.
+</para><para>
+   When the directory scan is complete then &kdiff3; will show a listbox with
+   the results left, ...
+</para>
+<screenshot><mediaobject>
+<imageobject><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject> <!--alt="Image of the directory browser."-->
+</mediaobject></screenshot>
+<para>
+   ... and details about the currently selected item on the right:
+</para>
+<screenshot><mediaobject>
+<imageobject><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject></screenshot>
+
+<sect2 id="name"><title>The Name Column</title>
+<para>
+   Each file and directory that was found during the scan is shown here in
+   a tree. You can select an item by clicking it with the mouse once.
+</para><para>
+   The directories are collapsed by default. You can expand and collapse
+   them by clicking on the "+"/"-" or by double-clicking the item or
+   by using  the left/right-arrow-keys. The "Directory"-menu also contains two
+   actions "Fold all subdirs" and "Unfold all subdirs" with which you can
+   collapse or expand all directories at once.
+</para><para>
+   If you double-click a file item then the file comparison starts and the
+   file-diff-window will appear.
+</para>
+<para>
+   The image in the name column reflects the file type in the first
+   directory  ("A"). It can be one of these:
+</para>
+<itemizedlist>
+     <listitem><para>Normal file</para></listitem>
+     <listitem><para>Normal directory (directory-image)</para></listitem>
+     <listitem><para>Link to a file (file-image with a link arrow)</para></listitem>
+     <listitem><para>Link to a directory (directory-image with a link arrow)</para></listitem>
+</itemizedlist>
+<para>
+   If the file type is different in the other directories, then this is visible
+   in the columns A/B/C and in the window that shows the details about the selected
+   item. Note that for such a case no merge operation can be selected automatically.
+   When starting the merge, then the user will be informed of problems of that
+   kind.
+</para>
+</sect2>
+
+<sect2 id="coloring"><title>The Columns A/B/C and the Coloring Scheme</title>
+<para>
+   As can be seen in the image above the colors red, green, yellow and black
+   are used in the columns A/B/C.
+</para>
+<itemizedlist>
+     <listitem><para>Black: This item doesn't exist in this directory.</para></listitem>
+     <listitem><para>Green: Newest item.</para></listitem>
+     <listitem><para>Yellow: Older than green, newer than red.</para></listitem>
+     <listitem><para>Red: Oldest item.</para></listitem>
+</itemizedlist>
+<para>
+   But for items that were identical in the comparison their color also is
+   identical even if the age is not.
+</para><para>
+   Directories are considered equal if all items they contain are identical.
+   Then they also will have the same color. But the age of a directory is not
+   considered for its color.
+</para><para>
+   The idea for this coloring scheme I came upon in
+   <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff">dirdiff</ulink>. The colors
+   resemble the colors of a leaf that is green when new, turns yellow later and red
+   when old.
+</para>
+
+</sect2><sect2 id="operation"><title>The Operation Column</title>
+<para>
+   After comparing the directories &kdiff3; also evaluates a proposal for a
+   merge  operation. This is shown in the "Operation" column. You can modify
+   the operation  by clicking on the operation you want to change. A small menu
+   will popup and allows you to select an operation for that item. (You can also
+   select the most needed operations via keyboard.
+   Ctrl+1/2/3/4/Del will select A/B/C/Merge/Delete respectively if available.)
+   This operation will be executed during the merge. It depends on the item and
+   on the merge-mode you are in, what operations are available. The merge-mode is one of
+</para>
+<itemizedlist>
+     <listitem><para>Three directory-merge ("A" is treated as older base of both).</para></listitem>
+     <listitem><para>Two directory-merge.</para></listitem>
+     <listitem><para>Two directory-sync-mode (activate via option "Synchronize Directories").</para></listitem>
+</itemizedlist>
+<para>
+   In three directory merge the operation proposal will be: If for an item ...
+</para>
+<itemizedlist>
+     <listitem><para>... all three directories are equal: Copy from C</para></listitem>
+     <listitem><para>... A and C are equal but B is not: Copy from B (or if B does not
+                         exist, delete the destination if exists)</para></listitem>
+     <listitem><para>... A and B are equal but C is not: Copy from C (or if C does not
+                         exist, delete the destination if exists)</para></listitem>
+     <listitem><para>... B and C are equal but A is not: Copy from C (or if C does not
+                         exist, delete the destination if exists)</para></listitem>
+     <listitem><para>... only A exists: Delete the destination (if exists)</para></listitem>
+     <listitem><para>... only B exists: Copy from B</para></listitem>
+     <listitem><para>... only C exists: Copy from C</para></listitem>
+     <listitem><para>... A, B and C are not equal: Merge</para></listitem>
+     <listitem><para>... A, B and C don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</para></listitem>
+</itemizedlist>
+<para>
+   In two directory merge the operation proposal will be: If for an item ...
+</para>
+<itemizedlist>
+     <listitem><para>... both directories are equal: Copy from B</para></listitem>
+     <listitem><para>... A exists, but not B: Copy from A</para></listitem>
+     <listitem><para>... B exists, but not A: Copy from B</para></listitem>
+     <listitem><para>... A and B exist but are not equal: Merge</para></listitem>
+     <listitem><para>... A and B don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</para></listitem>
+</itemizedlist>
+<para>
+   Sync-mode is active if only two directories and no explicit destination
+   were specified and if the option "Synchronize directories" is active. &kdiff3;
+   then selects a default operation so that both directories are the same afterwards.
+   If for an item ...
+</para>
+<itemizedlist>
+     <listitem><para>... both directories are equal: Nothing will be done.</para></listitem>
+     <listitem><para>... A exists, but not B: Copy A to B</para></listitem>
+     <listitem><para>... B exists, but not A: Copy B to A</para></listitem>
+     <listitem><para>... A and B exist, but are not equal: Merge and store the result
+                         in  both directories. (For the user the visible save-filename is B,
+                         but then &kdiff3; copies B also to A.)</para></listitem>
+     <listitem><para>... A and B don't have the same file type (e.g. A is a directory,
+                         B is a file): "Error: Conflicting File Types". While such items exist the
+                         directory merge cannot start.</para></listitem>
+</itemizedlist>
+<para>
+   When two directories are merged and the option "Copy newer instead of merging" is selected,
+   then &kdiff3; looks at the dates and proposes to choose the newer file. If the files are not
+   equal but have equal dates, then the operation will contain
+   "Error: Dates are equal but files are not." While such items exist the
+   directory merge cannot start.
+</para>
+</sect2>
+
+<sect2 id="status"><title>The Status Column</title>
+<para>
+   During the merge one file after the other will be processed. The status
+   column will show "Done" for items where the merge operation has succeeded,
+   and other texts if something unexpected happened. When a merge is complete,
+   then you should make a last check to see if the status for all items is
+   agreeable.
+</para>
+</sect2>
+
+<sect2 id="statisticscolulmns"><title>Statistics Columns</title>
+<para>
+   When the file comparison mode "Full Analysis" is enabled in the options, then
+   &kdiff3; will show extra columns containing the numbers of unsolved, solved, nonwhite and whitespace
+   conflicts. (The solved-column will only show when comparing or merging three directories.)
+</para>
+</sect2>
+
+<sect2 id="selectingvisiblefiles"><title>Selecting Listed Files</title>
+<para>   
+   Several options influence which files are listed here. Some are accessible in the 
+   <link linkend="dirmergeoptions">settings dialog</link>. The Directory-menu contains the entries:
+</para><para><itemizedlist>
+     <listitem><para>"Show Identical Files": Files that have been detected equal in all input directories.</para></listitem>
+     <listitem><para>"Show Different Files": Files that exist in two or more directories but are not equal.</para></listitem>
+     <listitem><para>"Show Files only in A": Files that exist only in A, but not in B or C.</para></listitem>
+     <listitem><para>"Show Files only in B": Files that exist only in B, but not in A or B.</para></listitem>
+     <listitem><para>"Show Files only in C": Files that exist only in C, but not in A or B.</para></listitem>
+</itemizedlist></para>
+<para>
+   Activate only the "Show"-options for the items you want listed. If for example you only want to list all items that 
+   exist either in A or in B but not in both, you'll have to activate "Show Files only in A" and "Show Files only in B" 
+   and deactivate all others ("Show Identical Files", "Show Different Files", "Show Files only in C").
+   The list will be updated immediately to reflect the change.
+</para><para>
+   These options also apply for directories with one exception: Disabling "Show Different Files" will not hide 
+   any complete directories. This will work only for files within.
+</para><para>
+   Note that of these only the "Show Identical Files"-option is persistant. The others are enabled when starting &kdiff3;. 
+</para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"><title>Doing A Directory Merge</title>
+<para>
+   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.
+</para><para>
+   Be aware that if you didn't specify a destination directory explicitely,
+   then the destination will be "C" in three directory mode, "B" in two directory
+   merge mode, and in sync-mode it will be "A" or/and "B".
+</para><para>
+   If you have specified a destination directory also check that all items
+   that should be in the output, are in the tree. There are some options that
+   cause certain items to be omitted from the directory comparison and merge.
+   Check these options to avoid unpleasant surprises:
+</para>
+<itemizedlist>
+     <listitem><para>"Recursive Directories": If this is off, then items in subdirectories
+                     will not be found.</para></listitem>
+     <listitem><para>"Pattern"/"Anti-Pattern": Include/exclude items that match</para></listitem>
+     <listitem><para>"Exclude Hidden Files"</para></listitem>
+     <listitem><para><link linkend="selectingvisiblefiles">"Show"-options</link> (Show Identical/Different Files, Files only in A/B/C)</para></listitem>
+</itemizedlist>
+<para>
+   If you change the settings in order to list more files, you must do a rescan via menu "Directory"->"Rescan" yourself.
+   (The reason for this is that for faster comparison-speed &kdiff3; omits the comparison for files suppressed by these criteria.)
+   If you changed your file and dir patterns to exclude files, then the file-list will immediately be updated on closing
+   the options-dialog.
+</para><para>
+   Note that when you write to a completely new directory then you usually also want to copy the identical files.
+   In that case enable the "Show Identical Files"-option. If your destination-directory is one of the inputs, 
+   then this isn't necessary because the file is already there.
+</para><para>
+   If you are satisfied so far, the rest is easy.
+</para><para>
+   To merge all items: Select "Start/Continue directory merge" in the "Directory"-menu
+   or press F7 (which is the default shortcut).
+   To merge only the current item: Select "Run Operation For Current Item"
+   or press F6.
+</para><para>
+   If due to conflicting filetypes still some items with invalid operations
+   exist, then a messagebox will appear and these items will be pointed out,
+   so you can select a valid operation for the item.
+</para><para>
+   If you merge all items a dialog will appear giving you the options "Do it", "Simulate
+   it" and "Cancel".
+</para>
+<itemizedlist>
+     <listitem><para>Select "Simulate it" if you want to see what would be done without
+                     actually doing it. A verbose list of all operations will be shown.</para></listitem>
+     <listitem><para>Otherwise select "Do it" to really start merging.</para></listitem>
+</itemizedlist>
+<para>
+   Then &kdiff3; will run the specified operation for all items. If manual
+   interaction  is required (single file merge), then a merge window will open
+   (<link linkend="dirmergebigscreenshot">see the big screenshot</link>).
+</para><para>
+   When you have finished with manually merging a file, again select "Start/Continue directory
+   merge" or the key F7. If you haven't saved it yet, a dialog will ask you to
+   do so. Then &kdiff3; will continue with the next item.
+</para><para>
+   When &kdiff3; encounters an error, it will tell you so and will show the
+   verbose-status-information. At the bottom of this list, there will be some
+   error messages which should help you to understand the cause of the problem.
+   When you continue merging (F7 key) &kdiff3; will give you the choice to retry
+   or skip the item that caused the problem. This means that before continuing
+   you can choose another operation or solve the problem by other means.
+</para><para>
+   When the merge is complete, then &kdiff3; will inform you via a message
+   box.
+</para><para>
+   If some items were merged individually before running the directorymerge then 
+   &kdiff3; remembers this (while this
+   merge-session goes on), and doesn't merge them again when later the merge for
+   all items is run. Even when the merge was skipped or nothing was saved these
+   items count as completed. Only when you change the merge operation the 
+   "Done"-status of the item will be removed and it can be merged again.
+</para>
+</sect1>
+
+<sect1 id="dirmergeoptions"><title>Options for Comparing and Merging Directories</title>
+<para>
+   The &kdiff3;-preferences (menu "Settings"-&gt;"Configure &kdiff3;") has
+   a section called "Directory Merge" with these options:
+</para>
+
+<variablelist>
+   <varlistentry><term><emphasis>Recursive Directories:</emphasis></term><listitem><para> Select whether to search directories
+         recursively.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>File Pattern(s):</emphasis></term><listitem><para> Only files that match any pattern here will
+         be put in the tree. More than one pattern may be specified here by using
+         the semicolon ";" as separator. Valid wildcards: '*' and '?'. (e.g. "*.cpp;*.h").
+         Default is "*". This pattern is not used on directories.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>File Anti-Pattern(s):</emphasis></term><listitem><para> Files that match this pattern
+         will be excluded from the tree. More than one pattern may be specified here
+         via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
+         is "*.orig;*.o;*.obj".</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Directory Anti-Pattern(s):</emphasis></term><listitem><para> Directories that match this pattern
+         will be excluded from the tree. More than one pattern may be specified here
+         via using the semicolon ";" as separator. Valid wildcards: '*' and '?'. Default
+         is "CVS;deps;.svn".</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Use CVS-Ignore:</emphasis></term><listitem><para>
+         Ignore files and directories that would also be ignored by CVS.
+         Many automatically generated files are ignored by CVS.
+         The big advantage is that this can be directory specific via a local ".cvsignore"-file.
+         (See <ulink url="info:/cvs/cvsignore">info:/cvs/cvsignore</ulink>.)</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Find Hidden Files and Directories:</emphasis></term><listitem><para> On some file systems files
+         have an "Hidden"-attribute. On other systems a filename starting with a dot
+         "." causes it to be hidden. This option allows you to decide whether to
+         include  these files in the tree or not. Default is on.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Follow File Links:</emphasis></term><listitem><para> For links to files: When disabled, then
+         the symbolic links are compared. When enabled, then the files behind the
+         links are compared. Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Follow Directory Links:</emphasis></term><listitem><para> For links to directories: When disabled,
+         then the symbolic links will be compared. When enabled then the link will
+         be treated like a directory and it will be scanned recursively. (Note that
+         the program doesn't check if the link is "recursive". So for example a directory
+         that contains a link to the directory would cause an infinite loop, and after
+         some time when the stack overflows or all memory is used up, crash the program.)
+         Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Case Sensitive Filename Comparison:</emphasis></term><listitem><para> 
+         Default is false on Windows, true for other operating systems.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>File Comparison Mode:</emphasis></term><listitem><para>
+<variablelist>            
+   <varlistentry><term><emphasis>Binary Comparison:</emphasis></term><listitem><para>
+         This is the default file comparison mode.
+         </para></listitem></varlistentry>         
+   <varlistentry><term><emphasis>Full Analysis:</emphasis></term><listitem><para>
+         Do a full analysis of each file and show the statistics information columns.
+         (Number of solved, unsolved, nonwhite and white conflicts.)
+         The full analysis is slower than a simple binary analysis, and much
+         slower when used on files that don't contain text. 
+         (Specify the appropriate file-antipatterns.)
+         </para></listitem></varlistentry>         
+   <varlistentry><term><emphasis>Trust the modification date:</emphasis></term><listitem><para> If you compare big directories
+         over a slow network, it might be faster to compare the modification dates
+         and file length alone. But this speed improvement comes with the price of
+         a little uncertainty. Use this option with care. Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Trust the size:</emphasis></term><listitem><para>
+         Similar to trusting the modification date. No real comparison happens. Two
+         files are considered equal if their file-sizes are equal. This is useful
+         when the file-copy operation didn't preserve the modification date.
+         Use this option with care. Default is off.</para></listitem></varlistentry>
+</variablelist></para></listitem></varlistentry>
+         
+   <varlistentry><term><emphasis>Synchronize Directories:</emphasis></term><listitem><para> Activates "Sync-Mode" when two directories
+         are compared and no explicit destination directory was specified. In this
+         mode the proposed operations will be chosen so that both source directories
+         are equal afterwards. Also the merge result will be written to both directories.
+         Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Copy newer instead of merging:</emphasis></term><listitem><para> Instead of merging the proposed
+         operation will copy the newer source if changes happened. (Considered unsafe,
+         because it implies that you know, that the other file hasn't been edited
+         too. Check to make sure in every case.) Default is off.</para></listitem></varlistentry>
+   <varlistentry><term><emphasis>Backup files:</emphasis></term><listitem><para> If a file or complete directory is replaced
+         by  another or is deleted then the original version will be renamed with an
+         ".orig"  extension. If an old backup file with ".orig" extension already exists
+         then  this will be deleted without backup. This also affects the normal merging
+         of single files, not only in directory-merge mode. Default is on.</para></listitem></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"><title>Other Functions in Directory Merge Window</title>
+<sect2><title>Split/Full Screen Mode</title>
+<para>
+   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,
+   you can disable "Split Screen View" in the "Directory"-menu. Then you can
+   use "Toggle View" in the "Directory"-menu to switch between the file list
+   and the text-diff view that then occupy the full screen.
+</para>
+</sect2>
+<sect2><title>Comparing or Merging a Single File</title>
+<para>
+   Probably you will prefer a simple double mouse click on a file in order
+   to compare it. Nevertheless there also exists an entry in the "Directory"-menu.
+   You can also directly merge a single file by selecting it and 
+   choosing "Merge current file" in the "Merge"-Menu. On saving the
+   result, the status will be set to done, and the file will not be merged again
+   if a directory merge is started.
+</para><para>
+   But note that this status information will be lost when you rerun a directory
+   scan: "Directory"-menu: "Rescan"
+</para>
+</sect2>
+<sect2><title>Comparing or Merging Files with Different Names</title>
+<para>
+   Sometimes you need to compare or merge files with different names (e.g. the current 
+   file and the backup in the same folder).
+</para><para>
+   Select the exact file by clicking onto the icon in the column A, B or C. The first 
+   file selected thus will be marked with an "A", the second and third with "B" and "C" 
+   regardless on what column they are in. Only up to three files can be chosen like this.
+</para><para>
+   Proceed by choosing "Compare Explicitely Selected Files" or "Merge Explicitely 
+   Selected Files" from the "Directory"-menu. For your convenience these menu entries 
+   also appear as context menu when you right-click the last selected file.
+</para><para>
+   The comparison or merge of a file will happen in the same window. 
+   If this method is used for directories a new window will be opened.
+</para></sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title>Miscellaneous Topics</title>
+<sect1 id="networktransparency">
+<title>Networktransparency via KIO</title>
+<sect2><title>KIO-Slaves</title>
+<para>
+KDE supports networktransparency via KIO-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.
+</para><para>
+Example:
+</para><para>
+<screen>
+   <command>kdiff3</command> test.cpp  ftp://ftp.faraway.org/test.cpp
+   <command>kdiff3</command> tar:/home/hacker/archive.tar.gz/dir ./dir
+</screen>
+</para>
+<para>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.
+</para><para>
+Other KIO-slaves that are interesting are:
+</para>
+<itemizedlist>
+<listitem><para>Files from the WWW (http:),</para></listitem>
+<listitem><para>Files from the FTP (ftp:),</para></listitem>
+<listitem><para>Encrypted file transfer (fish:, sftp:),</para></listitem>
+<listitem><para>Windows-ressources (smb:),</para></listitem>
+<listitem><para>Local files (file:),</para></listitem>
+</itemizedlist>
+<para>
+Other things that are possible, but probably less useful are:
+</para>
+<itemizedlist>
+<listitem><para>Man-pages (man:),</para></listitem>
+<listitem><para>Info-pages (info:),</para></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2><title>How To Write URLs</title>
+<para>
+   An URL has a different syntax compared with paths for local files and directories.
+   Some things should be considered:
+</para>
+<itemizedlist>
+<listitem><para>
+   A path can be relative and can contain "." or "..". This is not possible for URLs
+   which are always absolute.
+</para></listitem><listitem><para>
+   Special characters must be written with "escaping". ("#"->"%23", space->"%20", etc.)
+   E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23".
+</para></listitem><listitem><para>
+   When URLs don't work as expected, try to open them in Konqueror first.
+</para></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2><title>Capabilities of KIO-Slaves</title>
+<para>
+   Networktransparency has one drawback: Not all ressources have the same cababilities.
+</para><para>
+   Sometimes this is due to the file system of the server, sometimes due to the protocol.
+   Here is a short list of restrictions:
+</para>
+<itemizedlist>
+<listitem><para>
+   Sometimes there is no support for links.
+</para></listitem><listitem><para>
+   Or there is no way to distinguish if a link points to a file or a directory; always
+   assuming a file. (ftp:, sftp:).
+</para></listitem><listitem><para>
+   Can't always determine the filesize.
+</para></listitem><listitem><para>
+   Limited support for permissions.
+</para></listitem><listitem><para>
+   No possibility to modify permissions or modification time, so permissions or time
+   of a copy will differ from the original. (See the option "Trust the size".)
+   (To modify permissions or modification time is only possible for local files.)
+</para></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title>Using &kdiff3; as a KPart</title>
+<para>
+&kdiff3; is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
+</para><para>
+It's main use is as difference-viewer in KDevelop. KDevelop always starts the
+internal difference viewer first. To invoke &kdiff3; press the right mouse button
+on the difference viewer window and select "Show in KDiff3Part" from the contextmenu.
+</para><para>
+&kdiff3; normally requires two complete files as input. When used as part &kdiff3;
+will assume that the inputfile is a patch-file in the unified format. &kdiff3;
+then retrieves the original filenames from the patch-file. At least one of
+the two files must be available. &kdiff3; will then invoke <command>patch</command> to
+recreate the second file.
+</para><para>
+In Konqueror you can select a patch-file and select "Preview in"-"KDiff3Part" from
+the contextmenu. Be aware that this won't work if none of the original files are
+available, and it is not reliable if the original file(s) have changed since the
+patch-file was generated.
+</para><para>
+When run as a part &kdiff3; only provides the a two-file-diff, a very small toolbar
+and menu. Merging or directory-comparison are not supported then.
+</para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title>Questions and Answers</title>
+
+&reporting.bugs;
+&updating.documentation;
+
+<qandaset id="faqlist">
+
+<qandaentry><question><para>
+   Why is it called "&kdiff3;"?
+</para></question><answer><para>
+   Tools named "KDiff" and "KDiff2" (now called "Kompare") already exist. Also "KDiff3" should suggest
+   that it can merge like the "diff3"-tool in the Diff-Tool collection.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Why did I release it under GPL?
+</para></question><answer><para>
+   I'm using GPL programs for a very long time now and learned very much
+   by  having a look at many of the sources. Hence this is my "Thank You"
+   to   all  programmers that also did so or will do the same.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Some buttons and functions are missing. What's wrong?
+</para></question><answer><para>
+   You compiled from source but you probably didn't specify the correct KDE-prefix
+   with configure. By default configure wants to install in /usr/local but then KDE can't
+   find the user-interface ressource file (i.e. kdiff3ui.rc). The README-file contains
+   more information about the correct prefix.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Often lines that are similar but not identical appear next to each other
+   but sometimes not. Why?
+</para></question><answer><para>
+   Lines where only the amount of white space characters is different
+   are   treated as "equal" at first, while just one different non-white character
+   causes the lines to be "different". If similar lines appear next to each
+   other, this actually is coincidence but this fortunately is often the case.
+   See also <link linkend="manualdiffhelp">Manual Diff Help</link>.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Why must all conflicts be solved before the merge result can be saved?
+</para></question><answer><para>
+   For each equal or different section the editor in the merge result
+   window    remembers where it begins or ends. This is needed so that conflicts
+   can  be solved manually by simply selecting the source button (A, B or C).
+   This  information is lost while saving as text and it is too much effort to
+   create  a special file format that supports saving and restoring all necessary
+   information.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   How can I synchronise the diff and merge views, so that all views show the same text position?
+</para></question><answer><para>
+  Click into the summary column left of the text. (<link linkend="synchronise_views">See also here.</link>)
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Why does the editor in the merge result window not have an "undo"-function?
+</para></question><answer><para>
+  This was too much effort until now. You can always
+  restore a version from one source (A, B or C) by clicking the respective
+  button. For big editing the use of another editor is recommended anyway.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   When I removed some text, then suddenly "&lt;No src line&gt;" appeared
+   and cannot be deleted. What does that mean and how can one remove this?
+</para></question><answer><para>
+   For each equal or different section the editor in the merge result
+   window    remembers where it begins or ends. "&lt;No src line&gt;" means
+   that    there is nothing left in a section, not even a new line character.
+   This  can happen either while merging automatically or by editing. This is
+   no problem,   since this hint won't appear in the saved file. If you want
+   the orignal source  back just select the section (click on the left summary
+   column) and then click the source button with the needed contents (A/B or
+   C).
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Why doesn't &kdiff3; support syntax-highlighting?
+</para></question><answer><para>
+   &kdiff3; already uses many colors for difference highlighting. More
+   highlighting    would be confusing. Use another editor for this.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Can I use &kdiff3; to compare OpenOffice.Org, Word, Excel, PDF-, &etc; files?
+</para></question><answer><para>
+   Although &kdiff3; will analyse any kind of file the result will probably
+   not be very satisfactory for you.
+</para><para>
+   &kdiff3; was made to compare pure text files. OpenOffice, Word, Excel etc.
+   store much more information in the files (about fonts, pictures, pages,
+   colors etc.) which &kdiff3; doesn't know about. So &kdiff3; will 
+   show you the contents of the file interpreted as pure text, but 
+   this might be unreadable or at least it will look very odd.
+</para><para>
+   Since most programs nowadays store their contents in XML-format, you might 
+   be able to read it as pure text. So if the change was only small,
+   &kdiff3; still might help you.
+</para><para>
+   The best solution if you only want to compare the text (without embedded 
+   objects like pictures) is to use "Select All" and "Copy" in your program 
+   to copy the interesting text to the clipoard and then in &kdiff3; paste the 
+   text into either diff input window. 
+   (See also <link linkend="selections">Select, Copy And Paste</link>.)
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   Where has the the directory option "List only deltas" gone?
+</para></question><answer><para>
+   There are now several <link linkend="selectingvisiblefiles">"Show"-options</link> in the directory menu.
+   Disabling "Show identical files" will achieve what enabling "List only deltas" used to do.
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   How can I make a big selection in the diff input window
+   because scrolling takes so long?
+</para></question><answer><para>
+   Start the selection as usual (click and hold the left mouse button). 
+   Then use the navigation keys (e.g. page up, page down) while holding the left mouse button down.
+   (See also <link linkend="selections">Select, Copy And Paste</link>.)
+</para></answer></qandaentry>
+
+<qandaentry><question><para>
+   There is so much information here, but your question is still not answered?
+</para></question><answer><para>
+   Please send me your question. I appreciate every comment.
+</para></answer></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title>Credits and License</title>
+
+<para>
+&kdiff3; - File and Directory Comparison and Merge Tool
+</para>
+<para>
+Program copyright 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>
+</para>
+<para>
+Several cool ideas and bugreports came from colleagues and many people out in the Wild Wild Web. Thank you!
+</para>
+
+<para>
+Documentation Copyright &copy; 2002-2007 Joachim Eibl <email>joachim.eibl at gmx.de</email>
+</para>
+
+<!-- TRANS:CREDIT_FOR_TRANSLATORS -->
+
+&underFDL;               <!-- FDL: do not remove -->
+
+
+&underGPL;        	 <!-- GPL License -->
+
+</chapter>
+
+<appendix id="installation">
+<title>Installation</title>
+
+<sect1 id="getting-kdiff3">
+<title>How to obtain &kdiff3;</title>
+
+<para>
+You can download the latest version of &kdiff3; from its homepage <ulink url="http://kdiff3.sourceforge.net">http://kdiff3.sourceforge.net</ulink>.
+</para><para>
+&kdiff3; is also available for other platforms. See the homepage for details.
+</para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title>Requirements</title>
+
+<para>
+   In order to successfully use all features of &kdiff3;, you need &kde; >3.1.
+</para><para>
+   For information about how to run &kdiff3; on other platforms without KDE please see the
+   <ulink url="http://kdiff3.sourceforge.net">homepage</ulink>.
+</para><para>
+You can find a list of changes at <ulink
+url="http://kdiff3.sourceforge.net/ChangeLog">http://kdiff3.sourceforge.net/ChangeLog</ulink>
+or in the "ChangeLog"-file of the source package.
+</para>
+</sect1>
+
+<sect1 id="compilation">
+<title>Compilation and Installation</title>
+
+<para>In order to compile and install &kdiff3; on a system with KDE, type the
+following in the base directory of the &kdiff3; distribution:</para>
+
+<screen><prompt>%</prompt> <userinput><command>./configure --prefix=<replaceable>kde-dir</replaceable></command></userinput>
+<prompt>%</prompt> <userinput><command>make</command></userinput>
+<prompt>%</prompt> <userinput><command>make</command> install</userinput>
+</screen>
+<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>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>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/en/index.html b/doc/en/index.html
new file mode 100644
index 0000000..6f9a4a8
--- /dev/null
+++ b/doc/en/index.html
@@ -0,0 +1,16 @@
+<html><head><title>The KDiff3 Handbook</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="description" content="
+   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.
+ 
+   This document describes KDiff3-version 0.9.92.
+"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">The <span class="application">KDiff3</span> Handbook</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div class="navCenter"> </div></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2421696"></a>The <span class="application">KDiff3</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="firstname">Joachim</span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="surname">Eibl</span> <code class="email">&lt;joachim.eibl at gmx.de&gt;</code></p></div></div><div>Revision <span class="releaseinfo">0.9.92 (<span class="date">2007-31-03</span>)</span></div><div><p class="copyright">Copyright © 2002-2007 Joachim Eibl</p></div><div><div class="legalnotice"><a name="id2564266"></a><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 in <a href="credits.html#gnu-fdl">the section entitled "GNU Free Documentation License"</a>.</p></div></div><div><div><div class="abstract"><p>
+   <span class="application">KDiff3</span> is a file and directory diff and merge tool which
+<div class="itemizedlist"><ul type="disc"><li><p>compares and merges two or three text input files or directories,</p></li><li><p>shows the differences line by line and character by character(!),</p></li><li><p>provides an automatic merge-facility,</p></li><li><p>has an editor for comfortable solving of merge-conflicts,</p></li><li><p>provides networktransparency via KIO,</p></li><li><p>has options to highlight or hide changes in white-space or comments,</p></li><li><p>supports Unicode, UTF-8 and other file encodings,</p></li><li><p>prints differences,</p></li><li><p>supports version control keyword and history merging.</p></li></ul></div>
+</p><p>
+   This document describes <span class="application">KDiff3</span>-version 0.9.92.
+</p></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="introduction.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="introduction.html#why">Yet Another Diff Frontend?</a></span></dt><dt><span class="sect1"><a href="screenshots.html">Screenshots and Features</a></span></dt><dt><span class="sect1"><a href="features.html">More Features</a></span></dt><dd><dl><dt><span class="sect2"><a href="features.html#id2490911"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#id2490942"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#id2490972"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#id2491007"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#id2491031">And ...</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="documentation.html">2. File Comparison And Merge</a></span></dt><dd><dl><dt><span class="sect1"><a href="documentation.html#commandline">Command-Line Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="documentation.html#id2488302">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488321">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488352">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488370">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488418">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488444">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488514">Other command line options</a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488593">Ignorable command line options</a></span></dt></dl></dd><dt><span class="sect1"><a href="opendialog.html">Open-Dialog</a></span></dt><dt><span class="sect1"><a href="pasteinput.html">Paste and Drop Input</a></span></dt><dt><span class="sect1"><a href="interpretinginformation.html">Comparing Files And Interpreting The Information In The Input Windows</a></span></dt><dd><dl><dt><span class="sect2"><a href="interpretinginformation.html#id2564410">Info Line</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564428">Coloring</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564454">Summary Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564475">Overview Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#manualdiffhelp">Manually Aligning Lines</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#joinsplitsections">Manually Joining and Splitting Diff Sections</a></span></dt></dl></dd><dt><span class="sect1"><a href="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="merging.html#id2564630">The Summary Column</a></span></dt><dt><span class="sect2"><a href="merging.html#synchronise_views">Setting The Current Group And Synchronising Merge And Diff View Position</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564684">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564761">Choosing Input A, B, or C for All Conflicts</a></span></dt><dt><span class="sect2"><a href="merging.html#vcskeywordsmergesupport">Automatic Merge of Version Control Keywords and History (Log)</a></span></dt></dl></dd><dt><span class="sect1"><a href="navigation.html">Navigation And Editing</a></span></dt><dd><dl><dt><span class="sect2"><a href="navigation.html#autoadvance">Auto-Advance</a></span></dt></dl></dd><dt><span class="sect1"><a href="selections.html">Select, Copy And Paste</a></span></dt><dt><span class="sect1"><a href="saving.html">Saving</a></span></dt><dt><span class="sect1"><a href="find.html">Finding Strings</a></span></dt><dt><span class="sect1"><a href="printing.html">Printing</a></span></dt><dt><span class="sect1"><a href="options.html">Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="options.html#id2566321">Font</a></span></dt><dt><span class="sect2"><a href="options.html#id2566353">Colors</a></span></dt><dt><span class="sect2"><a href="options.html#id2566534">Editor Settings</a></span></dt><dt><span class="sect2"><a href="options.html#diffoptions">Diff Settings</a></span></dt><dt><span class="sect2"><a href="options.html#mergeoptions">Merge Settings</a></span></dt><dt><span class="sect2"><a href="options.html#id2566994">Directory Merge</a></span></dt><dt><span class="sect2"><a href="options.html#id2567038">Regional and Language Options</a></span></dt><dt><span class="sect2"><a href="options.html#id2567171">Miscellaneous</a></span></dt><dt><span class="sect2"><a href="options.html#shortcuts">Configuring Keyboard-Shortcuts</a></span></dt></dl></dd><dt><span class="sect1"><a href="preprocessors.html">Preprocessor Commands</a></span></dt><dd><dl><dt><span class="sect2"><a href="preprocessors.html#sedbasics"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> Basics</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#sedforkdiff3">Examples For <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-Use In <span class="application">KDiff3</span></a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567900">Order Of Preprocessor Execution</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2567963">Warning</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="dirmerge.html">3. Directory Comparison and Merge with <span class="application">KDiff3</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="dirmerge.html#dirmergeintro">Introduction into Directory Comparison and Merge</a></span></dt><dt><span class="sect1"><a href="startingdirmerge.html">Starting Directory Comparison Or Merge</a></span></dt><dd><dl><dt><span class="sect2"><a href="startingdirmerge.html#id2568158">Compare/Merge two directories: </a></span></dt><dt><span class="sect2"><a href="startingdirmerge.html#id2568202">Compare/Merge three directories: </a></span></dt></dl></dd><dt><span class="sect1"><a href="dirmergevisible.html">Directory Merge Visible Information</a></span></dt><dd><dl><dt><span class="sect2"><a href="dirmergevisible.html#name">The Name Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#coloring">The Columns A/B/C and the Coloring Scheme</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#operation">The Operation Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#status">The Status Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#statisticscolulmns">Statistics Columns</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#selectingvisiblefiles">Selecting Listed Files</a></span></dt></dl></dd><dt><span class="sect1"><a href="dothemerge.html">Doing A Directory Merge</a></span></dt><dt><span class="sect1"><a href="dirmergeoptions.html">Options for Comparing and Merging Directories</a></span></dt><dt><span class="sect1"><a href="other.html">Other Functions in Directory Merge Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="other.html#id2569323">Split/Full Screen Mode</a></span></dt><dt><span class="sect2"><a href="other.html#id2569341">Comparing or Merging a Single File</a></span></dt><dt><span class="sect2"><a href="other.html#id2569364">Comparing or Merging Files with Different Names</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="misc.html">4. Miscellaneous Topics</a></span></dt><dd><dl><dt><span class="sect1"><a href="misc.html#networktransparency">Networktransparency via KIO</a></span></dt><dd><dl><dt><span class="sect2"><a href="misc.html#id2569419">KIO-Slaves</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569517">How To Write URLs</a></span></dt><dt><span class="sect2"><a href="misc.html#id2569553">Capabilities of KIO-Slaves</a></span></dt></dl></dd><dt><span class="sect1"><a href="kpart.html">Using <span class="application">KDiff3</span> as a KPart</a></span></dt></dl></dd><dt><span class="chapter"><a href="faq.html">5. Questions and Answers</a></span></dt><dt><span class="chapter"><a href="credits.html">6. Credits and License</a></span></dt><dt><span class="appendix"><a href="installation.html">A. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></dd></dl></div></div><div style="background-color: #white; color: black;                  margin-top: 20px; margin-left: 20px;                  margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div align="center"> </div></div><div style="background-color: #white;   color: black;         margin-left: 20px;   margin-right: 20px;"><div class="navLeft"> </div><div class="navRight"> Introduction</div><div class="navCenter"> </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>
\ No newline at end of file
diff --git a/doc/en/installation.html b/doc/en/installation.html
new file mode 100644
index 0000000..4ec8498
--- /dev/null
+++ b/doc/en/installation.html
@@ -0,0 +1,6 @@
+<html><head><title>Appendix A. Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="credits.html" title="Chapter 6. Credits and License"><link rel="next" href="requirements.html" title="Requirements"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Installation</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="credits.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="requirements.html">Next</a></div><div class="navCenter"> </div></div><div class="appendix" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="installation"></a>Appendix A. Installation</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain <span class="application">KDiff3</span></a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-kdiff3"></a>How to obtain <span class="application">KDiff3</span></h2></div></div></div><p>
+You can download the latest version of <span class="application">KDiff3</span> from its homepage <a href="http://kdiff3.sourceforge.net" target="_top">http://kdiff3.sourceforge.net</a>.
+</p><p>
+<span class="application">KDiff3</span> is also available for other platforms. See the homepage for details.
+</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="credits.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="requirements.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">Credits and License </div><div class="navRight"> Requirements</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/interpretinginformation.html b/doc/en/interpretinginformation.html
new file mode 100644
index 0000000..90c15fd
--- /dev/null
+++ b/doc/en/interpretinginformation.html
@@ -0,0 +1,68 @@
+<html><head><title>Comparing Files And Interpreting The Information In The Input Windows</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="pasteinput.html" title="Paste and Drop Input"><link rel="next" href="merging.html" title="Merging And The Merge Output Editor Window"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Comparing Files And Interpreting The Information In The Input Windows</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="pasteinput.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="merging.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="interpretinginformation"></a>Comparing Files And Interpreting The Information In The Input Windows</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564410"></a>Info Line</h3></div></div></div><p>
+   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. 
+   (Note that window "C" is  optional.) Each info line appears in a different color.
+</p><p>
+   When you selected another file via browsing or finished editing the filename here 
+   by pressing enter, the new file will be loaded and 
+   compared with the already loaded file(s).
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564428"></a>Coloring</h3></div></div></div><p>
+   The three input windows are assigned the letters "A", "B" and "C".
+   "A"   has  color blue, "B" has green and "C" has magenta. (These are the
+   defaults,   but  can be changed in the Settings-Menu.)
+</p><p>
+   When a difference is detected then the color shows which input file
+   differs.   When both other input files differ then the color used to express
+   this is   red by default ("Conflict color" in the Settings).
+   This colorscheme is especially useful in the case of three input files, which will be
+   seen in the next section (<a href="merging.html" title="Merging And The Merge Output Editor Window">Merging</a>).
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564454"></a>Summary Column</h3></div></div></div><p>
+   Left of each text is the "summary column". If differences occurred on a
+   line then the summary column shows the respective color. For a white-space-only
+   difference the summary is chequered. For programming languages where white
+   space is not so important this is useful to see at one glance if anything
+   of importance was modified. (In C/C++ white space is only interesting within
+   strings, comments, for the preprocessor, and some only very esoteric situations.)
+</p><p>
+   The vertical line separating the summary column and the text is interrupted
+   if the input file had no lines there. When word-wrap is enabled then this vertical 
+   line appears dotted for wrapped lines.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564475"></a>Overview Column</h3></div></div></div><p>
+   On the right side a "overview"-column is visible left of the vertical scrollbar.
+   It shows the compressed summary column of input "A". All the differences
+   and conflicts are visible at one glance. When only two input windows are
+   used, then all differences appear red here because every difference is
+   also   a conflict. A black rectangle frames the visible part of the inputs.
+   For  very long input files, when the number of input lines is bigger than
+   the height of the overview column in pixels, then several input lines share
+   one overview line. A conflict then has top priority over simple differences,
+   which have priority over no change, so that no difference or conflict is
+   lost here.  By clicking into this overview column the corresponding text
+   will be shown.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="manualdiffhelp"></a>Manually Aligning Lines</h3></div></div></div><p>
+   Sometimes the algorithm places the wrong lines next to each other. Or you want to compare 
+   one piece of text with text at a completely different position in the other file.
+   For these situations you can manually instruct <span class="application">KDiff3</span> to align certain lines. 
+   Mark the text for which you want to improve the alignment with the mouse as you would 
+   for copy and paste in the first diff view and then choose "Add Manual Diff Alignment" 
+   in the "Diffview"-menu (keyboard shortcut "Ctrl-Y") . An orange bar will appear in 
+   the summary column next to the chosen text. Repeat this for the second and 
+   (if available) third diff view. <span class="application">KDiff3</span> will immediately recalculate the differences everytime you do this.
+   and will align the chosen lines. Of course some of the previously matching lines in between 
+   might not match anymore.
+</p><p>
+   Currently merging doesn't support the use of manual diff help.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="joinsplitsections"></a>Manually Joining and Splitting Diff Sections</h3></div></div></div><p>
+   In some cases <span class="application">KDiff3</span> will see too many or too few diff sections for merging. In such a 
+   case you can join or split existing sections.
+</p><p>
+   Add new sections by first selecting text in the lines that belong together in either input window (as for copying to the clipboard). 
+   Then choose "Split Diff At Selection" in the "Merge" menu.
+   Splits will be added above the first line and below the last line of the selected text.
+   If you only want to add one section, then select text beginning at another section-split.
+</p><p>
+   For joining sections in either input window select something in the lines from the sections to join.
+   (You can join several sections in one step too.) Then choose "Join selected Diffs" in the "Merge"-menu.
+</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="pasteinput.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="merging.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">Paste and Drop Input </div><div class="navRight"> Merging And The Merge Output Editor Window</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>
\ No newline at end of file
diff --git a/doc/en/introduction.html b/doc/en/introduction.html
new file mode 100644
index 0000000..d7c2429
--- /dev/null
+++ b/doc/en/introduction.html
@@ -0,0 +1,32 @@
+<html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="screenshots.html" title="Screenshots and Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Introduction</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="index.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="screenshots.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="why"></a>Yet Another Diff Frontend?</h2></div></div></div><p>
+Several graphical diff tools exist. Why choose <span class="application">KDiff3</span>? Let me say, why I wrote it.
+</p><p>
+<span class="application">KDiff3</span> started because I had to do a difficult merge. Merging is necessary when several
+people work on the same files in a project. A merge can be somewhat automated, when the
+merge-tool not only has the new modified files (called "branches"), but also the original file
+(called "base"). The merge tool will automatically choose any modification that was only
+done in one branch. When several contributors change the same lines, then the merge tool
+detects a conflict which must be solved manually.
+</p><p>
+The merge then was difficult because one contributor had changed many things and corrected
+the indentation in many places. Another contributor also had changed much text in the same file,
+which resulted in several merge conflicts.
+</p><p>
+The tool I used then, only showed the changed lines, but not what had changed within these
+lines. And there was no information about where only the indentation was changed. The merge
+was a little nightmare.
+</p><p>
+So this was the start. The first version could show differences within a line and showed white space differences.
+Later many other features were added to increase the usefulness.
+</p><p>
+For example if you want to compare some text quickly, then you can copy it to the clipboard and
+paste it into either diff window.
+</p><p>
+A feature that required a big effort was the directory comparison and merge facility, which turned
+the program almost into a full file browser.
+</p><p>
+I hope <span class="application">KDiff3</span> works for you too. Have fun!
+</p><p>
+Joachim Eibl (2003)
+</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="index.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="screenshots.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">The <span class="application">KDiff3</span> Handbook </div><div class="navRight"> Screenshots and Features</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/iteminfo.png b/doc/en/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/en/iteminfo.png
diff --git a/doc/en/kdiff3.1 b/doc/en/kdiff3.1
new file mode 100644
index 0000000..3b9c492
--- /dev/null
+++ b/doc/en/kdiff3.1
@@ -0,0 +1,89 @@
+.TH "KDIFF3" "1" 
+.SH "NAME" 
+KDiff3 \(em compares two or three input files or directories 
+.SH "SYNOPSIS" 
+.PP 
+\fBKDiff3\fR [\fBQT options\fP]  [\fBKDE options\fP]  [\fBKDiff3 options\fP]  [\fB\fIFile1/base\fR\fP]  [\fB\fIFile2\fR\fP]  [\fB\fIFile3\fR\fP]  
+.SH "DESCRIPTION" 
+.PP 
+This manual page documents briefly the 
+\fBKDiff3\fR tool. 
+.PP 
+This manual page was written for the \fBDebian\fP distribution 
+because the original program does not have a manual page. 
+For comprehensive help, please see \fBkhelpcenter help:/kdiff3\fR. 
+ 
+.PP 
+\fBKDiff3\fR is a program that 
+ 
+.IP "   \(bu" 6 
+compares or merges two or three text input files or directories 
+.IP "   \(bu" 6 
+shows the differences line by line and character by character 
+.IP "   \(bu" 6 
+provides an automatic merge-facility and 
+.IP "   \(bu" 6 
+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.) 
+.IP "   \(bu" 6 
+Printing of differences 
+.IP "   \(bu" 6 
+Manual alignment of lines 
+.IP "   \(bu" 6 
+Automatic merging of version control history ($Log$) 	 
+.SH "OPTIONS" 
+.PP 
+This program follows the usual GNU command line syntax, 
+with long options starting with two dashes (`\-').  A summary of 
+options is included below. For a full summary of options, run 
+\fBKDiff3 \-\-help\fR. 
+ 
+.IP "\fB-m, \-\-merge\fP         " 10 
+Merge the input. 
+.IP "\fB-b, \-\-base file\fP         " 10 
+Explicit base file. For compatibility with certain tools. 
+.IP "\fB-o, \-\-output file\fP         " 10 
+Output file. Implies \-m. E.g.: \-o newfile.txt 
+.IP "\fB\-\-out file\fP         " 10 
+Output file, again. (For compatibility with certain tools.) 
+.IP "\fB\-\-auto\fP         " 10 
+No GUI if all conflicts are auto-solvable. (Needs \-o file) 
+.IP "\fB\-\-qall\fP         " 10 
+Don't solve conflicts automatically. (For compatibility...) 
+.IP "\fB-L1 alias\fP 		  " 10 
+Visible name replacement for first file/base file. 
+.IP "\fB-L2 alias\fP 		  " 10 
+Visible name replacement for second file. 
+.IP "\fB-L3 alias\fP 		  " 10 
+Visible name replacement for third file. 
+.IP "\fB-L, \-\-fname alias\fP 		  " 10 
+Visible name replacement. May by supplied for each input. 
+.IP "\fB\-\-cs string\fP 		  " 10 
+Change a setting, e. g. \-\-cs "AutoAdvance=1". 
+.IP "\fB\-\-confighelp\fP 		  " 10 
+Show a list of all settings and their values. 
+.IP "\fB\-\-config file \fP 		  " 10 
+Use a different settings file. 
+.IP "\fB\-\-author\fP 		  " 10 
+Show author of program. 
+.IP "\fB-v, \-\-version\fP 		  " 10 
+Show version of program. 
+.IP "\fB\-\-license\fP 		  " 10 
+Show license of program. 
+.SH "AUTHOR" 
+.PP 
+This manual page was written by Eike Sauer <eikes@cs.tu-berlin.de> for 
+the \fBDebian\fP system (but may be used by others).  Permission is 
+granted to copy, distribute and/or modify this document under 
+the terms of the GNU General Public License, Version 2 
+(or, at your option, any later version published by the Free 
+Software Foundation). 
+ 
+.PP 
+On Debian systems, the complete text of the GNU General Public 
+License can be found in /usr/share/common-licenses/GPL. 
+ 
+.\" created by instant / docbook-to-man, Tue 13 Nov 2007, 15:25 
diff --git a/doc/en/kpart.html b/doc/en/kpart.html
new file mode 100644
index 0000000..63094d3
--- /dev/null
+++ b/doc/en/kpart.html
@@ -0,0 +1,22 @@
+<html><head><title>Using KDiff3 as a KPart</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="prev" href="misc.html" title="Chapter 4. Miscellaneous Topics"><link rel="next" href="faq.html" title="Chapter 5. Questions and Answers"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Using <span class="application">KDiff3</span> as a KPart</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="misc.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="faq.html">Next</a></div><div class="navCenter">Miscellaneous Topics</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="kpart"></a>Using <span class="application">KDiff3</span> as a KPart</h2></div></div></div><p>
+<span class="application">KDiff3</span> is a KPart. Currently it implements the KParts::ReadOnlyPart-interface.
+</p><p>
+It's main use is as difference-viewer in KDevelop. KDevelop always starts the
+internal difference viewer first. To invoke <span class="application">KDiff3</span> press the right mouse button
+on the difference viewer window and select "Show in KDiff3Part" from the contextmenu.
+</p><p>
+<span class="application">KDiff3</span> normally requires two complete files as input. When used as part <span class="application">KDiff3</span>
+will assume that the inputfile is a patch-file in the unified format. <span class="application">KDiff3</span>
+then retrieves the original filenames from the patch-file. At least one of
+the two files must be available. <span class="application">KDiff3</span> will then invoke <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">patch</strong></span></span> to
+recreate the second file.
+</p><p>
+In Konqueror you can select a patch-file and select "Preview in"-"KDiff3Part" from
+the contextmenu. Be aware that this won't work if none of the original files are
+available, and it is not reliable if the original file(s) have changed since the
+patch-file was generated.
+</p><p>
+When run as a part <span class="application">KDiff3</span> only provides the a two-file-diff, a very small toolbar
+and menu. Merging or directory-comparison are not supported then.
+</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="misc.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="faq.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">Miscellaneous Topics </div><div class="navRight"> Questions and Answers</div><div class="navCenter"><a accesskey="u" href="misc.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>
\ No newline at end of file
diff --git a/doc/en/letter_by_letter.png b/doc/en/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/en/letter_by_letter.png
diff --git a/doc/en/merge_current.png b/doc/en/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/en/merge_current.png
diff --git a/doc/en/merging.html b/doc/en/merging.html
new file mode 100644
index 0000000..7331292
--- /dev/null
+++ b/doc/en/merging.html
@@ -0,0 +1,195 @@
+<html><head><title>Merging And The Merge Output Editor Window</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><link rel="next" href="navigation.html" title="Navigation And Editing"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Merging And The Merge Output Editor Window</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="interpretinginformation.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="navigation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging"></a>Merging And The Merge Output Editor Window</h2></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_merge.png"><hr></div></div><p>
+   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
+   contain conflicts.
+</p><p>
+   !!! Saving is disabled until all conflicts are resolved !!! (Use the "Go
+   to prev/next unsolved conflicts"-buttons to find the remaining conflicts.)
+</p><p>
+   With only two input files every difference is also a conflict that must
+   be solved manually.
+</p><p>
+   With three input files the first file is treated as base, while the
+   second   and third input files contain modifications. When at any line only
+   either   input B or input C have changed but not both then the changed source
+   will   automatically be selected. Only when B and C have changed on the same
+   lines,   then the tool detects a conflict that must be solved manually.
+   When B and C are the same, but not the same as A, then C is selected.
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564630"></a>The Summary Column</h3></div></div></div><p>
+   The merge output editor window also has a summary column on the left. It shows the
+   letter of the input from which a line was selected or nothing if all three
+   sources where equal on a line. For conflicts it shows a questionmark "?"
+   and the line shows "&lt;Merge Conflict&gt;", all in red. Because solving
+   conflicts  line by line would take very long, the lines are grouped into
+   groups that  have the same difference and conflict characteristics.
+   But only-white-space-conflicts are separated from non-white-space-conflicts
+   in order to ease the merging of files were the indentation changed for many
+   lines.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="synchronise_views"></a>Setting The Current Group And Synchronising Merge And Diff View Position</h3></div></div></div><p>
+   When clicking into  the summary column with the left mouse button in either
+   window then the beginning of the group belonging to that line will shown in all windows.
+   This group then becomes the "current group". It is highlighted with the
+   "Current range (diff) background color" and
+   a black bar appears on the left side of the text.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564684"></a>Choosing Inputs A, B or C For Current Conflict And Editing</h3></div></div></div><p>
+   The button bar below the menubar contains three input selector buttons 
+   containing the letters "A", "B" and "C". Click the input selector 
+   button to insert (or remove if already inserted) the lines from the respective source.
+   To choose the lines from several inputs click the respective buttons in the
+   needed order. For example if you want that the lines from "B" appear before 
+   the lines from "A" in the output, first click "B", then "A".
+</p><p>
+   If you use the auto-advance option 
+   (<a href="navigation.html#autoadvance" title="Auto-Advance">"Automatically go to next unsolved conflict after source selection"</a>),
+   you should disable this before choosing lines from several inputs or if you want to
+   edit the lines after your choice. Otherwise <span class="application">KDiff3</span> will jump to the next
+   conflict after choosing the first input.
+</p><p>
+   It is often helpful directly edit the merge output. 
+   The summary column will show "m" for every line that was manually modified. 
+   When for instance the differences are aligned in a way that simply choosing 
+   the inputs won't be satisfactory, then you can mark the needed text and use 
+   normal <a href="selections.html" title="Select, Copy And Paste">copy and paste</a> to put it into the merge output.
+</p><p>
+   Sometimes, when a line is removed either by automatic merge or by editing
+   and no other lines remain in that group, then the text &lt;No src line&gt;
+   will appear in that line. This is just a placeholder for the group for
+   when  you might change your mind and select some source again. This text won't
+   appear in the saved file or in any selections you want to copy and paste.
+</p><p>
+   The text "&lt;Merge Conflict&gt;" will appear in the clipboard if you
+   copy and   paste some text containing such a line. But still be careful to
+   do so.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2564761"></a>Choosing Input A, B, or C for All Conflicts</h3></div></div></div><p>
+   The normal merge will start by solving simple conflicts automatically.
+   But the "Merge"-menu provides some actions for other common needs.
+   If you have to select the same source for most conflicts, then you can
+   choose "A", "B" or "C" everywhere, or only for the remaining unsolved
+   conflicts, or for unsolved white space conflicts. If you want to decide every
+   single delta yourself, you can "Set deltas to conflicts". Or if you want to
+   return to the automatic choices of <span class="application">KDiff3</span> then select
+   "Automatically solve simple conflicts". <span class="application">KDiff3</span> then restarts the merge.
+   For actions that change your previous modifications <span class="application">KDiff3</span> will ask for your
+   confirmation before proceeding.
+</p><p>
+   Note: When choosing either source for unsolved white space conflicts and
+   the options "Ignore Numbers" or "Ignore C/C++ Comments" are used then changes in
+   numbers or comments will be treated like white space too.
+
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="vcskeywordsmergesupport"></a>Automatic Merge of Version Control Keywords and History (Log)</h3></div></div></div><p>
+Many version control systems support special keywords in the file. (e.g. "$Date$", 
+"$Header$", "$Author$", "$Log$" etc.) During the 
+check-in the version control system (VCS) changes these lines. For instance 
+"$Date$" will turn into "$Date: 2005/03/22 18:45:01 $". Since this line will 
+be different in every version of the file, it would require manual interaction 
+during the merge.
+</p><p>
+<span class="application">KDiff3</span> offers automatic merge for these items. For simple lines that match the 
+"Auto merge regular expression"-option in all input-files <span class="application">KDiff3</span> will choose 
+the line from B or - if available - from C. (Additionally it is necessary that the lines 
+in question line up in the comparison and the previous line contains no conflict.)
+This auto merge can either be run immediately after a merge starts (activate the option 
+"Run regular expression auto merge on merge start") or later via the merge 
+menu "Run Regular Expression Auto Merge".
+</p><p>
+Automatic merge for version control history (also called "log") is also supported.
+The history automerge can either run immediately when the merge starts by activating the 
+option "Merge version control history on merge start" or later via the merge menu 
+"Automatically Solve History Conflicts".
+</p><p>
+Usually the version control history begins with a line containing the keyword "$Log$".
+This must be matched by the "History start regular expression"-option.
+<span class="application">KDiff3</span> detects which subsequent lines are in the history by analysing the leading characters 
+that came before the "$Log$"-keyword. If the same "leading comment"-characters also appears in the following
+lines, then they are also included in the history.
+</p><p>
+During each check-in the VCS writes a unique line specifying version-, date- and time-information 
+followed by lines with user comments.
+These lines form one history-entry. This history section grows with every check-in and the 
+most recent entries appear at the top (after the history start line). 
+</p><p>
+When for parallel development two or more developers check-in a branch of the file then 
+the merge history will contain several entries that appear as conflicts during the merge 
+of the branches. Since merging these can become very tedious, <span class="application">KDiff3</span> offers support with two 
+possible strategies: Just insert the history information from both contributors at the top
+or sort the history information by a user defined key.
+</p><p>
+The just-insert-all-entries-method is easier to configure. <span class="application">KDiff3</span> just needs a method to
+detect, which lines belong to one history entry. Most VCS insert an empty line after each
+history entry. If there are no other empty lines, this is a sufficient criterion for <span class="application">KDiff3</span>.
+Just set an empty "History entry start regular expression". If the empty line criterion 
+isn't sufficient, you can specify a regular expression to detect the history entry start.
+</p><p>
+Note that <span class="application">KDiff3</span> will remove duplicate history entrys. If a history entry appeared several times
+in the history of a input file, only one entry will remain in the output.
+</p><p>
+If you want to sort the history, then you have to specify how the sort key should be built.
+Use parentheses in the "History entry start regular expression" to group parts of the regular 
+expression that should later be used for the sort key.
+Then specify the "History entry start sort key order" specifying a comma "," separated list of 
+numbers referring to the position of the group in the regular expression.
+</p><p>
+Because this is not so easy to get right immediately, you are able to test and improve
+the regular expressions and key-generation in a dedicated dialog by pressing the 
+"Test your regular expressions"-button.
+</p><p>Example: Assume a history that looks like this:
+<pre class="screen">
+/**************************************************************************
+** HISTORY:    $Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp $
+**
+**     \main\integration_branch_12   2 Apr 2001 10:45:41   tom
+**  Merged branch simon_branch_15.
+**
+**     \main\henry_bugfix_branch_7\1   30 Mar 2001 19:22:05   henry
+**  Improved the speed for subroutine convertToMesh().
+**  Fixed crash.
+**************************************************************************/
+</pre>
+The history start line matches the regular expression ".*\$Log.*\$.*". Then follow 
+the history entries.
+</p><p>
+The line with the "$Log$"-keyword begins with two "*" after which follows a space. 
+<span class="application">KDiff3</span> uses the first non-white-space string as "leading comment" and assumes that
+the history ends in the first line without this leading comment. In this example the
+last line ends with a string that also starts with two "*", but instead of a space 
+character more "*" follow. Hence this line ends the history.
+</p><p>
+If history sorting isn't required then the history entry start line regular expression
+could look like this. (This line is split in two because it wouldn't fit otherwise.)
+<pre class="screen">
+\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</pre>
+For details about regular expressions please see the
+<a href="http://doc.trolltech.com/3.3/qregexp.html#details" target="_top">regular expression documentation by Trolltech</a>.
+Note that "\s" (with lowercase "s") matches any white space and "\S" (with uppercase "S") matches any non-white-space.
+In our example the history entry start contains first the version info with reg. exp. "\\main\\\S+", the date consisting of day "[0-9]+", month "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" and year "[0-9][0-9][0-9][0-9]", the time "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" and finally the developers login name ".*".
+</p><p>
+Note that the "leading comment"-characters (in the example "**") will already be removed by <span class="application">KDiff3</span> 
+before trying to match, hence the regular expression begins with a match for none or more white-space characters "\s*".
+Because comment characters can differ in each file (e.g. C/C++ uses other comment characters than a Perl script)
+<span class="application">KDiff3</span> takes care of the leading comment characters and you should not specify them in the regular expression.
+</p><p>
+If you require a sorted history. Then the sortkey must be calculated. For this the 
+relevant parts in the regular expression must be grouped by parentheses. 
+(The extra parentheses can also stay in if history sorting is disabled.)
+<pre class="screen">
+\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</pre>
+The parentheses now contain 1. version info, 2. day, 3. month, 4. year, 5. time, 6. name. 
+But if we want to sort by date and time, we need to construct a key with the elements in a different order of appearance:
+First the year, followed by month, day, time, version info and name. Hence the sortkey order to specify is "4,3,2,5,1,6".
+</p><p>
+Because  month names aren't good for sorting ("Apr" would be first) <span class="application">KDiff3</span> detects in which order 
+the month names were given and uses that number instead ("Apr"-&gt;"04"). 
+And if a pure number is found it will be transformed to a 4-digit value with leading zeros for sorting.
+Finally the resulting sort key for the first history entry start line will be:
+<pre class="screen">
+2001 04 0002 10:45:41 integration_branch_12   tom 
+</pre>
+</p><p>
+For more information also see <a href="options.html#mergeoptions" title="Merge Settings">Merge Settings</a>.
+</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="interpretinginformation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="navigation.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">Comparing Files And Interpreting The Information In The Input Windows </div><div class="navRight"> Navigation And Editing</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>
\ No newline at end of file
diff --git a/doc/en/misc.html b/doc/en/misc.html
new file mode 100644
index 0000000..34b13cf
--- /dev/null
+++ b/doc/en/misc.html
@@ -0,0 +1,49 @@
+<html><head><title>Chapter 4. Miscellaneous Topics</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="other.html" title="Other Functions in Directory Merge Window"><link rel="next" href="kpart.html" title="Using KDiff3 as a KPart"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Miscellaneous Topics</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="other.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="kpart.html">Next</a></div><div class="navCenter"> </div></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="misc"></a>Chapter 4. Miscellaneous Topics</h2></div></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="networktransparency"></a>Networktransparency via KIO</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569419"></a>KIO-Slaves</h3></div></div></div><p>
+KDE supports networktransparency via KIO-slaves. <span class="application">KDiff3</span> 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.
+</p><p>
+Example:
+</p><p>
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> test.cpp  ftp://ftp.faraway.org/test.cpp
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> tar:/home/hacker/archive.tar.gz/dir ./dir
+</pre>
+</p><p>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.
+</p><p>
+Other KIO-slaves that are interesting are:
+</p><div class="itemizedlist"><ul type="disc"><li><p>Files from the WWW (http:),</p></li><li><p>Files from the FTP (ftp:),</p></li><li><p>Encrypted file transfer (fish:, sftp:),</p></li><li><p>Windows-ressources (smb:),</p></li><li><p>Local files (file:),</p></li></ul></div><p>
+Other things that are possible, but probably less useful are:
+</p><div class="itemizedlist"><ul type="disc"><li><p>Man-pages (man:),</p></li><li><p>Info-pages (info:),</p></li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569517"></a>How To Write URLs</h3></div></div></div><p>
+   An URL has a different syntax compared with paths for local files and directories.
+   Some things should be considered:
+</p><div class="itemizedlist"><ul type="disc"><li><p>
+   A path can be relative and can contain "." or "..". This is not possible for URLs
+   which are always absolute.
+</p></li><li><p>
+   Special characters must be written with "escaping". ("#"-&gt;"%23", space-&gt;"%20", etc.)
+   E.g. A file with the name "/#foo#" would have the URL "file:/%23foo%23".
+</p></li><li><p>
+   When URLs don't work as expected, try to open them in Konqueror first.
+</p></li></ul></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569553"></a>Capabilities of KIO-Slaves</h3></div></div></div><p>
+   Networktransparency has one drawback: Not all ressources have the same cababilities.
+</p><p>
+   Sometimes this is due to the file system of the server, sometimes due to the protocol.
+   Here is a short list of restrictions:
+</p><div class="itemizedlist"><ul type="disc"><li><p>
+   Sometimes there is no support for links.
+</p></li><li><p>
+   Or there is no way to distinguish if a link points to a file or a directory; always
+   assuming a file. (ftp:, sftp:).
+</p></li><li><p>
+   Can't always determine the filesize.
+</p></li><li><p>
+   Limited support for permissions.
+</p></li><li><p>
+   No possibility to modify permissions or modification time, so permissions or time
+   of a copy will differ from the original. (See the option "Trust the size".)
+   (To modify permissions or modification time is only possible for local files.)
+</p></li></ul></div></div></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="other.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="kpart.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">Other Functions in Directory Merge Window </div><div class="navRight"> Using <span class="application">KDiff3</span> as a KPart</div><div class="navCenter"><a accesskey="u" href="index.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>
\ No newline at end of file
diff --git a/doc/en/navigation.html b/doc/en/navigation.html
new file mode 100644
index 0000000..ccfce59
--- /dev/null
+++ b/doc/en/navigation.html
@@ -0,0 +1,38 @@
+<html><head><title>Navigation And Editing</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="merging.html" title="Merging And The Merge Output Editor Window"><link rel="next" href="selections.html" title="Select, Copy And Paste"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Navigation And Editing</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="merging.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="selections.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="navigation"></a>Navigation And Editing</h2></div></div></div><p>
+   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,
+   home,  end, ctrl-home, ctrl-end as you would in other programs. The overview-column
+   next to the vertical scroll bar of the input files can also be used  for
+   navigating by clicking into it.
+</p><p>
+   You can also use the wheel mouse to scroll up and down.
+</p><p>
+   In the merge output editor you can also use the other keys for editing.
+   You can toggle between insert and overwrite mode with the insert key. (Default
+   is insert-mode.)
+</p><p>
+   A left-mouse-button-click into any summary column will synchronise all
+   windows to show the beginning of the same group of lines (as explained
+   in section <a href="merging.html#synchronise_views" title="Setting The Current Group And Synchronising Merge And Diff View Position">"Setting The Current Group And Synchronising Merge And Diff View Position"</a>).
+</p><p>
+   The button bar also contains nine navigation buttons with which you can
+   jump to the current/first/last difference, to the next/previous difference
+   (ctrl-down/ctrl-up), to the next/previous conflict (ctrl-pgdown/ctrl-pgup),
+   or to the next/previous unsolved conflict. Note that for <span class="application">KDiff3</span> a "conflict"
+   that was not automatically solved at the start of the merge stays a "conflict"
+   even if it is solved. Hence the necessity to distinguish "unsolved conflicts".
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="autoadvance"></a>Auto-Advance</h3></div></div></div><p>
+   There also is a button "Automatically go to next unsolved conflict after
+   source selection" (Auto-Advance). If you enable this, then, when one source
+   is selected, <span class="application">KDiff3</span> will jump to and select the next unsolved conflict
+   automatically. This can help when you always want to choose one source only.
+   When you need both sources, or you want to edit after selecting, then you
+   probably want to switch this off. Before proceeding to the next unsolved conflict
+   <span class="application">KDiff3</span> shows you the effect of your choice for a short time. This delay is
+   adjustable in the Diff- &amp; Merge-Settings: You can
+   specify the "Auto-Advance delay" in milli seconds between 0 and 2000. Hint:
+   Tired of many clicks? - Use a small Auto-Advance-delay and the shortcuts
+   Ctrl-1/2/3 to select A/B/C for many conflicts.
+</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="merging.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="selections.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">Merging And The Merge Output Editor Window </div><div class="navRight"> Select, Copy And Paste</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>
\ No newline at end of file
diff --git a/doc/en/new.png b/doc/en/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/en/new.png
diff --git a/doc/en/open_dialog.png b/doc/en/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/en/open_dialog.png
diff --git a/doc/en/opendialog.html b/doc/en/opendialog.html
new file mode 100644
index 0000000..58ec755
--- /dev/null
+++ b/doc/en/opendialog.html
@@ -0,0 +1,23 @@
+<html><head><title>Open-Dialog</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="next" href="pasteinput.html" title="Paste and Drop Input"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Open-Dialog</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="documentation.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="pasteinput.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="opendialog"></a>Open-Dialog</h2></div></div></div><p>
+   Since many input files must be selectable, the program has a special open dialog:
+</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="open_dialog.png"><hr></div></div><p>
+   The open dialog allows to edit the filenames by hand, selecting a file
+   via  the file-browser ("File...") or allows to choose recent files from
+   the drop-down lists. If you open the dialog again, then the current names
+   still remain there. The third input file is not required. If the
+   entry   for "C" remains empty, then only a two file diff analysis will be
+   done.
+</p><p>
+   You can also select a directory via "Dir...". If for A a directory is specified
+   then a directory-comparison/merge starts. If A specifies a file but B, C or
+   the output specify a directory, then <span class="application">KDiff3</span> uses the filename from A in the
+   specified directories.
+</p><p>
+   If "Merge" is selected, then the "Output"-line becomes editable. But it
+   is not required to specify the output filename immediately. You can also
+   postpone this until saving.
+</p><p>
+   The "Configure..."-button opens the options-dialog, so that you can set
+   the options before running the analysis.
+</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="documentation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="pasteinput.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">File Comparison And Merge </div><div class="navRight"> Paste and Drop Input</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>
\ No newline at end of file
diff --git a/doc/en/options.html b/doc/en/options.html
new file mode 100644
index 0000000..cff21f9
--- /dev/null
+++ b/doc/en/options.html
@@ -0,0 +1,138 @@
+<html><head><title>Options</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="printing.html" title="Printing"><link rel="next" href="preprocessors.html" title="Preprocessor Commands"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Options</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       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 class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="options"></a>Options</h2></div></div></div><p>
+   Options and the recent-file-list will be saved when you exit the program,
+   and reloaded when you start it. (Menu Settings-&gt;Configure <span class="application">KDiff3</span> ...)
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2566321"></a>Font</h3></div></div></div><p>
+   Select a fixed width font. (On some systems this dialog will also
+   present    variable width fonts, but you should not use them.)
+</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Italic Font for Deltas:</em></span></span></dt><dd><p> If you select this, then text differences
+       will be drawn with the italic version of the selected font. If the font
+       doesn't  support italic, then this does nothing.</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2566353"></a>Colors</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Foreground color:</em></span></span></dt><dd><p> Usually black. </p></dd><dt><span class="term"><span class="emphasis"><em>Background color:</em></span></span></dt><dd><p> Usually white. </p></dd><dt><span class="term"><span class="emphasis"><em>Diff Background color:</em></span></span></dt><dd><p> Usually light gray. </p></dd><dt><span class="term"><span class="emphasis"><em>Color A:</em></span></span></dt><dd><p> Usually dark blue. </p></dd><dt><span class="term"><span class="emphasis"><em>Color B:</em></span></span></dt><dd><p> Usually dark green. </p></dd><dt><span class="term"><span class="emphasis"><em>Color C:</em></span></span></dt><dd><p> Usually dark magenta. </p></dd><dt><span class="term"><span class="emphasis"><em>Conflict Color:</em></span></span></dt><dd><p> Usually red.</p></dd><dt><span class="term"><span class="emphasis"><em>Current range background color:</em></span></span></dt><dd><p> Usually light yellow.</p></dd><dt><span class="term"><span class="emphasis"><em>Current range diff background color:</em></span></span></dt><dd><p> Usually dark yellow.</p></dd><dt><span class="term"><span class="emphasis"><em>Color for manually selected diff ranges:</em></span></span></dt><dd><p> Usually orange.</p></dd><dt><span class="term"><span class="emphasis"><em>Newest file color in directory comparison:</em></span></span></dt><dd><p> Usually green.</p></dd><dt><span class="term"><span class="emphasis"><em>Oldest file color in directory comparison:</em></span></span></dt><dd><p> Usually red.</p></dd><dt><span class="term"><span class="emphasis"><em>Middle age file color in directory comparison:</em></span></span></dt><dd><p> Usually dark yellow.</p></dd><dt><span class="term"><span class="emphasis"><em>Color for missing files in directory comparison:</em></span></span></dt><dd><p> Usually black.</p></dd></dl></div><p>
+   Changing the colors for directory comparison will be effective only when starting the next directory comparison.
+</p><p>
+   On systems with only 16 or 256 colors some colors are not available in pure
+   form. On such systems the "Defaults"-button will choose a pure color.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2566534"></a>Editor Settings</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Tab inserts spaces:</em></span></span></dt><dd><p> If this is disabled and you press the
+      tabulator key,   a tab-character is inserted, otherwise the appropriate
+      amount  of characters   is inserted.</p></dd><dt><span class="term"><span class="emphasis"><em>   Tab size:</em></span></span></dt><dd><p> Can be adjusted for your specific needs. Default is 8. </p></dd><dt><span class="term"><span class="emphasis"><em>   Auto indentation:</em></span></span></dt><dd><p> When pressing Enter or Return the indentation
+      of the previous  line is used for the new line. </p></dd><dt><span class="term"><span class="emphasis"><em>   Auto copy selection:</em></span></span></dt><dd><p> Every selection is immediately copied
+      to the clipboard   when active and you needn't explicitely copy it. </p></dd><dt><span class="term"><span class="emphasis"><em>   Line end style:</em></span></span></dt><dd><p> When saving you can select what line 
+      end style you prefer. The default setting is the common choice for the used operating system. </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="diffoptions"></a>Diff Settings</h3></div></div></div><p>
+   When comparing files, <span class="application">KDiff3</span> first it tries to match lines that are equal
+   in all input files. Only during this step it might ignore white space. The
+   second step compares each line. In this step white space will not be ignored.
+   Also during the merge white space will not be ignored.
+</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Preserve Carriage Return:</em></span></span></dt><dd><p> Some editors (on some systems) save
+      carriage return '\r' and linefeed '\n'-characters at the end of line, while
+      others will only save the linefeed '\n'. Usually <span class="application">KDiff3</span> ignores the carriage
+      return, but then files that don't have equal sizes, look equal in side by
+      side comparison. When this option is on, then the carriage return characters
+      are made visible but are treated as white space. This option must be off
+      during a merge. Default is off.</p></dd><dt><span class="term"><span class="emphasis"><em>Ignore numbers:</em></span></span></dt><dd><p> Default is off. Number characters ('0'-'9', '.', '-')
+      will be ignored  in the first  part of the analysis in which the line matching is
+      done. In the result the differences will be shown nevertheless, but they are treated
+      as white space.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Ignore C/C++ comments:</em></span></span></dt><dd><p> Default is off.
+      Changes in comments will be treated like changes in white space.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Ignore case:</em></span></span></dt><dd><p>  Default is off. 
+      Case-differences of characters (like 'A' vs. 'a') will be treated like changes in white space.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Preprocessor-Command:</em></span></span></dt><dd><p>
+   See <a href="preprocessors.html" title="Preprocessor Commands">next section</a>.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Line-Matching Preprocessor-Command:</em></span></span></dt><dd><p>
+   See <a href="preprocessors.html" title="Preprocessor Commands">next section</a>.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Try Hard:</em></span></span></dt><dd><p>
+      Try hard to find an even smaller delta. (Default is on.) This will probably
+      be effective for complicated and big files. And slow for very big files.
+   </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="mergeoptions"></a>Merge Settings</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Auto Advance Delay (ms):</em></span></span></dt><dd><p> When in auto-advance-mode this setting specifies
+      how long to show the result of the selection before jumping to the next unsolved
+      conflict.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>White space 2/3-file merge default:</em></span></span></dt><dd><p>
+      Automatically solve all white-space conflict by choosing the specified file.
+      (Default is manual choice.) Useful if white space really isn't important in many files.
+      If you need this only occasionally better use "Choose A/B/C For All Unsolved Whitespace Conflicts"
+      in the merge menu. Note that if you enable either "Ignore numbers" or "Ignore C/C++ comments"
+      then this auto-choice also applies for conflicts in numbers or comments.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Auto merge regular expression:</em></span></span></dt><dd><p>
+      Regular expression for lines where <span class="application">KDiff3</span> should automatically choose one source. See also <a href="merging.html#vcskeywordsmergesupport" title="Automatic Merge of Version Control Keywords and History (Log)">Automatic Merge ...</a>
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Run regular expression auto merge on merge start:</em></span></span></dt><dd><p>
+      If activated <span class="application">KDiff3</span> runs the automatic merge using the "Auto merge regular expression" when a merge is started.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>History start regular expression:</em></span></span></dt><dd><p>
+      Regular expression for the start of the merge history entry.
+      Usually this line contains the "$Log$"-keyword.
+      Default value: ".*\$Log.*\$.*"
+   </p></dd><dt><span class="term"><span class="emphasis"><em>History entry start regular expression:</em></span></span></dt><dd><p>
+      A merge history entry consists of several lines.
+      Specify the regular expression to detect the first line (without the leading comment).
+      Use parentheses to group the keys you want to use for sorting.
+      If left empty, then <span class="application">KDiff3</span> assumes that empty lines separate history entries.
+      See also <a href="merging.html#vcskeywordsmergesupport" title="Automatic Merge of Version Control Keywords and History (Log)">Automatic Merge ...</a>
+   </p></dd><dt><span class="term"><span class="emphasis"><em>History merge sorting:</em></span></span></dt><dd><p>
+      Enable version control history sorting.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>History entry start sort key order:</em></span></span></dt><dd><p>
+      Each parentheses used in the regular expression for the history start entry
+      groups a key that can be used for sorting.
+      Specify the list of keys (that are numbered in order of occurrence
+      starting with 1) using ',' as separator (e.g. "4,5,6,1,2,3,7").
+      If left empty, then no sorting will be done.
+      See also <a href="merging.html#vcskeywordsmergesupport" title="Automatic Merge of Version Control Keywords and History (Log)">Automatic Merge ...</a>
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Merge version control history on merge start:</em></span></span></dt><dd><p>
+      If activated <span class="application">KDiff3</span> runs the automatic history merging using aforementioned options when a merge is started.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Max number of history entries:</em></span></span></dt><dd><p>
+      <span class="application">KDiff3</span> truncates the history list after the specified number of entries. Use -1 to avoid truncation. (Default is -1).
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Test your regular expressions</em></span></span></dt><dd><p>
+      This button shows a dialog that allows you to improve and test the regular expressions above.
+      Just copy the respective data from your files into the example lines. The "Match results" 
+      will immediately show whether the match succeeds or not.
+      The "Sort key result" will display the key used for history merge sorting.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Irrelevant merge command:</em></span></span></dt><dd><p>
+      Specify a command of your own that should be called when <span class="application">KDiff3</span> detects 
+      that for a three file merge the file from B doesn't contribute any 
+      relevant data that isn't already contained in the file from C.
+      The command is called with the three filenames as parameters.
+      Data matched by the "Auto merge regular expression" or in the 
+      history isn't considered relevant.
+   </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2566994"></a>Directory Merge</h3></div></div></div><p>
+   These options are concerned with scanning the directory and handling the
+   merge: See the <a href="dirmergeoptions.html" title="Options for Comparing and Merging Directories">Directory Comparison/Merge
+   Docs</a> for details.
+</p><p>
+Yet there is one option here that is also relevant for saving single files:
+</p><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Backup files:</em></span></span></dt><dd><p> When a file is saved and an older version already
+      exists, then the original version will be renamed with an ".orig" extension.
+      If an old backup file with ".orig" extension already exists then this will
+      be deleted without backup.
+   </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2567038"></a>Regional and Language Options</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Language:</em></span></span></dt><dd><p>Adjust the language of the user interface. Changing this option doesn't affect the running program. You have to exit and restart <span class="application">KDiff3</span> so that the language is changed. (This option is not available in the KDE version of <span class="application">KDiff3</span> because the language is adjustable in the global KDE settings.) 
+	</p></dd><dt><span class="term"><span class="emphasis"><em>Use the same encoding for everything:</em></span></span></dt><dd><p> The following encoding options can be adjusted separately for each item or if this option is true, all values will take the first value.
+	</p></dd><dt><span class="term"><span class="emphasis"><em>Local Encoding:</em></span></span></dt><dd><p>Above the codec-selectors appears a note that tells you what the local encoding is. (This is not adjustable but for your information just in case you don't know your local encoding, but need to select it.)
+	</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></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
+      any highlighting of white-space-only changes in the text or overview-columns.
+      (Note that this also applies to changes in numbers or comments if the options "Ignore numbers"
+      or "Ignore C/C++ comments" are active.)</p></dd><dt><span class="term"><span class="emphasis"><em>Overview options:</em></span></span></dt><dd><p>
+     These choices are only available when you compare three files. In normal mode all
+     differences are shown in one color-coded overview-column. But sometimes you are  
+     especially interested in the differences between only two of these three files.
+     Selecting "A vs. B", "A vs. C" or "B vs. C"-overview will show a second overview 
+     column with the required information next to the normal overview.
+  </p></dd><dt><span class="term"><span class="emphasis"><em>Word wrap diff windows:</em></span></span></dt><dd><p>
+     Wrap lines when their length would exceed the width of a window.
+  </p></dd><dt><span class="term"><span class="emphasis"><em>Show Window A/B/C:</em></span></span></dt><dd><p> Sometimes you want to use the space on
+      the screen better for long lines. Hide the windows that are not important.
+      (In the Windows-menu.)</p></dd><dt><span class="term"><span class="emphasis"><em>Toggle Split Orientation:</em></span></span></dt><dd><p>
+      Switch between diff windows shown next to each other (A left of B left of C) or above
+      each other (A above B above C). This should also help for long lines. (In the Windows-menu.)
+      </p></dd><dt><span class="term"><span class="emphasis"><em>Start a merge quickly:</em></span></span></dt><dd><p>
+      Sometimes you are viewing the deltas and decide to merge.
+      <span class="inlinemediaobject"><img src="merge_current.png"></span>
+      "Merge current file" in the Directory-menu also works if you only compare
+      two files. A single click starts the merge and uses the filename of the last
+      input-file as the default output filename. (When this is used to restart
+      a merge, then the output filename will be preserved.)</p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="shortcuts"></a>Configuring Keyboard-Shortcuts</h3></div></div></div><p>
+   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>
\ No newline at end of file
diff --git a/doc/en/other.html b/doc/en/other.html
new file mode 100644
index 0000000..8919bd5
--- /dev/null
+++ b/doc/en/other.html
@@ -0,0 +1,33 @@
+<html><head><title>Other Functions in Directory Merge Window</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmergeoptions.html" title="Options for Comparing and Merging Directories"><link rel="next" href="misc.html" title="Chapter 4. Miscellaneous Topics"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Other Functions in Directory Merge Window</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="dirmergeoptions.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="misc.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="other"></a>Other Functions in Directory Merge Window</h2></div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569323"></a>Split/Full Screen Mode</h3></div></div></div><p>
+   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,
+   you can disable "Split Screen View" in the "Directory"-menu. Then you can
+   use "Toggle View" in the "Directory"-menu to switch between the file list
+   and the text-diff view that then occupy the full screen.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569341"></a>Comparing or Merging a Single File</h3></div></div></div><p>
+   Probably you will prefer a simple double mouse click on a file in order
+   to compare it. Nevertheless there also exists an entry in the "Directory"-menu.
+   You can also directly merge a single file by selecting it and 
+   choosing "Merge current file" in the "Merge"-Menu. On saving the
+   result, the status will be set to done, and the file will not be merged again
+   if a directory merge is started.
+</p><p>
+   But note that this status information will be lost when you rerun a directory
+   scan: "Directory"-menu: "Rescan"
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2569364"></a>Comparing or Merging Files with Different Names</h3></div></div></div><p>
+   Sometimes you need to compare or merge files with different names (e.g. the current 
+   file and the backup in the same folder).
+</p><p>
+   Select the exact file by clicking onto the icon in the column A, B or C. The first 
+   file selected thus will be marked with an "A", the second and third with "B" and "C" 
+   regardless on what column they are in. Only up to three files can be chosen like this.
+</p><p>
+   Proceed by choosing "Compare Explicitely Selected Files" or "Merge Explicitely 
+   Selected Files" from the "Directory"-menu. For your convenience these menu entries 
+   also appear as context menu when you right-click the last selected file.
+</p><p>
+   The comparison or merge of a file will happen in the same window. 
+   If this method is used for directories a new window will be opened.
+</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="dirmergeoptions.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="misc.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">Options for Comparing and Merging Directories </div><div class="navRight"> Miscellaneous Topics</div><div class="navCenter"><a accesskey="u" href="dirmerge.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>
\ No newline at end of file
diff --git a/doc/en/pasteinput.html b/doc/en/pasteinput.html
new file mode 100644
index 0000000..8d913ba
--- /dev/null
+++ b/doc/en/pasteinput.html
@@ -0,0 +1,20 @@
+<html><head><title>Paste and Drop Input</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="opendialog.html" title="Open-Dialog"><link rel="next" href="interpretinginformation.html" title="Comparing Files And Interpreting The Information In The Input Windows"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Paste and Drop Input</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="opendialog.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="interpretinginformation.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="pasteinput"></a>Paste and Drop Input</h2></div></div></div><p>
+   Sometimes you want to compare parts of a text that is not an own file. <span class="application">KDiff3</span> also
+   allows you to paste text from the clipboard into the diff input window that has the focus.
+   The diff analysis happens immediately then.
+   In the open dialog you need not specify files then, but just close it via "Cancel".
+</p><p>
+   You can also use drag and drop: Drag a file from a file manager
+   or selected text from an editor and drop it onto a diff input window.
+</p><p>
+   What's the idea? Sometimes a file contains two similar functions, but checking how similar
+   they really are is a big effort if you first must create two files and then load them. Now
+   you can simply copy, paste and compare the relevant sections.
+</p><p>
+   Note: Currently you cannot drag anything from <span class="application">KDiff3</span>. Only dropping in the diff input
+   is supported.
+</p><p>
+   Warning: Some editors still interpret the drag and drop into another program like cut
+   (instead of copy) and paste. Your original data might be lost then.
+</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="opendialog.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="interpretinginformation.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">Open-Dialog </div><div class="navRight"> Comparing Files And Interpreting The Information In The Input Windows</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>
\ No newline at end of file
diff --git a/doc/en/preprocessors.html b/doc/en/preprocessors.html
new file mode 100644
index 0000000..427f717
--- /dev/null
+++ b/doc/en/preprocessors.html
@@ -0,0 +1,202 @@
+<html><head><title>Preprocessor Commands</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="options.html" title="Options"><link rel="next" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Preprocessor Commands</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="options.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="dirmerge.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="preprocessors"></a>Preprocessor Commands</h2></div></div></div><p>
+<span class="application">KDiff3</span> supports two preprocessor options.
+</p><p>
+<div class="variablelist"><dl><dt><span class="term"><span class="emphasis"><em>Preprocessor-Command:</em></span></span></dt><dd><p>
+      When any file is read, it will be piped through this external command.
+      The output of this command will be visible instead of the original file.
+      You can write your own preprocessor that fulfills your specific needs.
+      Use this to cut away disturbing parts of the file, or to automatically
+      correct the indentation etc.
+   </p></dd><dt><span class="term"><span class="emphasis"><em>Line-Matching Preprocessor-Command:</em></span></span></dt><dd><p>
+      When any file is read, it will be piped through this external command. If
+      a preprocessor-command (see above) is also specified, then the output of the
+      preprocessor is the input of the line-matching preprocessor.
+      The output will only be used during the line matching phase of the analysis.
+      You can write your own preprocessor that fulfills your specific needs.
+      Each input line must have a corresponding output line.
+   </p></dd></dl></div>
+</p><p>
+The idea is to allow the user greater flexibility while configuring the diff-result.
+But this requires an external program, and many users don't want to write one themselves.
+The good news is that very often <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> or <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span> 
+will do the job. 
+</p><p>Example: Simple testcase: Consider file a.txt (6 lines):
+<pre class="screen">
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</pre>
+And file b.txt (3 lines):
+<pre class="screen">
+      cg
+      dg
+      eg
+</pre>
+Without a preprocessor the following lines would be placed next to each other:
+<pre class="screen">
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</pre>
+This is probably not wanted since the first letter contains the actually interesting information.
+To help the matching algorithm to ignore the second letter we can use a line matching preprocessor 
+command, that replaces 'g' with 'a':
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/g/a/'
+</pre>
+With this command the result of the comparison would be:
+<pre class="screen">
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</pre>
+Internally the matching algorithm sees the files after running the line matching preprocessor,
+but on the screen the file is unchanged. (The normal preprocessor would change the data also on 
+the screen.)
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sedbasics"></a><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> Basics</h3></div></div></div><p>
+This section only introduces some very basic features of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>. For more
+information see <a href="info:/sed" target="_top">info:/sed</a> or 
+<a href="http://www.gnu.org/software/sed/manual/html_mono/sed.html" target="_top">
+http://www.gnu.org/software/sed/manual/html_mono/sed.html</a>.
+A precompiled version for Windows can be found at <a href="http://unxutils.sourceforge.net" target="_top">
+http://unxutils.sourceforge.net</a>.
+Note that the following examples assume that the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-command is in some 
+directory in the PATH-environment variable. If this is not the case, you have to specify the full absolute
+path for the command. 
+</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>Also note that the following examples use the single quotation mark (') which won't work for Windows. 
+On Windows you should use the double quotation marks (") instead.</p></div><p>
+In this context only the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-substitute-command is used:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>REGEXP</code></em></span>/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>REPLACEMENT</code></em></span>/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>FLAGS</code></em></span>'
+</pre>
+Before you use a new command within <span class="application">KDiff3</span>, you should first test it in a console.
+Here the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">echo</strong></span></span>-command is useful. Example:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">echo</strong></span></span> abrakadabra | <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/a/o/'
+   -&gt; obrakadabra
+</pre>
+This example shows a very simple sed-command that replaces the first occurance 
+of "a" with "o". If you want to replace all occurances then you need the "g"-flag:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">echo</strong></span></span> abrakadabra | <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/a/o/g'
+   -&gt; obrokodobro
+</pre>
+The "|"-symbol is the pipe-command that transfers the output of the previous 
+command to the input of the following command. If you want to test with a longer file
+then you can use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">cat</strong></span></span> on Unix-like systems or <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">type</strong></span></span> 
+on Windows-like systems. <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> will do the substitution for each line.
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">cat</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>filename</code></em></span> | <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>options</code></em></span>
+</pre>
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="sedforkdiff3"></a>Examples For <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>-Use In <span class="application">KDiff3</span></h3></div></div></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567628"></a>Ignoring Other Types Of Comments</h4></div></div></div><p>
+Currently <span class="application">KDiff3</span> understands only C/C++ comments. Using the
+Line-Matching-Preprocessor-Command you can also ignore
+other types of comments, by converting them into C/C++-comments.
+
+Example: To ignore comments starting with "#", you would like to convert them
+to "//". Note that you also must enable the "Ignore C/C++-Comments" option to get 
+an effect. An appropriate Line-Matching-Preprocessor-Command would be:
+
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/#/\/\//'
+</pre>
+Since for <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> the "/"-character has a special meaning, it is necessary to place the 
+"\"-character before each "/" in the replacement-string. Sometimes the "\" is required
+to add or remove a special meaning of certain characters. The single quotation marks (') before 
+and after the substitution-command are important now, because otherwise the shell will
+try to interpret some special characters like '#', '$' or '\' before passing them to 
+<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span>. <span class="emphasis"><em>Note that on Windows you will need the double quotation marks (") here. Windows
+substitutes other characters like '%', so you might have to experiment a little bit.</em></span>
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567680"></a>Caseinsensitive Diff</h4></div></div></div><p>
+Use the following Line-Matching-Preprocessor-Command to convert all input to uppercase:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/\(.*\)/\U\1/'
+</pre>
+Here the ".*" is a regular expression that matches any string and in this context matches 
+all characters in the line. 
+The "\1" in the replacement string refers to the matched text within the first pair of "\(" and "\)".
+The "\U" converts the inserted text to uppercase.
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567704"></a>Ignoring Version Control Keywords</h4></div></div></div><p>
+CVS and other version control systems use several keywords to insert automatically
+generated strings (<a href="info:/cvs/Keyword%20substitution" target="_top">info:/cvs/Keyword substitution</a>).
+All of them follow the pattern "$KEYWORD generated text$". We now need a
+Line-Matching-Preprocessor-Command that removes only the generated text:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</pre>
+The "\|" separates the possible keywords. You might want to modify this list 
+according to your needs.
+The "\" before the "$" is necessary because otherwise the "$" matches the end of the line.
+</p><p>
+While experimenting with <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> you might come to understand and even like
+these regular expressions. They are useful because there are many other programs that also 
+support similar things.
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567750"></a>Ignoring Numbers</h4></div></div></div><p>
+Ignoring numbers actually is a built-in option. But as another example, this is how
+it would look as a Line-Matching-Preprocessor-command.
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/[0123456789.-]//g'
+</pre>
+Any character within '[' and ']' is a match and will be replaced with nothing.
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567772"></a>Ignoring Certain Columns</h4></div></div></div><p>
+Sometimes a text is very strictly formatted, and contains columns that you always want to ignore, while there are
+other columns you want to preserve for analysis. In the following example the first five columns (characters) are 
+ignored, the next ten columns are preserved, then again five columns are ignored and the rest of the line is preserved.
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/.....\(..........\).....\(.*\)/\1\2/'
+</pre>
+Each dot '.' matches any single character. The "\1" and "\2" in the replacement string refer to the matched text within the first 
+and second pair of "\(" and "\)" denoting the text to be preserved.
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567800"></a>Combining Several Substitutions</h4></div></div></div><p>
+Sometimes you want to apply several substitutions at once. You can then use the 
+semicolon ';' to separate these from each other. Example:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">echo</strong></span></span> abrakadabra | <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/a/o/g;s/\(.*\)/\U\1/'
+   -&gt; OBROKODOBRO
+</pre>
+</p></div><div class="sect3" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="id2567827"></a>Using <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span> instead of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span></h4></div></div></div><p>
+Instead of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> you might want to use something else like 
+<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span>.
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span> -p -e 's/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>REGEXP</code></em></span>/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>REPLACEMENT</code></em></span>/<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>FLAGS</code></em></span>'
+</pre>
+But some details are different in <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span>. Note that where 
+<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> needed "\(" and "\)" <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span>
+requires the simpler "(" and ")" without preceding '\'. Example:
+<pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">sed</strong></span></span> 's/\(.*\)/\U\1/'
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">perl</strong></span></span> -p -e 's/(.*)/\U\1/'
+</pre>
+</p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2567900"></a>Order Of Preprocessor Execution</h3></div></div></div><p>
+The data is piped through all internal and external preprocessors in the 
+following order:
+</p><div class="itemizedlist"><ul type="disc"><li><p>Normal preprocessor,</p></li><li><p>Line-Matching-Preprocessor,</p></li><li><p>Ignore case (conversion to uppercase),</p></li><li><p>Detection of C/C++ comments,</p></li><li><p>Ignore numbers,</p></li><li><p>Ignore white space</p></li></ul></div><p>
+The data after the normal preprocessor will be preserved for display and merging. The
+other operations only modify the data that the line-matching-diff-algorithm sees.
+</p><p>
+In the rare cases where you use a normal preprocessor note that 
+the line-matching-preprocessor sees the output of the normal preprocessor as input.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2567963"></a>Warning</h3></div></div></div><p>
+The preprocessor-commands are often very useful, but as with any option that modifies
+your texts or hides away certain differences automatically, you might accidentally overlook 
+certain differences and in the worst case destroy important data.
+</p><p>
+For this reason during a merge if a normal preprocessor-command is being used <span class="application">KDiff3</span> 
+will tell you so and ask you if it should be disabled or not. 
+But it won't warn you if a Line-Matching-Preprocessor-command is active. The merge will not complete until
+all conflicts are solved. If you disabled "Show White Space" then the differences that
+were removed with the Line-Matching-Preprocessor-command will also be invisible. If the 
+Save-button remains disabled during a merge (because of remaining conflicts), make sure to enable 
+"Show White Space". If you don't wan't to merge these less important differences manually
+you can select "Choose [A|B|C] For All Unsolved White space Conflicts" in the Merge-menu.
+</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="options.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmerge.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">Options </div><div class="navRight"> Directory Comparison and Merge with <span class="application">KDiff3</span></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>
\ No newline at end of file
diff --git a/doc/en/printing.html b/doc/en/printing.html
new file mode 100644
index 0000000..bca62f3
--- /dev/null
+++ b/doc/en/printing.html
@@ -0,0 +1,20 @@
+<html><head><title>Printing</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="find.html" title="Finding Strings"><link rel="next" href="options.html" title="Options"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Printing</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="find.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="options.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="printing"></a>Printing</h2></div></div></div><p>
+   <span class="application">KDiff3</span> 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.
+</p><p>
+   There are several possibilities to adjust the range. Due to different printing 
+   dialogs on different operating systems, the method to achieve certain range selections varies.
+</p><div class="variablelist"><dl><dt><span class="term">All:</span></dt><dd><p>Print everything.</p></dd><dt><span class="term">Current:</span></dt><dd><p>Print a page starting at the first visible line in the window. 
+       (On systems without this option this can be achived by specifying page number 10000 for printing.)</p></dd><dt><span class="term">Selection:</span></dt><dd><p>
+       Before choosing to print select text with the mouse (like for copy and paste) 
+       in one of the diff input windows to define the start and end line. If no text 
+       in one of the diff input windows was selected, then this won't be an available 
+       choice. (On systems without this option this can be achived by specifying page 
+       number 9999 for printing.)</p></dd><dt><span class="term">Range:</span></dt><dd><p>Specify the first and last page.
+       </p></dd></dl></div><p>
+   Other important options for printing will be taken from the normal options:
+</p><div class="itemizedlist"><ul type="disc"><li><p>Font, font size</p></li><li><p>Show line numbers</p></li><li><p>Word wrap</p></li><li><p>Colors</p></li><li><p>etc.</p></li></ul></div><p>
+   Landscape formatting is also recommended for printing.
+</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="find.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="options.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">Finding Strings </div><div class="navRight"> Options</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>
\ No newline at end of file
diff --git a/doc/en/requirements.html b/doc/en/requirements.html
new file mode 100644
index 0000000..983137c
--- /dev/null
+++ b/doc/en/requirements.html
@@ -0,0 +1,10 @@
+<html><head><title>Requirements</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="prev" href="installation.html" title="Appendix A. Installation"><link rel="next" href="compilation.html" title="Compilation and Installation"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Requirements</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="installation.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="compilation.html">Next</a></div><div class="navCenter">Installation</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements</h2></div></div></div><p>
+   In order to successfully use all features of <span class="application">KDiff3</span>, you need <span class="acronym">KDE</span> &gt;3.1.
+</p><p>
+   For information about how to run <span class="application">KDiff3</span> on other platforms without KDE please see the
+   <a href="http://kdiff3.sourceforge.net" target="_top">homepage</a>.
+</p><p>
+You can find a list of changes at <a href="http://kdiff3.sourceforge.net/ChangeLog" target="_top">http://kdiff3.sourceforge.net/ChangeLog</a>
+or in the "ChangeLog"-file of the source package.
+</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="installation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="compilation.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">Installation </div><div class="navRight"> Compilation and Installation</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>
\ No newline at end of file
diff --git a/doc/en/saving.html b/doc/en/saving.html
new file mode 100644
index 0000000..74d24e3
--- /dev/null
+++ b/doc/en/saving.html
@@ -0,0 +1,16 @@
+<html><head><title>Saving</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="selections.html" title="Select, Copy And Paste"><link rel="next" href="find.html" title="Finding Strings"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Saving</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="selections.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="find.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="saving"></a>Saving</h2></div></div></div><p>
+   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
+   it will be deleted. When you exit or start another diff-analysis and data
+   wasn't saved yet, then <span class="application">KDiff3</span> will ask if you want to save, cancel or proceed
+   without saving. (<span class="application">KDiff3</span> does not catch any signals. So if you "kill" <span class="application">KDiff3</span>
+   then your data will be lost.)
+</p><p>
+   Line endings are saved according to the normal method on the underlying
+   operating system. For Unices each line ends with an linefeed-character "\n",
+   while for Win32-based systems each line ends with a carriage-return + a linefeed
+   "\r\n". <span class="application">KDiff3</span> does not preserve the line-endings of the input files, which
+   also means that you shouldn't use <span class="application">KDiff3</span> with binary files.
+</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="selections.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="find.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">Select, Copy And Paste </div><div class="navRight"> Finding Strings</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>
\ No newline at end of file
diff --git a/doc/en/screenshot_diff.png b/doc/en/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/en/screenshot_diff.png
diff --git a/doc/en/screenshot_merge.png b/doc/en/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/en/screenshot_merge.png
diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html
new file mode 100644
index 0000000..badb664
--- /dev/null
+++ b/doc/en/screenshots.html
@@ -0,0 +1,15 @@
+<html><head><title>Screenshots and Features</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="introduction.html" title="Chapter 1. Introduction"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="features.html" title="More Features"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Screenshots and Features</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="introduction.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="features.html">Next</a></div><div class="navCenter">Introduction</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="screenshots"></a>Screenshots and Features</h2></div></div></div><p>This screenshot shows the difference between two text files</p><p>(Using an early version of <span class="application">KDiff3</span>):</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_diff.png"><hr></div></div><p>
+   3-way-merging is fully supported. This is useful if two people change code independently.
+   The original file (the base) is used to help <span class="application">KDiff3</span> to automatically select the correct
+   changes.
+   The merge-editor below the diff-windows allows you to solve conflicts, while showing you the output you will get.
+   You can even edit the output.
+   This screenshot shows three input files being merged:
+</p><p>
+<div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="screenshot_merge.png"><hr></div></div>
+</p><p><a name="dirmergebigscreenshot"></a><span class="application">KDiff3</span> also helps you to compare and merge complete directories.
+This screenshot shows <span class="application">KDiff3</span> during a directory merge:
+</p><p>
+<div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><hr><img src="dirmergebig.png"><hr></div></div>
+</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="introduction.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="features.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">Introduction </div><div class="navRight"> More Features</div><div class="navCenter"><a accesskey="u" href="introduction.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>
\ No newline at end of file
diff --git a/doc/en/selections.html b/doc/en/selections.html
new file mode 100644
index 0000000..32cd75e
--- /dev/null
+++ b/doc/en/selections.html
@@ -0,0 +1,34 @@
+<html><head><title>Select, Copy And Paste</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="documentation.html" title="Chapter 2. File Comparison And Merge"><link rel="prev" href="navigation.html" title="Navigation And Editing"><link rel="next" href="saving.html" title="Saving"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Select, Copy And Paste</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="navigation.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="saving.html">Next</a></div><div class="navCenter">File Comparison And Merge</div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="selections"></a>Select, Copy And Paste</h2></div></div></div><p>
+   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
+   button   again. You can also select a word by double clicking it. In the merge
+   output   editor you can also select via the keyboard by holding the "shift"-button
+   and navigation with the cursor keys.
+</p><p>
+   If the selection exceeds the visible range you can move the mouse over the 
+   window borders which causes <span class="application">KDiff3</span> to scroll in that direction. 
+</p><p>
+   For very large selections you can also use the navigation keys while holding down 
+   the mouse. E.g. use page up and page down to quickly go to a certain position. At the 
+   end position release the mouse button.
+</p><p>
+   In order to select everything in the current window use menu "Edit"-&gt;"Select All" (Ctrl-A).
+</p><p>
+   To copy to the clipboard you must press the "Copy"-button (Ctrl-C or Ctrl-Insert).
+   But there exists an option "Auto Copy Selection". If this is enabled,
+   then whatever you select is copied immediately and you don't need to explicitely
+   copy. But pay attention when using this because the contents of the clipboard
+   might then be destroyed accidentally.
+</p><p>
+   "Cut" (Ctrl-X or Shift-Delete) copies to the clipboard and deletes the
+   selected text.
+</p><p>
+   "Paste" (Ctrl-V or Shift-Insert) inserts the text in the clipboard at the 
+   cursorposition or over the current selection.
+   If you paste to either diff input window the contents of the clipboard will 
+   be shown in that window and the comparison will restart immediately. This is 
+   useful if you want to quickly grab a piece of text from somewhere and 
+   compare it with something else without first creating files.
+</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="navigation.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="saving.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">Navigation And Editing </div><div class="navRight"> Saving</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>
\ No newline at end of file
diff --git a/doc/en/startingdirmerge.html b/doc/en/startingdirmerge.html
new file mode 100644
index 0000000..c737748
--- /dev/null
+++ b/doc/en/startingdirmerge.html
@@ -0,0 +1,22 @@
+<html><head><title>Starting Directory Comparison Or Merge</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="next" href="dirmergevisible.html" title="Directory Merge Visible Information"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute;                      right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute;                         top: 25px;                          right: 100px;                          text-align: right;                          font-size: xx-large;                          font-weight: bold;                          text-shadow: #fff 0px 0px 5px;                          color: #444">Starting Directory Comparison Or Merge</div></div><div style="margin-top: 20px; background-color: #white;                        color: black;                       margin-left: 20px;                        margin-right: 20px;"><div style="position: absolute;                          left: 20px;"><a accesskey="p" href="dirmerge.html">Prev</a></div><div style="position: absolute;                          right: 20px;"><a accesskey="n" href="dirmergevisible.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="startingdirmerge"></a>Starting Directory Comparison Or Merge</h2></div></div></div><p>
+   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.
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2568158"></a>Compare/Merge two directories: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span>
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+</pre><p>
+   If no destination directory is specified, then <span class="application">KDiff3</span> will use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir2</code></em></span>.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2568202"></a>Compare/Merge three directories: </h3></div></div></div><pre class="screen">
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span>
+   <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+</pre><p>
+   When three directories are merged then <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1</code></em></span>
+   is used as the base for the merge.
+   If no destination directory is specified, then <span class="application">KDiff3</span> will use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir3</code></em></span>
+   as the  destination directory for the merge.
+</p><p>
+   Note that only the comparison starts automatically, not the merge. For this you first must
+   select a menu entry or the key F7. (More details later.)
+</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="dirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergevisible.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">Directory Comparison and Merge with <span class="application">KDiff3</span> </div><div class="navRight"> Directory Merge Visible Information</div><div class="navCenter"><a accesskey="u" href="dirmerge.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>
\ No newline at end of file
diff --git a/doc/en/triple_diff.png b/doc/en/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/en/triple_diff.png
diff --git a/doc/en/white_space.png b/doc/en/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/en/white_space.png
diff --git a/doc/es/Makefile.am b/doc/es/Makefile.am
new file mode 100644
index 0000000..2d22aba
--- /dev/null
+++ b/doc/es/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = es
+
+
diff --git a/doc/es/dirbrowser.png b/doc/es/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/es/dirbrowser.png
diff --git a/doc/es/dirmergebig.png b/doc/es/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/es/dirmergebig.png
diff --git a/doc/es/index.docbook b/doc/es/index.docbook
new file mode 100644
index 0000000..981ba5e
--- /dev/null
+++ b/doc/es/index.docbook
@@ -0,0 +1,2936 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "extragear-utils">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Spanish "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>El manual de &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+<othercredit role="translator"
+> <firstname
+>Santiago</firstname
+> <surname
+>Fernández Sancho</surname
+> <affiliation
+><address
+><email
+>santi@kde-es.org</email
+></address
+></affiliation
+> <contrib
+>Traductor</contrib
+> </othercredit
+> 
+</authorgroup>
+
+<copyright>
+<year
+>2002-2006</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2006-04-09</date>
+<releaseinfo
+>0.9.89</releaseinfo>
+
+
+<abstract>
+<para
+>&kdiff3; es una herramienta para ver diferencias y fusionar archivos y directorios que: <itemizedlist>
+<listitem
+><para
+>Compara y fusiona dos o tres archivos o directorios de texto.</para
+></listitem>
+<listitem
+><para
+>Muestra las diferencias línea a línea y caracter a caracter (!).</para
+></listitem>
+<listitem
+><para
+>Proporciona una utilidad de fusión automática.</para
+></listitem>
+<listitem
+><para
+>Tiene un editor para resolver de forma cómoda los conflictos de fusión.</para
+></listitem>
+<listitem
+><para
+>Proporciona transparencia de red a través de KIO.</para
+></listitem>
+<listitem
+><para
+>Tiene opciones para resaltar u ocultar los cambios en los espacios en blanco o en los comentarios.</para
+></listitem>
+<listitem
+><para
+>Soporta Unicode, UTF-8 y otras codificaciones de archivo.</para
+></listitem>
+<listitem
+><para
+>Imprime diferencias.</para
+></listitem>
+<listitem
+><para
+>Soporta claves de control de versiones e historial de fusionado.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Este documento describe la versión 0.9.89 de &kdiff3;. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diferencia</keyword>
+<keyword
+>fusión</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>triple diferencia</keyword>
+<keyword
+>comparar</keyword>
+<keyword
+>archivos</keyword>
+<keyword
+>directorios</keyword>
+<keyword
+>control de versiones</keyword>
+<keyword
+>fusión del árbol</keyword>
+<keyword
+>diferencias en línea</keyword>
+<keyword
+>sincronización</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>transparencia de red</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>espacio en blanco</keyword>
+<keyword
+>comentarios</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Introducción</title>
+<sect1 id="why"
+><title
+>¿Otro interfaz para diff?</title>
+<para
+>Ya existen varias herramientas gráficas para diff. ¿Por qué elegir &kdiff3;? Déjeme decirle por qué lo escribí. </para
+><para
+>&kdiff3; se inició debido a la dificultad para hacer la fusión. La fusión es necesaria cuando varias personas trabajan sobre los mismos archivos en un proyecto. Una fusión puede ser algo automatizado, cuando la herramienta de fusionado no solo tiene nuevos archivos modificados (llamados «ramas»), sino también el archivo original (llamado «base»). La herramienta de fusionado seleccionará automáticamente cualquier modificación que se haga solo en una rama. Cuando varios colaboradores cambian la misma línea, la herramienta detecta un conflicto que deberá resolverse manualmente. </para
+><para
+>El fusionado se vuelve difícil porque, por ejemplo, un colaborador cambió muchas cosas y corrigió el sangrado en algunos lugares. Otro colaborador también cambió mucho texto en el mismo archivo, y todo esto dió como resultado varios conflictos durante la fusión. </para
+><para
+>La herramienta que utilizaba, solo mostraba las líneas cambiadas, pero no los cambios hechos en estas líneas. Y no había información sobre los cambios en el sangrado. La fusión era una pequeña pesadilla. </para
+><para
+>Por eso empecé. La primera versión podía mostrar las diferencias en un línea y las diferencias en los espacios en blanco. Después se añadieron otras características para incrementar la utilidad. </para
+><para
+>Por ejemplo, si desea comparar algún texto rápidamente, podrá copiarlo al portapapeles y pegarlo en otra ventana de diff. </para
+><para
+>Una característica que requería un enorme esfuerzo era la capacidad de comparar y fusionar directorios, que convirtió el programa en un navegador de archivos completo. </para
+><para
+>Espero que &kdiff3; le funcione también. ¡Diviértase! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Capturas de pantalla y características</title>
+<para
+>Esta captura de pantalla muestra la diferencia entre dos archivos de texto.</para>
+<para
+>(Utilizando una versión temprana de &kdiff3;):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>Existe 3 formas de fusión totalmente soportados. Es práctico si dos personas modifican código de forma independiente. El archivo original (la base) se utiliza para ayudar a &kdiff3; para seleccionar automáticamente los cambios correctos. El editor de fusión bajo la ventana de diferencias le permite resolver los conflictos, a la vez que le muestra la salida. También podrá editar la salida. Esta captura de pantalla muestra tres archivos de entrada que se pueden fusionar: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>&kdiff3; también le ayuda a comparar y fusionar directorios completos. Esta captura muestra &kdiff3; durante la fusión de un directorio: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Más características</title>
+<sect2
+><title
+>Visor de diferencias línea a línea y caracter a caracter</title>
+<para
+>Utilizando las posibilidades que permite una pantalla gráfica a color &kdiff3; muestra exactamente cuál es la diferencia. Cuando haga algunas revisiones de código, obtendrá algo como ésto. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Ver diferencias de espacios en blanco de un vistazo</title>
+<para
+>Los espacios y tabulaciones que difieren se muestran visiblemente. Cuando las líneas difieren solo en la cantidad de espacios en blanco puede verse de un vistazo en la columna resumen en la parte izquierda (no más preocupaciones cuando se hagan cambios en el sangrado). </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Triple diferencia</title>
+<para
+>Analiza tres archivos y ve dónde está la diferencia. </para
+><para
+>Las ventanas izquierda/central/derecha se llamarán A/B/C y tendrán los colores azul/verde/gris respectivamente. </para
+><para
+>Si un archivo es igual y el otro es diferente en una línea, el color mostrado en el archivo será diferente. El color rojo significa que ambos archivos son diferentes. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Fusión cómoda de dos o tres archivos de entrada</title>
+<para
+>&kdiff3; puede utilizarse para fusionar dos o tres archivos de entrada y hacer la fusión todo lo automática que sea posible. El resultado se presentará en una ventana editable donde se podrán resolver la mayor parte de los conflictos con una pulsación de ratón: Seleccione los botones A/B/C de la barra de botones para seleccionar la fuente que se utilizará. También podrá seleccionar más de una fuente. Como la ventana de salida es un editor aunque los conflictos puedan necesitar correcciones más profundas, éste hecho puede resolverse aquí sin ninguna herramienta adicional. </para>
+</sect2>
+
+<sect2
+><title
+>Y ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Navegación rápida a través de los botones.</para
+></listitem>
+   <listitem
+><para
+>Una pulsación del ratón en la columna resumen sincronizará todas las ventanas para mostrar la misma posición.</para
+></listitem>
+   <listitem
+><para
+>Seleccione una copia desde cualquier ventana y péguela en la ventana de fusión del resultado.</para
+></listitem>
+   <listitem
+><para
+>Columna de vista general que muestra los cambios y conflictos.</para
+></listitem>
+   <listitem
+><para
+>Los colores pueden ajustarse a sus preferencias.</para
+></listitem>
+   <listitem
+><para
+>Tamaño de pestaña ajustable.</para
+></listitem>
+   <listitem
+><para
+>Opción de insertar espacios en lugar de tabuladores.</para
+></listitem>
+   <listitem
+><para
+>Abrir archivos cómodamente a través de un diálogo o especificando archivos en la línea de órdenes.</para
+></listitem>
+   <listitem
+><para
+>Buscar cadenas en todas las ventanas de texto. Buscar (Ctrl-F) y Buscar siguiente (F3).</para
+></listitem>
+   <listitem
+><para
+>Mostrar los números de línea. </para
+></listitem>
+   <listitem
+><para
+>Pegar el portapapeles y arrastrar texto a una ventana de diferencias.</para
+></listitem>
+   <listitem
+><para
+>Transferencia de red a través de KIO.</para
+></listitem>
+   <listitem
+><para
+>Puede utilizarse como visor de diff en KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Ajuste de línea para las líneas largas.</para
+></listitem>
+   <listitem
+><para
+>Soporte para Unicode, UTF-8 y otras codificaciones.</para
+></listitem>
+   <listitem
+><para
+>Soporte para idiomas que van de derecha a izquierda.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Comparación y fusión de archivos</title>
+
+<sect1 id="commandline"
+><title
+>Opciones de la línea de órdenes</title>
+
+<sect2
+><title
+>Comparar 2 archivos: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fusionar 2 archivos: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2</replaceable
+> -o <replaceable
+>archivosalida</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Comparar 3 archivos: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2 archivo3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fusionar 3 archivos: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2 archivo3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>archivo1 archivo2 archivo3</replaceable
+> -o <replaceable
+>archivosalida</replaceable
+>
+</screen>
+<para
+>Tenga en cuenta que <replaceable
+>archivo1</replaceable
+> será tratado como base de <replaceable
+>archivo2</replaceable
+> y <replaceable
+>archivo3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Caso especial: Archivos con el mismo nombre </title>
+<para
+>Si todos los archivos tienen el mismo nombre pero están en directorios diferentes, puede reducir el tipo de trabajo especificando el nombre del archivo sólo para el primer archivo. P.ej.: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>directorio1/nombrearchivo directorio2 directorio3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Línea de órdenes para iniciar la comparación o fusión de un directorio: </title>
+<para
+>Es muy similar, pero ahora  sobre directorios.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2</replaceable
+> -o <replaceable
+>directoriodestino</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2 directorio3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2 directorio3</replaceable
+> -o <replaceable
+>directoriodestino</replaceable
+>
+</screen>
+<para
+>Para la comparación y fusión de directorios puede continuar leyendo <link linkend="dirmerge"
+>aquí</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Opciones de la línea de órdenes</title>
+<para
+>Para obtener más información sobre las opciones de la línea de órdenes utilice:</para>
+<screen
+><command
+>kdiff3</command
+> --help
+</screen>
+<para
+>Ejemplo de salida:</para>
+<screen
+>Opciones:
+  -m, --merge               Fusiona la entrada.
+  -b, --base archivo        Archivo base explícito. Por compatibilidad con ciertas herramientas.
+  -o, --output archivo      Archivo de salida. Supone -m. Ejem.: -o nuevoarchivo.txt
+  --out archivo             Archivo de salida, de nuevo. (Por compatibilidad con ciertas herramientas.)
+  --auto                    Sin interfaz si todos los conflictos se resuelven de forma automática. (Necesita -o archivo)
+  --qall                    No resuelve los conflictos automáticamete. (Por compatibilidad...)
+  --L1 alias1               Reemplazo de nombre visible para la entrada del archivo 1 (base).
+  --L2 alias2               Reemplazo de nombre visible para la entrada del archivo 2.
+  --L3 alias3               Reemplazo de nombre visible para la entrada del archivo 3.
+  -L, --fname alias         Reemplazo de nombre visible alternativo. Proporcione éste una vez para cada entrada.
+  --cs string               Sobreescribe la configuración. Utilícelo una vez para cada opción. P.ej.: --cs "AutoAdvance=1"
+  --confighelp              Muestra la lista de las opciones de configuración y sus valores actuales.
+  --config file             Utiliza un archivo de configuración diferente.
+</screen>
+<para
+>La opción <option
+>--cs</option
+> le permite ajustar un valor de configuración que de otra forma solo sería ajustable a través del diálogo de configuración. Pero asegúrese de que cuando &kdiff3; finalice se guarden los valores con las configuraciones nuevas. Con <option
+>--confighelp</option
+> puede encontrar los nombres de los elementos disponibles y los valores actuales.</para>
+<para
+>A través de <option
+>--config</option
+> puede especificar un archivo de configuración diferente. Cuando utilice con frecuencia diferentes configuraciones para &kdiff3; ésto le permitirá cambiar entre ellas.</para>
+</sect2>
+<sect2
+><title
+>Opciones de la línea de órdenes que se ignoran</title>
+<para
+>Mucha gente quiere utilizar &kdiff3; con algún sistema de control de versiones. Pero cuando el sistema de control de versiones llama a &kdiff3; utilizando los parámetros de la línea de órdenes &kdiff3; no los reconoce, y termina con un error. Las preferencias de integración le permiten especificar los parámetros de línea de órdenes que &kdiff3; debería ignorar. Aparecerán en la ayuda de uso, de forma similar a este ejemplo:</para>
+<screen
+>--<replaceable
+>foo</replaceable
+>                     Ignored. (Definida por el usuario.)
+</screen>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Opciones de la línea de órdenes a ignorar:</emphasis
+></term
+><listitem
+><para
+>Una lista de opciones separadas por punto y coma «;». Cuando aparezca una de estas opciones en una línea de órdenes, &kdiff3; la ignorará y se ejecutará sin informar de ningún error (el valor predeterminado es «u;query;html;abort»).</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Si ésto no es suficiente, se recomienda escribir un script para el intérprete de órdenes que traduzcan esta opción.</para>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Diálogo abrir</title>
+<para
+>Como se pueden seleccionar varios archivos de entrada, el programa tiene un diálogo de apertura especial: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>El diálogo abrir le permite editar los nombres de los archivos manualmente, seleccionando un archivo a través del navegador de archivos («Archivo...») o permitir la elección de los archivos recientes a través de las listas desplegables. Si abre el diálogo nuevamente, el nombre actual continúa ahí. El tercer archivo de entrada no es necesario. si la entrada para «C» permanece vacía, solo se efectuará el análisis de diferencia de dos archivos. </para
+><para
+>Puede seleccionar un directorio a través de «Dir...». Si se especifica un directorio para A entonces comienza la comparación/fusión de directorios. Si en A especifica un archivo pero en B,C o en la salida se especifica un directorio, &kdiff3; utiliza el nombre del archivo de A en los directorios especificados. </para
+><para
+>Si está seleccionado «Fusionar», la línea de «Salida» será editable. Pero no se necesita especificar el nombre de archivo de salida de forma inmediata. Puede postponerlo hasta que lo guarde. </para
+><para
+>El botón «Configurar...» abre el diálogo de opciones, de forma que pueda seleccionar las opciones antes de realizar el análisis. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Pegar y soltar la entrada</title>
+<para
+>Algunas veces deseará comparar partes de un texto que no sea propiamente un archivo. &kdiff3; también le permite pegar texto desde el portapapeles a la ventana de entrada de diff que tenga el foco. El análisis de las diferencias se producirá inmediatamente. En el diálogo abrir no necesitará especificar archivos entonces, ciérrelo con el botón «Cancelar». </para
+><para
+>También podrá utilizar arrastrar y soltar: Arrastre un archivo desde un administrador de archivos o seleccione texto en un editor y arrástrelo a la ventana de entrada. </para
+><para
+>¿Cuál es la idea? Algunas veces un archivo contiene dos funciones similares, pero comprobar las similitudes es un esfuerzo enorme si primero debe crear los archivos y luego cargarlos. Ahora bastará con copiar, pegar y comparar las secciones relevantes. </para
+><para
+>Nota: En estos momentos no podrá arrastrar nada desde &kdiff3;. Solo está soportado en la ventana de entrada diff. </para
+><para
+>Aviso: Algunos editores todavía interpretan arrastrar y soltar en otro programa como cortar (en lugar de copiar) y pegar. En este caso sus datos originales se perderían. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Interpretar la información en las ventanas de entrada</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<sect2
+><title
+>Línea de información</title
+><para
+>En la parte superior de cada ventana de texto se encuentra la «línea de información». Las líneas de información de las ventanas de entrada contienen una letra «A», «B» y «C», el nombre del archivo, un botón para el navegador, y el número de línea de la primera línea visible en la ventana (recuerde que la ventana «C» es opcional). Cada línea de información aparecerá con un color diferente. </para
+><para
+>Cuando selecciona otro archivo a través del navegador o termina de editar el nombre del archivo pulsando entrar, el nuevo archivo se cargará y se comparará con el(los) archivo(s) que ya estaba(n) cargado(s). </para
+></sect2
+><sect2
+><title
+>Coloreado</title
+><para
+>Las tres ventanas de entrada tienen asignadas las letras «A», «B» y «C». «A» tiene color azul, «B» verde y «C» magenta (estos son los valores predeterminados, pero puede cambiarlos en el menú Preferencias). </para
+><para
+>Cuando se detecta una diferencia el color mostrado en el archivo de entrada cambia. Cuando los dos archivos presentan diferencias el color utilizado para expresar esto es rojo de manera predeterminada («Color de conflicto» en las preferencias). Este esquema de color es especialmente práctico en el caso de que tenga tres archivos de entrada, tal y como se verá en la próxima sección (<link linkend="merging"
+>Fusionar</link
+>). </para
+></sect2
+><sect2
+><title
+>Columna resumen</title
+><para
+>A la izquierda de cada texto se encuentra la «columna resumen». Si las diferencias se producen en una línea la columna resumen muestra el color correspondiente. Si la diferencia es sólo de espacios en blanco se marca el resumen. Para los lenguajes de programación en los que los espacios no son importantes es práctico para apreciar de un vistazo si se modificó algo importante. (En C/C++ los espacios en blanco sólo son interesantes en el interior de las cadenas, comentarios, para el preprocesador y en otra serie de extrañas situaciones). </para
+><para
+>La línea vertical que separa la columna resumen y el texto se interrumpe si el archivo de entrada no tiene líneas. Cuando se activa el ajuste de línea, esta línea vertical aparecerá punteada en las líneas ajustadas. </para
+></sect2
+><sect2
+><title
+>Columna de visión general</title
+><para
+>En el lado derecho podemos encontrar la columna «visión general», a la izquierda de la barra de desplazamiento. Muestra la columna de resumen comprimida de la entrada «A». todas las diferencias y conflictos se pueden apreciar de un vistazo. Cuando solo se utilizan dos ventanas de entrada, todas las diferencias aparecerán en rojo, ya que cada diferencia supondrá un conflicto. Un rectángulo negro marca la parte visible de las entradas. Para los archivos con entradas muy largas, cuando el número de líneas es más grande que la altura de la columna visión general en pixels, varias líneas de entrada compartirán una línea de visión general. Un conflicto tendrá más prioridad que las simples diferencias, que a su vez tendrán prioridad sobre lo no cambiado, de forma que no se pierdan las diferencias o los conflictos aquí. Pulsando sobre la columna de visión general se mostrará el correspondiente texto. </para
+></sect2
+><sect2 id="manualdiffhelp"
+><title
+>Líneas alineadas manualmente</title
+><para
+>Algunas veces el algoritmo sitúa líneas incorrectas unas al lado de otras. O desea comparar un trozo de texto con otro texto que está en una posición completamente diferente en el otro archivo. Para estas situaciones puede indicar a &kdiff3; manualmente que alinee algunas líneas. Marque el texto que quiera alinear con el ratón, como si estuviera copiando y pegando, en la primera vista de diferencia y seleccione «Añadir alineación manual de diferencias» en el menú «Diffview» (acceso rápido de teclado «Ctrl-Y»). Aparecerá una barra naranja en la columna resumen al lado del texto seleccionado. Repita esto para la segunda y (si está disponible) para la tercera vista. &kdiff3; recalculará inmediatamente las diferencias cada vez que haga esto, y alineará las líneas elegidas. Por supuesto, alguna de las líneas que antes coincidían puede que ya no coincidan. </para
+><para
+>En estos momentos el fusionado no soporta el uso de ayuda de diff manual. </para
+></sect2>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Fusionar y la ventana del editor de la salida fusionada</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>La ventana del editor de la salida fusionada (bajo las ventanas de la entrada de diferencias) también tiene una línea de información sobre ella que mostrará «Salida», el nombre del archivo y «[Modificado]» si edita algo. Normalmente contendrá texto que podrá fusionarse automáticamente con facilidad, pero algunas veces también contendrá conflictos. </para
+><para
+>El guardado está desactivado hasta que se hayan resuelto todos los conflictos (utilice los botones «Ir al conflicto anterior/siguiente sin resolver» para encontrar los conflictos que falten). </para
+><para
+>Con sólo dos archivos de entrada, cada diferencia es también un conflicto que debe resolverse manualmente. </para
+><para
+>Con tres archivos de entrada el primer archivo se utiliza como base, mientras que el segundo y tercer archivos de entrada contienen las modificaciones. Si en cualquier línea solo tienen cambios la entrada B o la C pero no ambas se seleccionará automáticamente la fuente cambiada. Solo cuando B y C tengan cambios en las mismas líneas, la herramienta detectará un conflicto que debe resolverse manualmente. Cuando B y C sean iguales, pero diferentes a A, se seleccionará C. </para
+><sect2
+><title
+>La columna resumen</title
+><para
+>El editor de la salida de fusionado también tiene una columna resumen a su izquierda. Mostrará la letra de la entrada de la que se seleccionó la línea, o nada si las tres fuentes son iguales en esa línea. Para los conflictos mostrará un signo de interrogación «?» y la línea mostrará «&lt;Conflicto de fusionado&gt;», en rojo. Puesto que resolver los conflictos línea a línea es muy arduo, las líneas se agruparán en grupos que tengan las mismas diferencias y conflictos característicos. Pero los conflictos causados solo por espacios en blanco se separarán de los conflictos no causados por espacios en blanco para facilitar el fusionado de los archivos cuando el sangrado cambia en muchas líneas. </para
+></sect2
+><sect2 id="synchronise_views"
+><title
+>Configurar el grupo actual, sincronizado de fusión y posición de vista de diferencias</title
+><para
+>Cuando se pulsa en la columna resumen con el botón izquierdo del ratón en la ventana a la que pertenezca este grupo, se seleccionarán todas las ventanas y se mostrará el comienzo de este grupo (ésto implica un salto automático en la posición de la ventana si el principio del grupo no se encuentra visible). El grupo se convierte en el «grupo actual». Se resalta con la «gama (diff) de color del fondo actual» y aparecerá una barra negra en la parte izquierda del texto. </para
+></sect2
+><sect2
+><title
+>Seleccionar las entradas A, B o C para el conflicto actual y la edición</title
+><para
+>La barra de botones bajo el menú incluye tres botones para seleccionar las entradas que contienen las letras «A», «B» y «C». Pulse el botón selector de entrada para insertar (o eliminar si ya se ha insertado) las líneas de la fuente respectiva. Para seleccionar las líneas de varias entradas pulse los botones correspondientes en el orden que necesite. Por ejemplo, si desea que las líneas de «B» aparezcan antes de las líneas de «A» en la salida, pulse primero «B» y luego «A». </para
+><para
+>Si estaba utilizando la opción avance automático (<link linkend="autoadvance"
+>«Automáticamente ir al conflicto siguiente sin resolver después de una selección de origen»</link
+>), debería desactivarla antes de elegir líneas desde varias entradas o editar líneas después de su elección. Sino lo hace &kdiff3; saltará al siguiente conflicto después de elegir la primera entrada. </para
+><para
+>Suele ser práctico para editar directamente la salida resultante de la fusión. La columna resumen mostrará «m» para cada línea que se haya modificado manualmente. Cuando, por ejemplo, las diferencias estén alineadas de forma que la simple elección no sea satisfactoria, puede marcar el texto necesario y utilizar <link linkend="selections"
+>copiar y pegar</link
+> de forma normal para situarlo en la salida de fusionado. </para
+><para
+>Algunas veces, cuando una línea se elimina bien por el fusionado o por la edición manual y no hay más líneas en este grupo, aparecerá el texto &lt;Sin línea fuente&gt;. Se coloca en lugar del grupo de forma que pueda cambiar de idea y seleccionar de nuevo la fuente. Este texto no aparecerá en el archivo guardado o en cualquier selección que copie y pegue. </para
+><para
+>El texto «&lt;Conflicto de fusionado&gt;» aparecerá en el portapapeles si copia y pega texto que la contenga. Pero tenga cuidado al hacerlo. </para
+></sect2
+><sect2
+><title
+>Seleccionar las entradas A, B o C para todos los conflictos</title
+><para
+>El fusionado normal se inicia resolviendo los conflictos sencillos automáticamente. Pero el menú «Fusionar» proporciona algunas acciones para otras necesidades habituales. Si ha seleccionado la misma fuente para más conflictos, podrá seleccionar «A», «B» o «C» en cualquier sitio, o solo para los conflictos pendientes de resolver, o para los conflictos sin resolver que sean debidos a espacios. Si desea decidir cada delta por sí mismo, puede «Establecer deltas a conflictos». O si desea volver a las elecciones automáticas de &kdiff3; seleccione «Resolver automáticamente conflictos simples». &kdiff3; reiniciará el fusionado. Para las acciones que cambien sus modificaciones anteriores &kdiff3; le pedirá confirmación antes de realizarlo. </para
+><para
+>Nota: Cuando seleccione fuente para los conflictos de espacios en blanco sin resolver y las opciones «Ignorar números» o «Ignorar comentarios C/C++», los cambios en los números o en los comentarios se tratarán también como espacios en blanco. </para
+></sect2
+><sect2 id="vcskeywordsmergesupport"
+><title
+>Fusión automática de las claves de control de versión y del historial (registro)</title
+><para
+>Many version control systems support special keywords in the file. (e.g. "&#36;Date: 2006-04-21 17:24:21 -0400 (Fri, 21 Apr 2006) &#36;", "&#36;Header&#36;", "&#36;Author: toma &#36;", "&#36;Log&#36;" etc.) During the check-in the version control system (VCS) changes these lines. For instance "&#36;Date: 2006-04-21 17:24:21 -0400 (Fri, 21 Apr 2006) &#36;" will turn into "&#36;Date: 2006-04-21 17:24:21 -0400 (Fri, 21 Apr 2006) &#36;". Since this line will be different in every version of the file, it would require manual interaction during the merge. </para
+><para
+>&kdiff3; ofrece fusionado automático para estos elementos. Para las líneas que coincidan con la opción «Fusionar automáticamente expresión regular» en todos los archivos de entrada de &kdiff3; se elegirá la línea desde B o -si está disponible- desde C (adicionalmente es necesario que las líneas en cuestión si las comparamos con las líneas anteriores no han de tener conflictos). Esta fusión automática también se puede ejecutar de forma inmediata después de iniciar la fusión (active la opción «Ejecutar expresión regular de fusión automática al iniciar la fusión») o posteriormente a través del menú de fusión «Ejecutar expresión regular de fusión automática»). </para
+><para
+>También está soportada la fusión automática para el historial de control de versión (también llamado «registro»). El historial de fusión automática se puede ejecutar automáticamente cuando se inicie la fusión activando la opción «Resolver automáticamente los conflictos del historial». </para
+><para
+>Usually the version control history begins with a line containing the keyword "$Log$". This must be matched by the "History start regular expression"-option. &kdiff3; detects which subsequent lines are in the history by analysing the leading characters that came before the "$Log$"-keyword. If the same "leading comment" also appears in the following lines, then they are also included in the history. </para
+><para
+>Durante cada descarga el VCS escribe una única línea especificando la versión, fecha, e información horaria seguida de líneas con comentarios del usuario. Estas líneas forman una entrada de historial. Esta sección del historial crece cada vez que descarga de forma que las entrada más recientes aparecerán en la parte superior (después de la línea de inicio del historial). </para
+><para
+>Cuando dos o más desarrolladores que están realizando un desarrollo paralelo descargan una rama de un archivo la fusión del historial contendrá varias entradas que aparecerán como conflictos durante la fusión de las ramas. Como esta fusión puede ser muy aburrido, &kdiff3; ofrece soporte con dos posibles estrategias: Insertar la información del historial de ambos colaboradores en la parte superior u ordenar la información del historial por una clave definida por el usuario. </para
+><para
+>El método que simplemente inserta las entradas es fácil de configurar. &kdiff3; solo necesita un método para detectar qué líneas pertenecen a una entrada del historial. La mayor parte de los VCS insertan una línea vacía después de cada entrada del historial. Sino hay otras líneas vacías, éste criterio es suficiente para &kdiff3;. Seleccione «Entrada del historial que inicia una expresión regular». Si el criterio de la línea vacía no es suficiente, puede especificar una expresión regular para detectar el inicio de la entrada del historial. </para
+><para
+>Tenga en cuenta que &kdiff3; eliminará las entradas duplicadas del historial. Si una entrada aparece varias veces en el historial de un archivo de entrada, solo permanecerá una en la salida. </para
+><para
+>Si desea ordenar el historial, debe especificar cómo se debe construir la clave de  ordenación. Utilice paréntesis en «Entrada del historial que inicia una expresión regular» para agrupar partes del a expresión regular que se deberían utilizar posteriormente para la tecla de ordenación. A continuación especifique «Orden de la clave de ordenación que inicia la entrada del historial» especificando una lista de números separados por una coma «,» para referirse a la posición del grupo en la expresión regular. </para
+><para
+>Debido a que no es sencillo de hacer al primer intento, podrá comprobar y mejorar la expresión regular y la generación de clave en un diálogo dedicado pulsando el botón «Comprobar sus expresiones regulares». </para
+><para
+>Example: Assume a history that looks like this: <screen>
+/**************************************************************************
+** HISTORY:    $Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp $
+**
+**     \main\integration_branch_12   2 Apr 2001 10:45:41   tom
+**  Merged branch simon_branch_15.
+**
+**     \main\henry_bugfix_branch_7\1   30 Mar 2001 19:22:05   henry
+**  Improved the speed for subroutine convertToMesh().
+**  Fixed crash.
+**************************************************************************/
+</screen
+> The history start line matches the regular expression ".*\$Log.*\$.*". Then follow the history entries. </para
+><para
+>The line with the "$Log$"-keyword begins with two "*" after which follows a space. &kdiff3; uses the first non-white-space string as "leading comment" and assumes that the history ends in the first line without this leading comment. In this example the last line ends with a string that also starts with two "*", but instead of a space character more "*" follow. Hence this line ends the history. </para
+><para
+>Sino es necesaria la ordenación del historial entonces la entrada del historial comenzará con una línea de expresión regular como esta (esta línea se divide en dos porque sino no se puede ajustar) <screen>
+\s*\\main\\\S+\s+[0-9]+ (Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</screen
+> Para obtener detalles sobre las expresiones regulares por favor, consulte la <ulink url="http://doc.trolltech.com/3.3/qregexp.html#details"
+>documentación de las expresiones regulares de Trolltech</ulink
+>. Tenga en cuenta que "\s" (con la «s» minúscula) coincidirá con cualquier espacio y "\S" (con «S» mayúscula) coincidirá con lo que no sean espacios en blanco. En nuestro ejemplo la entrada del historial deberá contener primero la versión de información de la expresión regular "\\main\\\S+", la fecha formada por el día «[0-9]+», més «(Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic)» y año «[0-9][0-9][0-9][0-9]», la hora «[0-9][0-9]:[0-9][0-9]:[0-9][0-9]» y finalmente el nombre de registro del desarrollador «.*». Vea que el comentario importante (en el ejemplo «**») lo eliminará KDiff3 antes de buscar la coincidencia, de ahí que la expresión regular comience con con una expresión regular para ninguno o más espacios en blanco «\s*». </para
+><para
+>Si necesita un historial ordenado, se calculará la clave de ordenación. Para esta las partes relevantes en la expresión regular se deben agrupar entre paréntesis (los paréntesis adicionales puede mantenerse aunque desactive la ordenación del historial). <screen>
+(Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</screen
+> Los paréntesis ahora contendrán: 1. versión de información, 2. día, 3. mes, 4. año, 5. hora, 6. nombre. Pero si deseamos ordenarlos por fecha y hora, necesitará construir una clave con los elementos en un orden de aparición diferente: Primero el año, seguido del mes, día, hora, información de versión y nombre. De ahí que el orden de la clave de ordenación que se deba especificar sea «4,3,2,5,1,6». </para
+><para
+>Ya que los nombres de los meses no son buenos para la ordenación («Abr» iría primero) &kdiff3; detectará que son nombres de meses y utilizará números en su lugar («Abr»->«04»). Si se encuentra un número puro se transformará en un valor de 4 dígitos con ceros significativos para la ordenación. Finalmente la clave de ordenación resultante que iniciará la primera entrada del historial será: <screen
+>2001 04 0002 10:45:41 rama_integración_12   tom 
+</screen>
+</para
+><para
+>Para obtener más detalles consulte también <link linkend="diffmergeoptions"
+>Configuración de Diff y Merge</link
+>. </para>
+</sect2>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navegación y edición</title>
+<para
+>La mayor parte de la navegación puede realizarse con las barras de desplazamiento y el ratón, pero también puede navegar con las teclas. Si pulsa en cualquier ventana puede utilizar los cursores izquierdo, derecho, arriba, abajo, página arriba, página abajo, inicio, fin, Ctrl-Inicio, Ctrl-Fin tal y como lo haría en otros programas. La columna vista general situada al lado de la barra vertical de desplazamiento en los archivos de entrada también puede utilizarse para navegar pulsando sobre ella. </para
+><para
+>También puede utilizar la rueda del ratón para desplazarse arriba y abajo. </para
+><para
+>En el editor de la salida de fusionado también puede utilizar las otras teclas para la edición. Puede cambiar entre los modos insertar y sobreescribir con la tecla Insertar (el modo predeterminado es insertar). </para
+><para
+>Una pulsación del botón izquierdo del ratón en la columna resumen sincronizará todas las ventanas para mostrar el inicio del mismo grupo de líneas (tal y como se explicaba en la sección <link linkend="synchronise_views"
+>«Configurar el grupo actual, sincronizado de fusión y posición de vista de diferencias»</link
+>). </para
+><para
+>La barra de botones también contiene siete botones de navegación con los que podrá saltar a la diferencia actual/primera/última, a la siguiente/anterior diferencia (Ctrl-Flecha abajo/Ctrl-Flecha arriba), al siguiente/anterior conflicto (Ctrl-Página abajo/Ctrl-Página arriba), o al siguiente/anterior conflicto sin resolver. Tenga en cuenta que para &kdiff3; un «conflicto» que no se pudo resolver automáticamente al comienzo del fusionado continúa siendo un «conflicto» aunque se haya resuelto. De aquí la necesidad de distinguir los «conflictos sin resolver» </para>
+<sect2 id="autoadvance"
+><title
+>Avance automático</title>
+<para
+>También existe el botón «Automáticamente ir al conflicto siguiente sin resolver después de una selección origen» (avance automático). Si activa esto, cuando se seleccione una fuente &kdiff3; saltará automáticamente al siguiente conflicto sin resolver. Esto puede ayudarle cuando desee seleccionar una sola fuente. Cuando necesite ambas fuerte, o desee editar después de la selección, probablemente querrá desactivar esto. Antes de continuar con el siguiente conflicto sin resolver &kdiff3; muestra el resultado de su elección durante un momento. Este retardo es ajustable en las preferencias Diff y fusión: Puede especificar en «Retardo auto avanzado» en milisegundos un valor entre 0 y 2.000. Pista: ¿Cansado de tanta pulsación? Utilice un retardo de avance automático pequeño y los accesos rápidos Ctrl-1/2/3 para seleccionar A/B/C para muchos de los conflictos. </para>
+</sect2>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Seleccionar, copiar y pegar</title>
+<para
+>Las ventanas de entrada no muestran un cursor, por ello las selecciones se hacen pulsando el botón izquierdo del ratón al inicio, manteniendo pulsado el botón del ratón y moviéndose al final, momento en el que soltará el botón del ratón. También puede seleccionar una palabra con una doble pulsación. En la salida del editor de fusionado puede realizar la selección a través del teclado manteniendo pulsado el botón «mayúsculas» y navegando con las teclas de cursor. </para
+><para
+>Si la selección excede el rango visible puede desplazar el ratón sobre los bordes de la ventana que harán que &kdiff3; se desplace en esta dirección. </para
+><para
+>Para las selecciones muy largas puede utilizar las teclas de navegación mientras mantiene pulsado el ratón. P.ej. utilice RePág y AvPág para ir rápidamente a una posición determinada. Al final de la posición suelte el botón del ratón. </para
+><para
+>Para seleccionarlo todo en la ventana actual utilice el menú «Editar»->«Seleccionar todo» (Ctrl-A). </para
+><para
+>Para copiar al portapapeles debe pulsar el botón «Copiar» (Ctrl-C o Ctrl-Insertar). Pero también existe la opción «Auto copiar selección». Si está activado, todo lo que seleccione se copiará inmediatamente y no necesitará realizar la copia explícitamente. Ponga atención cuando lo utilice ya que el contenido del portapapeles puede destruirse accidentalmente. </para
+><para
+>«Cortar» (Ctrl-X o Mayúsculas-Borrar) copia el texto seleccionado al portapapeles y lo borra. </para
+><para
+>«Pegar» (Ctrl-V o Mayúsculas-Insertar) inserta el texto del portapapeles en la posición del cursor o sobre la selección actual. Si pega algo en cualquier ventana de entrada de diferencia se mostrará el contenido del portapapeles en esta ventana y la comparación se reiniciará inmediatamente. Es práctico si desea guardar rápidamente un trozo de texto de alguna parte y compararlo con algo sin crear los archivos en primer lugar. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Guardar</title>
+<para
+>Guardar solo estará permitido cuando se hayan resuelto todos los conflictos. Si el archivo ya existe y la opción «Archivos de copia de seguridad» está activada el archivo existente se renombrará con una extensión «.orig», pero si ya existe un archivo se borrará. Cuando salga o inicie otro análisis de diferencias y los datos no se hayan guardado, &kdiff3; le preguntará si desea guardar, cancelar o continuar sin guardar (&kdiff3; no captura ninguna señal. Por eso si ejecuta «kill» sobre &kdiff3; sus datos se perderán). </para
+><para
+>Los finales de línea se guardan de acuerdo con el método utilizado por el sistema operativo. Para Unix cada línea termina con un caracter de nueva línea «\n», mientras que para los sistemas basados en Win-32 cada línea termina con un retorno de carro + un nueva línea «\r\n». &kdiff3; no conserva los finales de línea de los archivos de entrada, lo que significa que no debería utilizar &kdiff3; con archivos binarios. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Buscar cadenas</title>
+<para
+>Puede buscar una cadena en cualquier ventana de texto de &kdiff3;. La orden «Buscar...» («Ctrl-F) en el menú Editar abre un diálogo que le permite especificar la cadena a buscar. La búsqueda siempre comenzará en la parte superior. Utilice la orden «Buscar siguiente» («F3») para buscar la siguiente aparición. si selecciona la búsqueda en varias ventanas se comenzará a buscar en la primera ventana de arriba hacia abajo antes de iniciar la búsqueda en la parte superior de la siguiente ventana, etc. </para>
+</sect1>
+
+<sect1 id="printing"
+><title
+>Impresión</title>
+<para
+>&kdiff3; soporta impresión de las diferencias en los archivos de texto. La orden «Imprimir» (Ctrl-P) en el menú archivo abre un diálogo que permite seleccionar la impresora y ajustar otras opciones. </para
+><para
+>Existen varias posibilidades de ajustar el rango. Debido a las diferencias existentes en los diálogos de impresión de los diversos sistemas operativos, el método para realizar determinadas selecciones variará. </para>
+<variablelist>
+   <varlistentry
+><term
+>Todo:</term
+><listitem
+><para
+>Imprime todo.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Actual:</term
+><listitem
+><para
+>Imprime un página comenzando en la primera línea visible de la ventana (en sistemas sin esta opción se puede suplir este inconveniente especificando la página número 10000 para imprimir).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Selección:</term
+><listitem
+><para
+>Antes de realizar esta elección de impresión seleccione el texto con el ratón (como para copiar y pegar) en una de las ventanas de entrada de diferencias para definir las líneas inicial y final. Si no hay texto seleccionado en una de las ventanas de diferencia, no estará disponible esta opción (en sistemas sin esta opción se puede conseguir el mismo resultado especificando la página 9999).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Rango:</term
+><listitem
+><para
+>Especifique la primera y última página. </para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Otras opciones importantes para la impresión son las habituales: </para
+><itemizedlist>
+   <listitem
+><para
+>Letra, tamaño de letra</para
+></listitem>
+   <listitem
+><para
+>Mostrar números de línea</para
+></listitem>
+   <listitem
+><para
+>Ajuste de texto</para
+></listitem>
+   <listitem
+><para
+>Colores</para
+></listitem>
+   <listitem
+><para
+>etc.</para
+></listitem>
+</itemizedlist>
+<para
+>También se recomienda la impresión en formato apaisado. </para>
+</sect1>
+
+<sect1 id="options"
+><title
+>Opciones</title>
+<para
+>Las opciones y la lista de archivos recientes se guardarán cuando salga del programa, y se recargarán cuando lo inicie (Menú Preferencias->Configurar &kdiff3; ...). </para>
+<sect2
+><title
+>Fuente</title>
+<para
+>Seleccione un tipo de letra de ancho fijo (en algunos sistemas este diálogo puede mostrar tipos de letra de ancho variable, pero no debería utilizarlas). </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Fuente cursiva para deltas:</emphasis
+></term
+><listitem
+><para
+>Si selecciona esto, las diferencias de texto se dibujarán con la versión cursiva del tipo de letra. Si el tipo de letra no soporta cursiva, no hará nada.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Colores</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Color del primer plano:</emphasis
+></term
+><listitem
+><para
+>Habitualmente negro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color de fondo:</emphasis
+></term
+><listitem
+><para
+>Habitualmente blanco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color del fondo de diff:</emphasis
+></term
+><listitem
+><para
+>Habitualmente gris claro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color A:</emphasis
+></term
+><listitem
+><para
+>Habitualmente azul oscuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color B:</emphasis
+></term
+><listitem
+><para
+>Habitualmente verde oscuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color C:</emphasis
+></term
+><listitem
+><para
+>Habitualmente magenta oscuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color de conflicto:</emphasis
+></term
+><listitem
+><para
+>Habitualmente rojo.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Rango actual de color de fondo:</emphasis
+></term
+><listitem
+><para
+>Habitualmente amarillo claro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Rango actual de color de fondo de diff:</emphasis
+></term
+><listitem
+><para
+>Habitualmente amarillo oscuro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colores para los rangos de diferencias seleccionados manualmente:</emphasis
+></term
+><listitem
+><para
+>Habitualmente naranja.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color del archivo más nuevo en la comparación de directorios:</emphasis
+></term
+><listitem
+><para
+>Habitualmente verde.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color del archivo más antiguo en la comparación de directorios:</emphasis
+></term
+><listitem
+><para
+>Habitualmente rojo.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color de los archivos de antigüedad media en la comparación de directorios:</emphasis
+></term
+><listitem
+><para
+>Habitualmente amarillo oscuro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Color para los archivos que faltan en la comparación de directorios:</emphasis
+></term
+><listitem
+><para
+>Habitualmente negro.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Los cambios de color para la comparación de directorios no tendrán efecto hasta la siguiente vez que inicie la comparación de directorios. </para>
+<para
+>En sistemas que solo tengan 16 ó 256 colores algunos de ellos no estarán disponibles en su forma exacta. En aquellos sistema el botón «Predeterminados» seleccionará un color puro. </para>
+</sect2>
+
+<sect2
+><title
+>Preferencias del editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>El tabulador inserta espacios:</emphasis
+></term
+><listitem
+><para
+>Si está desactivado y pulsa la tecla tabulador, se insertará un caracter de tabulación, sino se insertará la cantidad adecuada de caracteres.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tamaño del tabulador:</emphasis
+></term
+><listitem
+><para
+>Se puede ajustar para sus necesidades. El valor predeterminado es 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Auto indentación:</emphasis
+></term
+><listitem
+><para
+>Cuando pulsa Entrar; o Return el sangrado de la línea anterior se utiliza para la nueva línea. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Auto-copiar selección:</emphasis
+></term
+><listitem
+><para
+>Cada selección se copia inmediatamente al portapapeles de forma que no necesitará copiarlo explícitamente. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Estilo línea final:</emphasis
+></term
+><listitem
+><para
+>Al guardar puede seleccionar qué estilo de línea prefiere. El valor predeterminado es la elección habitual para el sistema operativo utilizado. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="diffmergeoptions"
+><title
+>Preferencias de Diff y fusión</title>
+<para
+>Cuando se comparan archivos, &kdiff3; primero intenta hacer coincidir las líneas que sean iguales en todos los archivos de entrada. Solo durante este paso se ignorarán los espacios en blanco. El segundo paso compara cada línea. En este paso los espacios en blanco no se ignorarán. Los espacios en blanco tampoco se ignorarán durante la fusión. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Conservar el retorno de carro</emphasis
+></term
+><listitem
+><para
+>Algunos editores (en algunos sistemas) guardan los caracteres de retorno de carro «\r» y de línea siguiente «\n» al final de la línea, mientras que otros solo guardan el de línea siguiente «\n». Normalmente &kdiff3; ignora el retorno de carro, pero a pesar de que debido a ello no tengan el mismo tamaño parecerán iguales si se comparan juntos. Cuando se activa esta opción, los caracteres de retorno de carro se harán visibles, pero se tratarán como espacios en blanco. Esta opción debería estar desactivada durante el mezclado. El valor predeterminado es apagado.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar números:</emphasis
+></term
+><listitem
+><para
+>De forma predeterminada estará desactivado. Los caracteres numéricos («0-9», «.», «-») se ignorarán en la primera parte del análisis en la que se efectuará la coincidencia de líneas. Sin embargo en el resultado las diferencias sí se mostrarán, pero serán tratadas como espacios en blanco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar comentarios de C/C++:</emphasis
+></term
+><listitem
+><para
+>De forma predeterminada estará desactivado. Los cambios en los comentarios se tratarán como cambios de espacios en blanco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar mayúsculas:</emphasis
+></term
+><listitem
+><para
+>De forma predeterminada estará desactivado. Las diferencias de mayúsculas y minúsculas de los caracteres (como «A» y «a») se tratarán como cambios de espacios en blanco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando del preprocesador:</emphasis
+></term
+><listitem
+><para
+>Vea la <link linkend="preprocessors"
+>siguiente sección</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando de preprocesador de combinación de línea:</emphasis
+></term
+><listitem
+><para
+>Vea la <link linkend="preprocessors"
+>siguiente sección</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Intentar más a fondo:</emphasis
+></term
+><listitem
+><para
+>Intenta encontrar más a fondo una delta más pequeña (de forma predeterminada estará activada). Debería ser efectivo para archivos grandes y complicados. Y lento para archivos muy grandes. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Retardo auto avanzado (ms):</emphasis
+></term
+><listitem
+><para
+>Cuando está activado el modo de «auto avanzado» aquí se especifica durante cuanto tiempo se mostrará el resultado de la selección antes de saltar al siguiente conflicto sin resolver. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Fusionar de forma predeterminada espacios en blanco de dos/tres archivos:</emphasis
+></term
+><listitem
+><para
+>Resuelve automáticamente todos los conflictos de los espacios en blanco seleccionando el archivo especificado (el modo predeterminado es el manual). Práctico si los espacios no son realmente importantes en los archivos. Si solo necesita ésto ocasionalmente mejor utilice «Seleccionar A/B/C para todos conflictos de los espacios en blanco sin resolver» en el menú Fusionar. Tenga en cuenta que si ha activado «Ignorar números» o «Ignorar comentarios de C/C++» esta autoelección también se aplica a los conflictos en los números y en los comentarios. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expresión regular de fusión automática:</emphasis
+></term
+><listitem
+><para
+>Expresión regular para las líneas en las que &kdiff3; debería elegir automáticamente una fuente. Consulte también <link linkend="vcskeywordsmergesupport"
+>Fusión automática</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ejecutar expresión regular de fusión automática al iniciar la fusión:</emphasis
+></term
+><listitem
+><para
+>Si está activado &kdiff3; ejecutará la fusión automática utilizando la «expresión regular de fusión automática» cuando se inicie una fusión. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expresión regular de inicio de historial:</emphasis
+></term
+><listitem
+><para
+>Regular expression for the start of the merge history entry. Usually this line contains the "$Log$"-keyword. Default value: ".*\$Log.*\$.*" </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expresión regular de inicio de entrada del historial:</emphasis
+></term
+><listitem
+><para
+>Una entrada del historial de fusión está formada por varias líneas. Especifique la expresión regular para detectar la primera línea (sin el comentario importante). Utilice paréntesis para agrupar las claves que desee utilizar para la ordenación. Si está vacío, KDiff3 asume que las líneas vacías separan entradas del historial. Consulte también <link linkend="vcskeywordsmergesupport"
+>Fusión automática</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ordenación del historial de fusión:</emphasis
+></term
+><listitem
+><para
+>Activar ordenación del historial del control de versiones </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>orden de la clave de ordenación del inicio de la entrada del historial:</emphasis
+></term
+><listitem
+><para
+>Cada paréntesis utilizado en la expresión regular para la entrada del inicio del historial agrupa una clave que puede utilizarse para la ordenación. Especifique la lista de claves (están numeradas en orden de aparición comenzando con 1) y utilizando «,» como separador (p. ej. «4,5,6,1,2,3,7»). Si permanece vacío, no se realizará ordenación. Consulte también <link linkend="vcskeywordsmergesupport"
+>fusión automática</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Historial del control de versión de fusión al iniciar la fusión</emphasis
+></term
+><listitem
+><para
+>Si está activado &kdiff3; ejecuta automáticamente el fusionado del historial utilizando las opciones antes mencionadas cuando se inicia una fusión. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Compruebe sus expresiones regulares</emphasis
+></term
+><listitem
+><para
+>Este botón muestra un diálogo que le permite mejorar y comprobar la expresión regular. Copie los datos de sus archivos en las líneas de ejemplo. Los «Resultados coincidentes» si la coincidencia se produjo o no. El «Resultado de la clave de ordenación» mostrará la clave utilizada para la ordenación del historial de fusión. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Orden de fusión irrelevante:</emphasis
+></term
+><listitem
+><para
+>Especifique una orden que debería ser llamada cuando &kdiff3; detecte que para el archivo B no contiene datos relevantes ya que están incluídos en C. La orden se llama con los tres nombres de archivo como parámetros. Las datos deberán coincidir con la «expresión regular de fusionado automático» o con el historial sino se considera relevante. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Fusión de directorios</title>
+<para
+>Estas opciones están relacionadas con la exploración del directorio y el manejo del fusionado: Vea la <link linkend="dirmergeoptions"
+>Comparación/fusión de directorios de documentos</link
+> para obtener los detalles. </para
+><para
+>También existe una opción relevante para guardar archivos sencillos: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Archivos de copia de seguridad:</emphasis
+></term
+><listitem
+><para
+>Cuando se guarde un archivo y ya exista una versión antigua, la versión original se renombrará con una extensión «.orig». Si ya existía un archivo de copia de seguridad antigua con la extensión «.orig» se borrará. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Configuraciones regionales</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Idioma:</emphasis
+></term
+><listitem
+><para
+>Ajusta el idioma de la interfaz de usuario. Cambiar esta opción no afectará a la ejecución del programa. Tendrá que salir y reiniciar &kdiff3; para que el cambio tenga efecto (esta opción no está disponible en la versión de KDE; de &kdiff3; porque el idioma se ajusta de forma global en las preferencias de KDE). </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Usar la misma codificación para todo:</emphasis
+></term
+><listitem
+><para
+>Las siguientes opciones de codificación se pueden ajustar de forma separada para cada elemento, o si esta opción está activada, todos los valores tomarán el primer valor. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificación local:</emphasis
+></term
+><listitem
+><para
+>Sobre los selectores de código aparece una nota que le indica cuál es la codificación local (no es ajustable, ya que se utiliza para informarle de su codificación en caso de que no la conozca, y necesite seleccionarla). </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificación de archivo para A/B/C:</emphasis
+></term
+><listitem
+><para
+>Ajusta la codificación para los archivos de entrada. Esto tiene efecto en la interpretación de los caracteres especiales. Como puede ajustar cada codificación por separado puede comparar y fusionar archivos guardados con diferentes codificaciones. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificación de archivo para la salida de la fusión y guardar:</emphasis
+></term
+><listitem
+><para
+>Cuando haya editado un archivo, podrá ajustar qué codificación se utilizará al guardarse en el disco. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificación de archivo para los archivos del preprocesador:</emphasis
+></term
+><listitem
+><para
+>Cuando defina el preprocesador puede que no sea capaz de operar con su codificación (ejem: Sus archivos son de unicode de 16 bit y su preprocesador solo puede utilizar ascii de 8 bit). Con esta opción puede definir la codificación de la salida del preprocesador. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Idioma de derecha a izquierda:</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Varios</title>
+<para
+>Estas opciones y acciones están disponibles en los menús o en la barra de botones.</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Mostrar números de líneas:</emphasis
+></term
+><listitem
+><para
+>Puede seleccionar si los números deberían mostrarse en los archivos de entrada.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar caracteres espacio y tabulador por diferencias:</emphasis
+></term
+><listitem
+><para
+>Algunas veces los espacios visibles y los tabuladores molestan. Puede desactivarlos.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar espacio en blanco:</emphasis
+></term
+><listitem
+><para
+>Desactívelo para suprimir cualquier resaltado o cambio de «solo espacio en blanco» en el texto o en las columnas de vista general (tenga en cuenta que ésto también se aplicará a los cambios en los números y comentarios si están activadas las opciones «Ignorar números» o «Ignorar comentarios C/C++»).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Opciones de la vista general:</emphasis
+></term
+><listitem
+><para
+>Estas elecciones están disponibles cuando compara tres archivos. En el modo normal todas las diferencias se muestra en un color codificado en la columna de vista general. Pero algunas veces puede estar interesado en las diferencias entre solo dos de los tres archivos. Seleccionando vista «A vs. B», «A vs. C» o «B vs. C» se mostrará una segunda columna de vista general con la información requerida situado al lado de la visión general normal. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Ajuste de palabras en las ventanas diff:</emphasis
+></term
+><listitem
+><para
+>Ajusta las líneas cuando su longitud excede del ancho de una ventana. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar ventana A/B/C:</emphasis
+></term
+><listitem
+><para
+>Algunas veces deseará utilizar mejor el espacio de la pantalla para las líneas largas. Oculte las ventanas que no sean importantes (en el menú Ventanas).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Cambiar orientación de división:</emphasis
+></term
+><listitem
+><para
+>Cambia entre las ventanas diff mostrándolas una cerca de la otra (A a la izquierda de B, y a la izquierda de C) o una sobre otra (A sobre B y sobre C). También debería servir de ayuda para las líneas largas (en el menú Ventanas). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Iniciar fusión rápida:</emphasis
+></term
+><listitem
+><para
+>Algunas veces puede estar viendo las deltas y decidir fusionarlas. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> «Fusionar el archivo actual» en el menú Directorio también funcionará si solo compara dos archivos. Una simple pulsación inicia la fusión y utiliza el nombre de archivo del último archivo de entrada como nombre de archivo predeterminado (cuando se utiliza esto para reiniciar una fusión, se conservará el nombre de archivo de la salida).</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Configurar accesos rápidos de teclado</title>
+<para
+>En estos momentos solo la versión para KDE soporta accesos rápidos de teclado configurables por el usuario (Menú Preferencias->Configurar accesos rápidos). </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Órdenes del preprocesador</title>
+<para
+>&kdiff3; soporta dos opciones para el preprocesador. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Comando del preprocesador:</emphasis
+></term
+><listitem
+><para
+>Cuando se lee cualquier archivo, se redirigirá a través de esta orden externa. Se podrá ver la salida de esta orden en lugar del archivo original. Puede escribir su propio preprocesador que cubra sus necesidades específicas. Utilice esto para cortar determinadas partes del archivo, o para corregir de forma automática el sangrado, etc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando de preprocesador de combinación de línea:</emphasis
+></term
+><listitem
+><para
+>Cuando se lee cualquier archivo, se redirigirá a través de esta orden externa. Si se especifica una orden de preprocesado (ver a continuación), la salida del preprocesador será la entrada de la coincidencia de líneas del preprocesador. La salida solo se utilizará durante la fase de coincidencia de líneas durante el análisis. Puede escribir su propio preprocesador que cubra sus necesidades específicas. Cada línea de entrada tendrá la correspondiente línea de salida. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>La idea es permitir al usuario gran flexibilidad durante la configuración del resultado de diff. Pero necesita un programa externo, y muchos usuarios no quieren escribirlo ellos. La buena noticia es que muchas veces <command
+>sed</command
+> o <command
+>perl</command
+> harán este trabajo. </para>
+<para
+>Ejemplo: Prueba de mayúsculas sencilla: considerar el archivo a.txt (6 líneas): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> y el archivo b.txt (3 líneas): <screen>
+      cg
+      dg
+      eg
+</screen
+>Sin un preprocesador las siguientes líneas se situarán unas al lado de otras: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Esto no es lo que probablemente lo que se desea ya qu ela primera letra contiene actualmetne la información interesante. Para ayudar al algoritmo de coincidencias a ignorar la segunda letra podemos utilizar una orden de preprocesador, que reemplace «g» con «a»: <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Con esta orden el resultado del a comparación será:<screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+>Internamente el algoritmo de coincidencia ve los archivos después de la ejecución de la línea del preprocesador de coincidencia, pero en la pantalla el archivo continúa sin cambios (el preprocesador normal cambiará también los datos en la pantalla). </para>
+
+<sect2 id="sedbasics"
+><title
+>Lo básico de <command
+>sed</command
+></title>
+<para
+>Esta sección solo introduce algunas características muy básicas de <command
+>sed</command
+>. Para obtener más información consulte <ulink url="info:/sed"
+>info:/sed</ulink
+> o <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Una versión precompilada para Windows puede encontrarse en <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Tenga en cuenta que los siguientes ejemplos asumen que la orden <command
+>sed</command
+> se encuentra en algún directorio definido en la variable de entorno PATH. Si este no es el caso, deberá especificar la ruta completa absoluta de lo orden. </para>
+<note
+><para
+>También debe tener en cuenta que los siguientes ejemplos utilizan una marca de comilla simple (') que no funcionará para Windows. En Windows debería utilizar las marcas de comillas dobles (") en su lugar.</para
+></note>
+<para
+>En este contexto solo se utiliza la orden de sustitución <command
+>sed</command
+>: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>REEMPLAZO</replaceable
+>/<replaceable
+>MODIFICADORES</replaceable
+>'
+</screen
+> Antes de utilizar una orden nueva con &kdiff3;, debería comprobarla en una consola. Aquí será práctica la orden <command
+>echo</command
+>. Ejemplo: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Este ejemplo muestra una orden sed muy simple que reemplaza la primera aparición de «a» con «o». Si desea reemplazar todas las apariciones necesitará el modificador «g»: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> El símbolo «|» es la orden de tubería que transfiere la salida de la orden anterior a la entrada de la siguiente orden. Si desea comprobar el uso con un archivo largo puede utiilzar <command
+>cat</command
+> en los sistemas tipo Unix o <command
+>type</command
+> en los sistemas tipo Windows. <command
+>sed</command
+> hará la sustitución para cada línea. <screen
+><command
+>cat</command
+> <replaceable
+>nombrearchivo</replaceable
+> | <command
+>sed</command
+> <replaceable
+>opciones</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Ejemplos para <command
+>sed</command
+> usados en &kdiff3;</title>
+<sect3
+><title
+>Ignorar otros tipos de comentarios</title>
+<para
+>En estos momentos &kdiff3; solo entiende los comentarios C/C++. Utilizando la orden del preprocesado de línea coincidente también puede ignorar otros tipos de comentarios, convirtiéndoles en comentarios C/C++. Ejemplo: Para ignorar los comentarios que comiencen con «#», debería convertirlos a «//». Tenga en cuenta que debe tener activada la opción «Ignorar comentarios C/C++» para que tenga efecto. Una línea de preprocesado de línea coincidente podría ser: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+>Al igual que para <command
+>sed</command
+> el caracter «/» tienen un significado especial, y es necesarío reemplazar el caracter «\» antes de cada «/» en la cadena de reemplazo. Algunas veces el «\» es necesario para añadir o eliminar un significado especial de ciertos caracteres. Las comillas simples (') antes y después de la orden de sustitución son importantes, ya que sino el intérprete de órdenes intentará interpretar algunos caracteres especiales como «#», «$» o «\» antes de pasarlos a <command
+>sed</command
+>. <emphasis
+>Tenga en cuenta que en Windows aquí necesitará utilizar las comillas dobles ("). Windows sustituye otros caracteres como «%», por ello debería experimentar un poquito</emphasis
+>. </para>
+</sect3>
+<sect3
+><title
+>Sensibilidad de diff a mayúsculas y minúsculas</title>
+<para
+>Utilice la siguiente orden de preprocesado de coincidencia de línea para convertir todas las entradas a mayúsculas: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+>Aquí el «.*» es una expresión regular que incluye a todos los caracteres en la línea. El «\1» en la cadena de reemplazo hace referencia al texto que coincide con el primer par de «\(» y «\)». La «\U» convierte el texto insertado a mayúsculas. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar las claves de control de versión</title>
+<para
+><acronym
+>CVS</acronym
+> y otros sistemas de control de versión utilizan algunas claves para insertar cadenas automáticamente generadas (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword sustitución</ulink
+>). Todos ellos siguen el modelo «$CLAVE generada texto$». Ahora necesitaremos una orden de preprocesado que elimine solo el texto generado: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Las «\|» separan las posibles claves. Podría querer modificar esta lista para acomodarla a sus necesidades. La «\» before the «$» es necesaria porque de otra forma «$» coincidirá con el final de la línea. </para>
+<para
+>Mientras experimenta con <command
+>sed</command
+> puede llegar a entender y a gustarle las expresiones regulares. Son prácticas porque hay muchos programas que soportan cosas similares. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar números</title>
+<para
+>Ignorar los números en realidad es una opción de construcción. Pero como en otros ejemplos, indica el aspecto que podría tener la orden de preprocesado. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Cualquier caracter entre «[» y «]» será una coincidencia y no se reemplazará con nada. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar ciertas columnas</title>
+<para
+>Algunas veces una texto tiene un formato muy estricto y contiene columnas que desearía ignorar, mientras que otras columnas deseará conservarlas para el análisis. En el siguiente ejemplo las primeras cinco columnas (caracteres) se ignorarán, las siguientes diez se conservarán, otras cinco se ignorarán y el resto de la línea se conservará. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Cada punto «.» coincidirá con cualquier caracter simple. El «\1» y el «\2» en la cadena de reemplazo hacen referencia al texto coincidente dentro del primer y segundo par de «\(» y «\)» indicando el texto que se conservará. </para>
+</sect3>
+
+<sect3
+><title
+>Combinar varias sustituciones</title>
+<para
+>Algunas veces deseará aplicar varias sustituciones a la vez. Puede utilizar el punto y coma «;» para separarlas unas de otras. Ejemplo: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Utilizar <command
+>perl</command
+> en lugar de <command
+>sed</command
+></title>
+<para
+>En lugar de <command
+>sed</command
+> podría utilizar algo como <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>EXPREG</replaceable
+>/<replaceable
+>REEMPLAZO</replaceable
+>/<replaceable
+>MODIFICADORES</replaceable
+>'
+</screen
+> Pero algunos detalles son diferentes en <command
+>perl</command
+>. Tenga en cuenta que <command
+>sed</command
+> necesita «\(» y «\)» <command
+>perl</command
+> necesita solo «(» y «)»  sin estar precedido de «\». Ejemplo: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Orden de la ejecución de preprocesado</title>
+<para
+>Los datos van pasando por todos los preprocesadores internos y externos en el siguiente orden: </para>
+<itemizedlist>
+<listitem
+><para
+>Preprocesador normal.</para
+></listitem>
+<listitem
+><para
+>Preprocesador de coincidencia de líneas.</para
+></listitem>
+<listitem
+><para
+>Ignorar mayúsculas (conversión a mayúsculas).</para
+></listitem>
+<listitem
+><para
+>Detección de comentarios C/C++.</para
+></listitem>
+<listitem
+><para
+>Ignorar números.</para
+></listitem>
+<listitem
+><para
+>Ignorar espacios en blanco.</para
+></listitem>
+</itemizedlist>
+<para
+>Los datos después del preprocesador normal se conservarán para mostrarse y fusionarse. El resto de operaciones solo modificarán los datos para que los vea el algoritmo de coincidencia de líneas de diff. </para
+><para
+>En alguna ocasión cuando use el preprocesador normal se dará cuenta de que el preprocesador de coincidencia de líneas verá la salida del preprocesador normal como entrada. </para>
+</sect2>
+
+<sect2
+><title
+>Aviso</title>
+<para
+>La orden de preprocesado suele ser muy práctica, pero como con cualquier opción que modifique su texto u oculte ciertas diferencias automáticamente, puede saltarse accidentalmente ciertas diferencias y en el peor de los casos destruir datos importantes. </para
+><para
+>Por esta razón durante un fusionado si &kdiff3; utiliza una orden de preprocesado normal le preguntará si desea desactivarla o no. Pero no se producirá ningún aviso si está activada la orden de preprocesado de líneas coincidentes. La fusión no se completará hasta que se resuelvan los conflictos. Si desactiva «Mostrar espacios en blanco» las diferencias eliminadas con la orden de preprocesado de líneas coincidentes también estarán visibles. Si el botón guardar continúa desactivado durante una fusión (porque aún existen conflictos), asegúrese de activar «Mostrar espacios en blanco». Si no desea fusionar estas diferencias sin importancia de forma manual puede elegir «Seleccionar [A|B|C] para todos los conflictos de espacios en blanco sin resolver» en el menú Fusionar. </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Comparación y fusionado de directorios con &kdiff3;</title>
+<sect1 id="dirmergeintro"
+><title
+>Iniciar la comparación y fusión del directorio</title>
+<para
+>Frecuentemente los programadores modifican varios archivos en un directorio para conseguir su propósito. Para esto &kdiff3; también le permite comparar y fusionar directorios completos recursivamente. </para
+><para
+>Aunque la comparación y fusionado de directorios parezca bastante obvio, existen varios detalles que debería conocer. Lo más importante es el hecho de que la operación podría afectar a muchos archivos. Si no tiene copias de seguridad de los datos originales, podría ser complicado e incluso imposible devolverlos a su estado original. Por lo tanto, antes de realizar un fusionado, asegúrese de guardar sus datos en un lugar seguro, de forma que sea posible volver atrás. Si crea un archivo o utiliza algún sistema de control de versiones es cosa suya, pero los programadores experimentados y los integradores pueden necesitan las antiguas fuentes. Y tenga en cuenta que a pesar de que yo (el autor de &kdiff3;) intento hacerlo lo mejor posible, no garantizo que no existan fallos. De acuerdo con la licencia GNU GPL NO EXISTE NINGUNA GARANTÍA para este programa. Por lo tanto, sea humilde y tenga siempre lo siguiente en mente: </para>
+<blockquote
+><para>
+   <emphasis
+>Errar es humano, pero para echar las cosas a perder necesita un ordenador.</emphasis>
+</para
+></blockquote>
+<para
+>Ésto es lo que este programa puede hacer por usted: &kdiff3; ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... lee y compara dos o tres directorios recursivamente.</para
+></listitem>
+     <listitem
+><para
+>... tiene un especial cuidado con los enlaces simbólicos.</para
+></listitem>
+     <listitem
+><para
+>... le permitirá navegar por los directorios con una doble pulsación del ratón.</para
+></listitem>
+     <listitem
+><para
+>... para cada elemento propone una operación de fusión, que puede cambiar antes de iniciar la fusión del directorio.</para
+></listitem>
+     <listitem
+><para
+>... le permite simular la fusión y lista las acciones que se realizarían si se llegasen a llevar a cabo.</para
+></listitem>
+     <listitem
+><para
+>... le permite realizar la fusión, y le permite interactuar cuando sea necesaria la interacción manual.</para
+></listitem>
+     <listitem
+><para
+>... le permite ejecutar las operaciones seleccionadas para todos los elementos (tecla F7) o para el elemento seleccionado (tecla F6).</para
+></listitem>
+     <listitem
+><para
+>... le permite continuar la fusión después de la interacción manual con la tecla F7.</para
+></listitem>
+     <listitem
+><para
+>... crea copias de seguridad opcionales, con la extensión «.orig».</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Iniciar la comparación o fusión del directorio</title>
+<para
+>Es similar a la fusión y comparación de archivos. Solo debe especificar los directorios en la línea de órdenes o en el diálogo abrir archivo. </para>
+<sect2
+><title
+>Comparar/fusionar dos directorios: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2</replaceable
+> -o <replaceable
+>directorio-destino</replaceable
+>
+</screen>
+<para
+>Sino se especifica directorio de destino, &kdiff3; utilizará <replaceable
+>directorio2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Comparar/fusionar tres directorios: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2 directorio3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>directorio1 directorio2 directorio3</replaceable
+> -o <replaceable
+>directorio-destino</replaceable
+>
+</screen>
+<para
+>Cuando se fusionen tres directorios <replaceable
+>directorio1</replaceable
+> se utiliza como base para la fusión. Sino se especifica directorio destino, &kdiff3; utilizará <replaceable
+>directorio3</replaceable
+> como directorio destino para la fusión. </para>
+
+<para
+>Tenga en cuenta que solo la comparación se inicia automáticamente, no la fusión. Para esto debería seleccionar la entrada de menú o la tecla F7 (más detalles a continuación). </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Información visible del directorio de fusión</title>
+<para
+>Mientras lee estos directorios se mostrará un cuadro de diálogo en el que se informará del progreso. Si cancela la exploración del directorio, solo se compararán los archivos listados. </para
+><para
+>Cuando se termine la exploración del directorio &kdiff3; mostrará una lista con el resultado... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... y detalles sobre el elemento seleccionado actualmente a la derecha: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>La columna nombre</title>
+<para
+>Cada archivo y directorio que se encuentre durante la exploración se mostrará aquí en un árbol. Puede seleccionar un elemento pulsando una vez con el ratón. </para
+><para
+>De forma predeterminada los directorios están contraídos. Puede expandirlos y contraerlos pulsando en «+»/«-», con una doble pulsación, o utilizando las teclas Flecha izquierda o Flecha derecha. El menú «Directorio» también contiene dos acciones «Plegar todos los subdirectorios» y «Desplegar todos los subdirectorios» con los que podrá contraer y expandir todos los directorios de una vez. </para
+><para
+>Si hace una doble pulsación sobre un elemento de fichero comenzará la comparación y aparecerá la ventana de diferencias de archivos. </para>
+<para
+>La imagen de la columna nombre reflejará el tipo de archivo en el primer directorio («A»). Puede ser uno de estos: </para>
+<itemizedlist>
+     <listitem
+><para
+>Archivo normal.</para
+></listitem>
+     <listitem
+><para
+>Directorio normal (imagen de directorio).</para
+></listitem>
+     <listitem
+><para
+>Enlace a un archivo (imagen de archivo con una flecha de enlace).</para
+></listitem>
+     <listitem
+><para
+>Enlace a un directorio (imagen de directorio con una flecha de enlace).</para
+></listitem>
+</itemizedlist>
+<para
+>Si el tipo de archivo es diferente en el resto de directorios, ésto podrá verse en las columnas A/B/C y en la ventana que muestra los detalles sobre el elemento seleccionado. Tenga en cuenta que en este caso la fusión no podrá seleccionarse automáticamente. Cuando inicie la fusión, el usuario será informado de problemas de este tipo. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Las columnas A/B/C y el esquema de coloreado</title>
+<para
+>Como puede verse en la imagen superior los colores rojo, verde, amarillo y negro son los que se utilizan en las columnas A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Negro: Este elemento no existe en este directorio.</para
+></listitem>
+     <listitem
+><para
+>Verde: El elemento más nuevo.</para
+></listitem>
+     <listitem
+><para
+>Amarillo: Más antiguo que verde, más nuevo que rojo.</para
+></listitem>
+     <listitem
+><para
+>Rojo: El elemento más antiguo.</para
+></listitem>
+</itemizedlist>
+<para
+>Pero para los elementos que son idénticos en la comparación sus colores son idénticos aunque no coincida la antigüedad. </para
+><para
+>Los directorios se consideran iguales si todos los elementos que contienen son idénticos. Entonces tendrán el mismo color. Pero la antigüedad de un directorio no se considerará para su color. </para
+><para
+>La idea de este esquema de color se basa en <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>.Los colores son semejantes a las hojas, que son verdes cuando nacen, se vuelven amarillas más tarde y cuando envejecen se vuelven rojos. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>La columna Operación</title>
+<para
+>Después de comparar los directorios &kdiff3; también evalúa una propuesta para una operación de fusión. Esto se muestra en la columna «Operación». Puede modificar la operación pulsando en la operación que desee cambiar. Aparecerá un pequeño menú y le permitirá seleccionar una operación para este elemento (también puede seleccionar las operaciones a través del teclado. Ctrl+1/2/3/4/Supr seleccionarán A/B/C/Fusionar/Borrar respectivamente si están disponibles). Esta operación se ejecutará durante la fusión. La disponibilidad de estas operaciones dependerá del elemento y del modo de fusión. El modo de fusión será uno de los siguientes: </para>
+<itemizedlist>
+     <listitem
+><para
+>Fusión del árbol de directorios («A» será tratada como la base más antigua de ambas).</para
+></listitem>
+     <listitem
+><para
+>Fusionar dos directorios.</para
+></listitem>
+     <listitem
+><para
+>Sincronizar dos directorios (activado a través de la opción «Sincronizar directorios»).</para
+></listitem>
+</itemizedlist>
+<para
+>En la fusión de tres directorios la operación propuesta será: Si para un elemento... </para>
+<itemizedlist>
+     <listitem
+><para
+>... todos los árboles de directorios son iguales: Copiar desde C.</para
+></listitem>
+     <listitem
+><para
+>... A y C son iguales pero B no: Copiar desde B (o si B no existe, borra el destino, si existe).</para
+></listitem>
+     <listitem
+><para
+>... A y B son iguales pero C no: Copiar desde C (o si C no existe, borra el destino, si existe).</para
+></listitem>
+     <listitem
+><para
+>... B y C son iguales pero A no: Copiar desde C (o si C no existe, borra el destino, si existe).</para
+></listitem>
+     <listitem
+><para
+>... solo existe A: Borrar el destino (si existe).</para
+></listitem>
+     <listitem
+><para
+>... solo existe B: Copiar desde B.</para
+></listitem>
+     <listitem
+><para
+>... solo existe C: Copiar desde C.</para
+></listitem>
+     <listitem
+><para
+>... A, B y C no son iguales: Fusionar.</para
+></listitem>
+     <listitem
+><para
+>... A, B y C no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan elementos como éstos la fusión de directorio no comenzará.</para
+></listitem>
+</itemizedlist>
+<para
+>En la fusión de dos directorios la operación propuesta será: Si para un elemento... </para>
+<itemizedlist>
+     <listitem
+><para
+>... ambos directorios son iguales: Copiar desde B.</para
+></listitem>
+     <listitem
+><para
+>... A existe, pero B no: Copiar desde A.</para
+></listitem>
+     <listitem
+><para
+>... B existe, pero no A: Copiar desde B.</para
+></listitem>
+     <listitem
+><para
+>... A y B existe pero no son iguales: Fusionar.</para
+></listitem>
+     <listitem
+><para
+>... A y B no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan de elementos como éstos la fusión de directorio no comenzará.</para
+></listitem>
+</itemizedlist>
+<para
+>El modo de sincronización estará activo si solo existen dos directorios, no se ha especificado destino y está activa la opción «Sincronizar directorios». &kdiff3; seleccionará una operación predeterminada de forma que ambos directorios sean idénticos después. Si para un elemento ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... ambos directorios son iguales: No se hará nada.</para
+></listitem>
+     <listitem
+><para
+>... A existe, pero B no: copiar A a B.</para
+></listitem>
+     <listitem
+><para
+>... B existe, pero A no: Copiar B a A.</para
+></listitem>
+     <listitem
+><para
+>... A y B existen, pero no son iguales: Fusionar y guardar el resultado en ambos directorios (para los usuarios el nombre de archivo guardado es B, pero entonces &kdiff3; copiará B a A).</para
+></listitem>
+     <listitem
+><para
+>... A y B no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan de elementos como éstos la fusión de directorio no comenzará.</para
+></listitem>
+</itemizedlist>
+<para
+>Cuando se fusionen dos directorios y esté seleccionada la opción «Copiar nuevo en lugar de fusionar», &kdiff3; buscará en las fechas y propondrá como elección el nuevo archivo. Si los archivos no son iguales pero tienen las mismas fechas, la operación contendrá «Error: Las fechas son iguales pero los archivos no». Mientras éstos elementos existan no se iniciará la fusión de directorios. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>La columna estado</title>
+<para
+>Durante la fusión se procesará un archivo tras otro. La columna estado mostrará «Hecho» para los elementos donde se haya producido la operación de fusionado, y otro texto si sucede algo inesperado. Cuando se completa una fusión, debería hacer una última comprobación para ver si el estado de todos los elementos es el adecuado. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Columnas estadísticas</title>
+<para
+>Cuando está activado en las opciones el modo de comparación de archivos «Análisis completo», &kdiff3; mostrará columnas que contienen el número de conflictos sin resolver, resueltos, no en blanco o de espacios en blanco (la columna resueltos solo se mostrará cuando se comparen o fusionen directorios). </para>
+</sect2>
+
+<sect2 id="selectingvisiblefiles"
+><title
+>Seleccionar archivos listados</title>
+<para
+>Varias opciones influyen en los archivos que se listarán aquí. Algunas son accesibles a través del <link linkend="dirmergeoptions"
+>diálogo preferencias</link
+>. El menú Directorio contiene las entradas: </para
+><para
+><itemizedlist>
+     <listitem
+><para
+>«Mostrar archivos idénticos». Archivos que se han detectado como iguales en todos los directorios.</para
+></listitem>
+     <listitem
+><para
+>«Mostrar archivos diferentes». Archivos que existen en dos o más directorios pero que no son iguales.</para
+></listitem>
+     <listitem
+><para
+>«Mostrar archivos solo en A». Archivos que existen solo en A, pero no en B o C.</para
+></listitem>
+     <listitem
+><para
+>«Mostrar archivos solo en B». Archivos que existen solo en B, pero no en A o B.</para
+></listitem>
+     <listitem
+><para
+>«Mostrar archivos solo en C». Archivos que existen solo en C, pero no en A o B.</para
+></listitem>
+</itemizedlist
+></para>
+<para
+>Active las opciones «Mostrar» para los elementos que desee listar. Si por ejemplo solo desea listar todos los elementos que existan en A o en B pero no en ambos, deberá activar «Mostrar archivos solo en A» y «Mostrar archivos solo en B» y desactivar todas las demás («Mostrar archivos idénticos», «Mostrar archivos diferentes», «Mostrar archivos solo en C»). La lista se actualizará inmediatamente para reflejar los cambios. </para
+><para
+>Estas opciones también se aplican para los directorio con una excepción: Desactivar «Mostrar archivos diferentes» no ocultará ningún directorio. Solo funcionará para los archivos que contenga. </para
+><para
+>Tenga en cuenta que de estas opciones solo es persistente la opción «Mostrar archivos idénticos». Los otros se activarán cuando se inicie &kdiff3;. </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Hacer una fusión de directorios</title>
+<para
+>Puede fusionar el elemento seleccionado (archivo o directorio) o todos los elementos. Cuando haya hecho todas sus operaciones de elección (en todos los subdirectorios también) podrá iniciar la fusión. </para
+><para
+>Sea consciente de que sino especifica un directorio de destino explícitamente, el destino será «C» en el modo de tres directorios, «B» en el modo de fusión de dos directorios, y en el modo de sincronización será «A» y/o «B». </para
+><para
+>Si ha especificado un directorio de destino marque todos los elementos del árbol que debieran estar en la salida. Existen algunas opciones que hará que se omitan ciertos elementos del directorio de comparación y del de fusión. Marque estas opciones para evitar sorpresas desagradables: </para>
+<itemizedlist>
+     <listitem
+><para
+>«Directorios recursivos»: Si está desactivado, no se buscarán los elementos de los directorios.</para
+></listitem>
+     <listitem
+><para
+>«Patrón»/«Anti-patrón»: Incluir/excluir elementos que coincidan.</para
+></listitem>
+     <listitem
+><para
+>«Excluir archivos ocultos»</para
+></listitem>
+     <listitem
+><para
+><link linkend="selectingvisiblefiles"
+>«Mostrar» opciones</link
+> (Mostrar archivos idénticos/diferentes, archivos solo en A/B/C)</para
+></listitem>
+</itemizedlist>
+<para
+>Si cambia las preferencias para listar más archivos, debería volver a buscar a través del menú «Directorio»->«Volver a buscar» (el motivo es que para realizar una comparación rápida &kdiff3; omite la comparación para los archivos suprimidos por este criterio). Si cambia sus patrones de archivo y directorio de exclusión de archivos, la lista de archivos se actualizará inmediatamente al cerrar el diálogo de las opciones. </para
+><para
+>Tenga en cuenta que cuando escribe un nuevo directorio completo también deseará copiar los archivos idénticos. En este caso active la opción «Mostrar archivos idénticos». Si su directorio de destino es una de las entradas, ésto no será necesario ya que el archivo ya estará aquí. </para
+><para
+>Si está satisfecho con ésto, el resto es sencillo. </para
+><para
+>Para fusionar todos los elementos: Seleccione «Comenzar/continuar fusión de directorio» en el menú «Directorio» o pulse F7 (que es el acceso rápido). Para fusionar solo el elemento actual: Seleccione «Realizar operación para el elemento actual» o pulse F6. </para
+><para
+>Si debido a tipos de archivos conflictivos todavía continúan existiendo operaciones no válidas, aparecerá un mensaje señalándolo, de forma que pueda seleccionar una operación válida para este elemento. </para
+><para
+>Si fusiona todos los elementos aparecerá un diálogo proporcionándole las opciones «Hacer», «Simular» y «Cancelar». </para>
+<itemizedlist>
+     <listitem
+><para
+>Seleccione «Simular» si desea ver el resultado sin hacer la fusión. Se mostrará un lista de todas las operaciones.</para
+></listitem>
+     <listitem
+><para
+>Sino seleccione «Hacer» para realizar el fusionado.</para
+></listitem>
+</itemizedlist>
+<para
+>Entonces &kdiff3; realizará las operaciones especificadas para todos los elementos. Si se precisa interacción manual (fusión de un solo archivo), aparecerá una ventana de fusión (<link linkend="dirmergebigscreenshot"
+>vea la gran captura de pantalla</link
+>). </para
+><para
+>Cuando haya terminado con un archivo, seleccione de nuevo «Comenzar/continuar fusión de directorio» o la tecla F7. Si todavía no la había guardado, un diálogo le preguntará para hacerlo. Entonces &kdiff3; continuará con el siguiente elemento. </para
+><para
+>Cuando &kdiff3; encuentre un error, éste se lo indicará con información literal del estado. En la parte inferior de la lista, aparecerán algunos mensajes de error que deberían ayudarle a entender la causa del problema. Cuando continúe con la fusión (tecla F7) &kdiff3; le permitirá reintentar o saltarse el elemento que provocó el problema. Esto significa que antes de continuar puede seleccionar otra operación o resolver el problema por otros medios. </para
+><para
+>Cuando la fusión se haya completado, &kdiff3; le informará a través de un cuadro de diálogo. </para
+><para
+>Si algunos elementos se fusionaron de forma individual &kdiff3; lo recordará (mientras esté en esta sesión de fusionado), y no les fusionará nuevamente cuando haga la fusión para todos los elementos. Incluso cuando se salte la fusión o no se guarde nada estos elementos se contarán como completos. Solo cuando cambie la operación de fusionado se eliminará el estado «hecho» del elemento y se podrá fusionar de nuevo. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Opciones para comparación y fusión de directorios</title>
+<para
+>Las preferencias de &kdiff3; (menú «Preferencias»-&gt;«Configurar &kdiff3;») ahora tienen una sección llamada «Fusión de directorio» con estas opciones: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Directorios recursivos:</emphasis
+></term
+><listitem
+><para
+>Indica si se realizará la búsqueda en los directorios de forma recursiva.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Patrón(es) de archivo(s):</emphasis
+></term
+><listitem
+><para
+>Solo los archivos que coincidan con el patrón se colocarán en el árbol. Puede especificarse más de un patrón utilizando el punto y coma «;» como separador. Comodines válidos: «*» y «?» (p. ej. «*.cpp;*.h»). El valor predeterminado es «*». Este patrón no se utiliza en directorios.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-patrón(es) de archivo:</emphasis
+></term
+><listitem
+><para
+>Los archivos y directorios que coincidan con este patrón se excluirán del árbol. Se puede especificar más de un patrón utilizando el «;» como separador. Comodines válidos: «*» y «?». El valor predeterminado es «*.orig;*.o;*.obj».</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-patrón(es) de direcctorio:</emphasis
+></term
+><listitem
+><para
+>Los archivos y directorios que coincidan con este patrón se excluirán del árbol. Se puede especificar más de un patrón utilizando el «;» como separador. Comodines válidos: «*» y «?». El valor predeterminado es «CVS;deps;.svn».</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Usar .cvsignore:</emphasis
+></term
+><listitem
+><para
+>Ignora los archivos y directorios que también se vayan a ignorar por el CVS. Muchos archivos generados automáticamente se ingorarán por el CVS. La gran ventaja es que puede ser un directorio especificado a través del archivo local «.cvsignore» (vea <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Buscar archivos y directorios ocultos:</emphasis
+></term
+><listitem
+><para
+>En algunos sistemas de archivos tienen un atributo «Oculto». En otros sistemas el nombre de archivo comienza con un punto («.»), lo que hace que esté oculto. Esta opción le permite decidir si incluir o no estos archivos en el árbol. De forma predeterminada está activado.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Seguir enlaces de archivos:</emphasis
+></term
+><listitem
+><para
+>Para los enlaces de los archivos: Cuando esté desactivado, se compararán los enlaces simbólicos. Cuando esté activado, se compararán los archivos que estén detrás de los enlaces. De forma predeterminada está desactivada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Seguir enlaces de directorios:</emphasis
+></term
+><listitem
+><para
+>Para los enlaces de los directorios: Cuando esté desactivado se compararán los enlaces simbólicos. Cuando esté activado, el enlace será tratado como un directorio y se explorará recursivamente (tenga en cuenta que el programa no comprueba si el enlace es «recursivo»). Así por ejemplo, un directorio que contenga un enlace al directorio puede provocar un bucle infinito, y después de cierto tiempo podrá sobrecargar la pila o utilizar toda la memoria, colgando el programa). De forma predeterminada está desactivada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comparación de nombres de archivo sensible a mayúsculas y minúsculas:</emphasis
+></term
+><listitem
+><para
+>El valor predeterminado es false (falso) para Windows, true (verdadero) para otros sistemas operativos.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Modo de comparación de archivos:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Comparación binaria:</emphasis
+></term
+><listitem
+><para
+>Éste es el modo de comparación de archivos predeterminado. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Análisis completo:</emphasis
+></term
+><listitem
+><para
+>Hace un análisis completo de cada archivo y muestra las columnas de información estadística (número de conflictos resueltos, sin resolver, no blancos y blancos). El análisis completo es más lento que un simple análisis binario, y mucho más lento cuando se utiliza con archivos que no contienen texto (especifique el anti-patrón archivo). </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Validar la fecha de modificación:</emphasis
+></term
+><listitem
+><para
+>Si compara directorios grandes sobre una red lenta, es más rápido comparar solo las fechas de modificación y el tamaño del archivo. Pero esta mejora del rendimiento paga el precio de una pequeña inseguridad. Utilice esta opción con cuidado. De forma predeterminada estará desactivada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Validar el tamaño:</emphasis
+></term
+><listitem
+><para
+>Similar a la validación de la fecha. No hace comparaciones reales. Dos archivos se consideran iguales si sus tamaños son iguales. Esto es práctico cuando la operación de copiado no conserva la fecha de modificación. Utilice esta opción con cuidado. De forma predeterminada estará desactivada.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Sincronizar directorios:</emphasis
+></term
+><listitem
+><para
+>Activa el «Modo sincronizado» cuando se comparan dos directorios y no se especificó el directorio de destino. En este modo las operaciones propuestas se seleccionarán de forma que tras realizar la operación ambos directorios queden iguales. Por ello el resultado del fusionado se escribirá en ambos directorios. De forma predeterminada estará desactivada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copiar el más nuevo en vez de fusionar:</emphasis
+></term
+><listitem
+><para
+>En lugar de fusionar la operación propuesta será copiar la fuente nueva si hubo algún cambio (considerado inseguro, ya que implica que el otro directorio no ha sido editado. Deberá hacer una comprobación para cada caso). De forma predeterminada estará desactivada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Archivos de copia de seguridad:</emphasis
+></term
+><listitem
+><para
+>Si se reemplaza un archivo o directorio por otro o se borra, la versión original se renombrará con una extensión «.orig». Si ya existía un archivo con la extensión «.orig» se borrará sin hacer copia de seguridad. También afecta al fusionado normal de archivos simples, no solo al modo de fusionado de directorio. De forma predeterminada estará activada.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Otras funciones en la ventana del directorio de fusión</title>
+<sect2
+><title
+>Modo de pantalla dividida/completa</title>
+<para
+>Normalmente la vista de la lista de fusionado de directorios permanece visible cuando se compara o fusiona un solo archivo. Con el ratón puede mover la barra divisoria que separa la lista de archivos de las ventanas de texto diff. Sino desea ésto, puede desactivar la «Vista de pantalla dividida» en el menú «Directorio». A continuación utilice «Cambiar vista» en el menú «Directorio» para conmutar entre la lista de archivos y la ventana de texto diff que ocupará la pantalla completa. </para>
+</sect2>
+<sect2
+><title
+>Comparar o fusionar un solo archivo</title>
+<para
+>Probablemente preferirá una doble pulsación del ratón sobre un archivo para compararlos. Sin embargo existe una entrada en el menú «Directorio». También puede fusionar directamente un solo archivo, sin iniciar el fusionado del directorio a través de la opción «Fusionar un solo archivo» en el menú «Directorio». Al guardar el resultado, el estado cambiará a «hecho», y el archivo no se fusionará si se inicia un fusionado de directorio. </para
+><para
+>Pero tenga en cuenta que la información del estado se perderá cuando vuelva a explorar un directorio: Menú «Directorio»->«Volver a buscar». </para>
+</sect2>
+<sect2
+><title
+>Comparar o fusionar archivos con nombres diferentes</title>
+<para
+>Algunas veces necesitará comparar o fusionar archivos con nombres diferentes (p. ej. el archivo actual y la copia de seguridad en la misma carpeta). </para
+><para
+>Seleccione el archivo exacto pulsando en el icono en la columna A, B o C. El primer archivo seleccionado se marcará con una «A», el segundo y tercero con «B» y «C» con independencia de la columna en la que esté. Solo se podrá seleccionar en la parte superior de los árboles de archivos. </para
+><para
+>Seleccione «Comparar explícitamente archivos seleccionados» o «Fusionar explícitamente archivos seleccionados» desde el menú «Directorio». Estas entradas también aparecerán como menú contextual cuando pulse el botón derecho cuando pulse el último archivo seleccionado. </para
+><para
+>La comparación o fusión de un archivo se realizará en la misma ventana. Si este método se utiliza para directorios se abrirá una ventana nueva. </para
+></sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Temas variados</title>
+<sect1 id="networktransparency">
+<title
+>Transferencia de red a través de KIO</title>
+<sect2
+><title
+>KIO-Slaves</title>
+<para
+>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. </para
+><para
+>Ejemplo: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> prueba.cpp  ftp://ftp.muylejos.org/prueba.cpp
+<command
+>kdiff3</command
+> tar:/home/hacker/archivo.tar.gz/dir ./dir
+</screen>
+</para>
+<para
+>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. </para
+><para
+>Otros KIO-slaves interesantes son: </para>
+<itemizedlist>
+<listitem
+><para
+>Archivos de la web (http:).</para
+></listitem>
+<listitem
+><para
+>Archivos desde el FTP (ftp:).</para
+></listitem>
+<listitem
+><para
+>Transferencia de archivos encriptados (fish:, sftp:).</para
+></listitem>
+<listitem
+><para
+>Recursos Windows (smb:).</para
+></listitem>
+<listitem
+><para
+>Archivos locales (file:).</para
+></listitem>
+</itemizedlist>
+<para
+>Otras cosas posibles, aunque probablemente poco prácticas son: </para>
+<itemizedlist>
+<listitem
+><para
+>Páginas de manual (man:).</para
+></listitem>
+<listitem
+><para
+>Páginas de información (info:).</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Cómo escribir URLs</title>
+<para
+>Una URL tiene una sintaxis diferente comparada con las rutas de los archivos y directorios locales. Algunas cosas a considerar son: </para>
+<itemizedlist>
+<listitem
+><para
+>Una ruta puede ser relativa y puede contener «.» o «..» Ésto no es posible para URLs que son siempre absolutas. </para
+></listitem
+><listitem
+><para
+>Los caracteres especiales deben escribirse «escapados» («#» se convertirá en «%23», los espacios se convertirán en «%20» y así sucesivamente). P.ej. Un archivo con el nombre «/#foo#» tendrá el URL «file:///%23foo%23». </para
+></listitem
+><listitem
+><para
+>Cuando un URL no funcione tal y como esperaba, intente abrirla primero en Konqueror. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Capacidades de los KIO-Slaves.</title>
+<para
+>La transparencia de red tiene un inconveniente: No todos los recursos tienen las mismas capacidades. </para
+><para
+>Algunas veces esto es debido al sistema de archivos del servidor, otras al protocolo. Aquí tenemos una pequeña lista de restricciones: </para>
+<itemizedlist>
+<listitem
+><para
+>Algunas veces no soporta enlaces. </para
+></listitem
+><listitem
+><para
+>O no hay forma de distinguir si un enlace apunta a un archivo o a un directorio. Siempre se asume un archivo (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>No siempre se puede determinar el tamaño del archivo. </para
+></listitem
+><listitem
+><para
+>Soporte limitado para los permisos. </para
+></listitem
+><listitem
+><para
+>No hay posibilidad de modificar los permisos o la hora, por ello los permisos o la hora de la copia puede diferir del original (vea la opción «Verificar tamaño»). La modificación de permisos o de la hora solo es posible en los archivos locales. </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Utilizar &kdiff3; como un KPart</title>
+<para
+>KDiff3 es un KPart. Actualmente implementa la interfaz KParts::ReadOnlyPart-interface. </para
+><para
+>Su principal utilización es la de visor de diferencias en KDevelop. KDevelop siempre inicia primero el visor interno de diferencias. Para llamar a &kdiff3; pulse el botón derecho del ratón en la ventana de diferencias y seleccione «Mostrar en KDiff3Part» en el menú contextual. </para
+><para
+>&kdiff3; normalmente requiere dos archivos completos como entrada. Cuando se utiliza como una parte &kdiff3; asume que el archivo de entrada es un archivo de parches en formato unificado. &kdiff3; recupera el nombre del archivo original del archivo del parche. Al menos uno de los dos archivos debe estar disponible. &kdiff3; llamará a <command
+>patch</command
+> para volver a crear el segundo archivo. </para
+><para
+>En Konqueror puede seleccionar un archivo de parche y seleccionar «Previsualizar en» - «KDiff3Part» desde el menú contextual. Sea consciente de que esto no funcionará si no está disponible ninguno de los archivos originales, y no será fiable si hubo modificaciones en el(los) archivo(s) original(es) desde que se generó el parche. </para
+><para
+>Cuando se ejecute como una parte, &kdiff3; solo proporcionará la diferencia de dos archivos, una pequeñísima barra de herramientas y un menú. La fusión y comparación de directorios no está soportada. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Preguntas y respuestas</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>¿Por qué se llama «&kdiff3;»? </para
+></question
+><answer
+><para
+>Las herramientas llamadas «KDiff» y «KDiff2» (ahora llamada «Kompare») ya existen. Por tanto «KDiff3» debería sugerir que incluye la fusión de forma similar a la herramienta «diff3» de la colección de herramientas Diff. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Por qué la he liberado bajo la GPL? </para
+></question
+><answer
+><para
+>He utilizado programas GPL durante mucho tiempo y aprendí mucho echando un vistazo a muchas fuentes. Ésta es mi forma de dar las «gracias» a todos programadores que han hecho lo mismo. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Faltan algunos botones y funciones. ¿Que está pasando? </para
+></question
+><answer
+><para
+>Compiló las fuentes, pero probablemente no especificó de forma correcta el parámetro «prefix» de KDE en configure. De forma predeterminada configure intentará instalarlo en /usr/local pero KDE no encuentra el archivo de recursos de la interfaz de usuario (p.ej. kdiff3ui.rc). El archivo README contiene más información sobre el parámetro «prefix» correcto. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Algunas líneas que son similares, pero no idénticas aparecen unas al lado de las otras, pero no siempre. ¿Por qué? </para
+></question
+><answer
+><para
+>Las líneas que solo contienen una cantidad diferente de espacios se tratan «igual» al principio, de forma que solo una diferencia en un caracter que no sea un espacio en blanco hará que las líneas sean «diferentes». Si aparecen líneas similares unas al lado de las otras, en realidad es una coincidencia, y sucede algunas veces. Consulte <link linkend="manualdiffhelp"
+>el manual de ayuda de Diff</link
+>. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Por que se deben resolver todos los conflictos de fusionado antes de guardarlos? </para
+></question
+><answer
+><para
+>Para cada sección ya sea igual o diferente el editor en la ventana de resultado de la fusión recordará su comienzo y su final. Ésto es necesario para que los conflictos puedan resolverse manualmente pulsando el botón de la fuente (A, B o C). Esta información se perderá cuando se guarde el texto y es demasiado complicado crear un formato de archivo especial que soporte el guardado y la restauración de toda la información. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Cómo puedo sincronizar las vista de diferencia y de fusión, de forma que todas muestren la misma posición de texto? </para
+></question
+><answer
+><para
+>Pulse en la columna de resumen situada a la izquierda del texto (<link linkend="synchronise_views"
+>Consulte también estó.</link
+>) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Por qué el editor en la ventana de resultado no tiene una función «deshacer»? </para
+></question
+><answer
+><para
+>Es demasiado esfuerzo por el momento. Siempre puede restaurar una versión a partir de una fuente (A, B o C) pulsando el botón respectivo. Para editar archivos grandes se recomienda utilizar otro editor. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Cuando eliminó texto, de repente aparece «&lt;Sin línea fuente&gt;» y no se puede borrar. ¿Qué significa y cómo puedo eliminarlo? </para
+></question
+><answer
+><para
+>Para cada sección ya sea igual o diferente el editor en la ventana de resultado de la fusión recuerda dónde comienza y dónde termina. «&lt;Sin línea fuente&gt;» significa que no falta nada en una sección, ni siquiera un caracter de línea nueva. Esto puede suceder mientras realiza la fusión automática o mientras está editando. Ésto no es un problema, ya que no aparecerá en el archivo guardado. Si desea volver al archivo original seleccione la sección (pulse en la columna de resumen a la izquierda) y después pulse el botón de la fuente con los contenidos necesarios (A/B o C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Por qué &kdiff3; no soporta resaltado de sintaxis? </para
+></question
+><answer
+><para
+>&kdiff3; ya utiliza muchos colores para resaltar las diferencias. Más resaltado resultaría confuso. Utilice otro editor para esto. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Puedo utilizar &kdiff3; para comparar archivos OpenOffice.Org, Word, Excel, Pdf, &etc;? </para
+></question
+><answer
+><para
+>A pesar de que &kdiff3; analizará cualquier tipo de archivo el resultado no será satisfactorio. </para
+><para
+>&kdiff3; se creó para comparar archivos de texto puro. OpenOffice, Word, Excel, etc. guardan mucha más información en los archivos (relativa a tipos de letra, imágenes, páginas, colores, etc.) con la que &kdiff3; no sabe qué hacer. Por tanto &kdiff3; le mostrará el contenido del archivo interpretado como si fuera texto puro, pero esto no es para lo que se utiliza. </para
+><para
+>Desde que muchos programa guardan su contenido en formato XML, puede ser capaz de leer éste como texto puro. Por tanto si el cambio es pequeño, &kdiff3; todavía puede ayudarle. </para
+><para
+>La mejor solución si solo desea comparar texto (sin objetos empotrados como imágenes) es utilizar «Seleccionar todo» y «Copiar» en su programa para copiar el texto interesante al portapapeles y a continuación pegar en &kdiff3; el texto en cualquiera de las ventanas de diferencias (Consulte también <link linkend="selections"
+>Seleccionar, copiar y pegar</link
+>). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Donde está la opción de directorio «Listar solo deltas»? </para
+></question
+><answer
+><para
+>Ahora existen varias <link linkend="selectingvisiblefiles"
+>opciones «Mostrar»</link
+> en el menú directorio. Desactivar «Mostrar archivos idénticos» activará «Listar solo deltas» </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>¿Cómo puedo realizar una selección grande en la ventana de entrada de diferencias sin tardar demasiado tiempo? </para
+></question
+><answer
+><para
+>Inicie la selección de la forma habitual (pulse y mantenga pulsado el botón izquierdo del ratón). A continuación utilice las teclas de navegación (p.ej. RéPag, AvPág) manteniendo pulsado el botón izquierdo del ratón (consulte también <link linkend="selections"
+>Seleccionar, copiar y pegar</link
+>). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Aquí hay mucha información, pero ¿su pregunta no está respondida? </para
+></question
+><answer
+><para
+>Por favor, envíeme su pregunta. Aprecio todos los comentarios. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Créditos y licencia</title>
+
+<para
+>&kdiff3; - Herramienta de comparación y fusionado de archivos y directorios. </para>
+<para
+>Program copyright 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Algunas buenas ideas e informes de fallos me llegaron de colegas y de mucha gente a lo largo de la red ¡Gracias! </para>
+
+<para
+>Documentation Copyright &copy; 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+<para
+>Traducido por Santiago Fernández Sancho <email
+>santi@kde-es.org</email
+>.</para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Instalación</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Cómo obtener &kdiff3;</title>
+
+<para
+>Puede descargar la última versión de &kdiff3; de su página principal: <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>&kdiff3; también está disponible para otras plataformas. Vea la página principal para obtener más detalles. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Requerimientos</title>
+
+<para
+>Para utilizar adecuadamente todas las características de &kdiff3;, necesitará &kde; 3.1 o superior. </para
+><para
+>Para obtener información sobre cómo ejecutar &kdiff3; en otras plataformas sin KDE vea la <ulink url="http://kdiff3.sourceforge.net"
+>página principal</ulink
+>. </para
+><para
+>Puede encontrar una lista de cambios en <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> o en el archivo «ChangeLog» del paquete fuente. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Compilación e instalación</title>
+
+<para
+>Para compilar en instalar &kdiff3; en un sistema con KDE, teclee lo siguiente en el directorio base de la distribución de &kdiff3;:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-dir</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-dir</replaceable
+> especifica el directorio que contiene KDE en su sistema. Sino está seguro, lea el archivo README para obtener los detalles. </para>
+<para
+>Sino utiliza KDE utilice <command
+>configure</command
+> pero siga las instrucciones para los sistemas que solo tienen Qt en el archivo README.</para>
+<para
+>Puesto que &kdiff3; utiliza <command
+>autoconf</command
+> y <command
+>automake</command
+> no debería tener problemas para compilarlo. Si tiene problemas al ejecutarlo, por favor, informe de ello a las listas de correo de &kde;.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/es/iteminfo.png b/doc/es/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/es/iteminfo.png
diff --git a/doc/es/letter_by_letter.png b/doc/es/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/es/letter_by_letter.png
diff --git a/doc/es/merge_current.png b/doc/es/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/es/merge_current.png
diff --git a/doc/es/new.png b/doc/es/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/es/new.png
diff --git a/doc/es/open_dialog.png b/doc/es/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/es/open_dialog.png
diff --git a/doc/es/screenshot_diff.png b/doc/es/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/es/screenshot_diff.png
diff --git a/doc/es/screenshot_merge.png b/doc/es/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/es/screenshot_merge.png
diff --git a/doc/es/triple_diff.png b/doc/es/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/es/triple_diff.png
diff --git a/doc/es/white_space.png b/doc/es/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/es/white_space.png
diff --git a/doc/et/Makefile.am b/doc/et/Makefile.am
new file mode 100644
index 0000000..3c147d1
--- /dev/null
+++ b/doc/et/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = et
+
+
diff --git a/doc/et/dirbrowser.png b/doc/et/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/et/dirbrowser.png
diff --git a/doc/et/dirmergebig.png b/doc/et/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/et/dirmergebig.png
diff --git a/doc/et/index.docbook b/doc/et/index.docbook
new file mode 100644
index 0000000..b06c99e
--- /dev/null
+++ b/doc/et/index.docbook
@@ -0,0 +1,2425 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "kdeextragear-1">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Estonian  "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>&kdiff3; käsiraamat</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+</authorgroup>
+
+<othercredit role="translator"
+><firstname
+>Marek</firstname
+> <surname
+>Laane</surname
+> <affiliation
+><address
+><email
+>bald@online.ee</email
+></address
+></affiliation
+><contrib
+>Tõlge eesti keelde</contrib
+></othercredit
+> 
+
+<copyright>
+<year
+>2002-2005</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2005-01-30</date>
+<releaseinfo
+>0.9.87</releaseinfo>
+
+
+<abstract>
+<para
+></para>
+<para
+>&kdiff3; on failide ja kataloogide võrdlemise ja ühendamise vahend, mis <itemizedlist>
+<listitem
+><para
+>võrdleb ja ühendab kaks või kolm sisendfaili või -kataloogi,</para
+></listitem>
+<listitem
+><para
+>näitab erinevusi rida realt ja sümbol sümbolilt (!),</para
+></listitem>
+<listitem
+><para
+>pakub automaatse ühendamise võimalust,</para
+></listitem>
+<listitem
+><para
+>võimaldab kasutada hõlpsasti ühendamiskonflikte lahendada suutvat redaktorit</para
+></listitem>
+<listitem
+><para
+>pakub tänu KIO moodulitele võrguläbipaistvust</para
+></listitem>
+<listitem
+><para
+>võimaldab esile tõsta või peita tühikute või kommentaaride erinevusi</para
+></listitem>
+<listitem
+><para
+>toetab Unicode'i, UTF-8 ja muid kodeeringuid.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Käesolev käsiraamat kirjeldab KDiff3 versiooni 0.9.87. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>ühendamine</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>kolmikvõrdlus</keyword>
+<keyword
+>võrdlemine</keyword>
+<keyword
+>failid</keyword>
+<keyword
+>kataloogid</keyword>
+<keyword
+>versioonide kontroll</keyword>
+<keyword
+>kolmikühendamine</keyword>
+<keyword
+>reaerinevused</keyword>
+<keyword
+>sünkroniseerimine</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>võrguläbipaistvus</keyword>
+<keyword
+>redaktor</keyword>
+<keyword
+>tühimärgid</keyword>
+<keyword
+>kommentaarid</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Sissejuhatus</title>
+<sect1 id="why"
+><title
+>Veel üks võrdlemisrakendus?</title>
+<para
+>Teatavasti on olemas üsna mitu graafilist võrdlusrakendust. Miks siis veel KDiff3? Siin ma selgitan veidi selle loomise tagamaid. </para
+><para
+>KDiff3 nägi ilmavalgust sellepärast, et mul oli raskusi ühendamisega. Ühendamine on hädavajalik, kui mingi projekti failide kallal töötab korraga mitu inimest. Ühendamine peab olema mingil määral automatiseeritud, kui arvestada seda, et ühendamisvahend tegeleb nii uute, muudetud failidega (niinimetatud harudega) kui ka algse failiga (niinimetatud baas). Ühendamisvahend valib automaatselt muudatuse, mis mingis harus on tehtud. Kui mitu arendajat on muutnud üht ja sama rida, tuvastab ühendamisvahend konflikti, mis tuleb lahendada käsitsi. </para
+><para
+>Ühendamine oli sellisel juhul keeruline, sest üks arendaja muutis hulk asju ja lisaks sellele parandas veel paljudes kohtades näiteks taanet. Samal ajal muutis teine arendaja samuti üsna palju samas failis ja nii tekkiski korraga mitu ühendamiskonflikti. </para
+><para
+>Vahendid, mida ma toona kasutasin, näitasid ainult muudetud ridu, aga mitte seda, mida neis ridades on muudetud. Ning miski ei viidanud ka sellele, et muudetud on ainult taanet. See muutis ühendamise väikest viisi luupainajaks. </para
+><para
+>Minu jaoks oli see alguspunkt. Esimene versioon oskas näidata erinevusi rea sees ning erinevusi tühimärkides. Hiljem lisandus veel hulk võimalusi, mis ainult suurendasid rakenduse kasulikkust. </para
+><para
+>Nii on näiteks võimalik teksti kiireks võrdlemiseks kopeerida see lõikepuhvrisse ja asetada siis mis tahes võrdlusaknasse. </para
+><para
+>Päris suurt pingutust nõudvaks võimaluseks osutus kataloogide võrdlemine ja ühendamine, mille tulemusena sündis peaaegu juba brauseri mõõtu lisandus. </para
+><para
+>Ma loodan, et KDiff3 rahuldab ka sinu vajadused. Edu sulle! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Pildid ja võimalused</title>
+<para
+>See pilt näitab erinevust kahe tekstifaili vahel</para>
+<para
+>(KDiff3 üks varasemaid versioone):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>Kolmikühendamine on täielikult toetatud. See on abiks juhul, kui kaks inimest on koodi teineteisest sõltumatult muutnud. Algne fail (baas) võimaldab KDiff3 automaatselt valida korrektsed muudatused. Võrdlusakende all asuv ühendamisredaktor lubab konflikte lahendada ja näitab, milline on sellisel juhul tulemus. Isegi seda tulemust saab kohe edasi redigeerida. See pilt näitab kolme sisendfaili ühendamist: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>KDiff3 aitab ka võrrelda ja ühendada terveid katalooge. See pilt näitabki KDiff3 kataloogide ühendamisel: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Veel võimalusi</title>
+<sect2
+><title
+>Võrdlemine rida realt ja märk märgilt</title>
+<para
+>Graafiliselt, värvidega näitab KDiff3 täpselt, milles peituvad erinevused Kui tegeled palju koodi (ümber)kirjutamisega, on see kindlasti abiks. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Tühimärkide erinevuste näitamine</title>
+<para
+>Tühikute ja tabeldusmärkide erinevused näidatakse otseselt ära. Kui read erinevad ainult tühimärkide arvu poolest, võib seda üheainsa pilguga näha vasakul asuval kokkuvõttetulbal (mis tähendab, et ei pruugi enam pead murda, kui muudetud on kõigest taanet). </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Kolmikvõrdlus</title>
+<para
+>Kolme faili analüüs ja nende erinevuste näitamine. </para
+><para
+>Vasakpoolne, keskmine ja parempoolne aken kannavad vastavalt nimesid A, B ja C ning neid eristab ka värv (sinine, roheline, magenta). </para
+><para
+>Kui ühes failis on rida sama, teises aga erinev, näitab värv, milline fail on erinev. Punane värv tähendab, et mõlemad ülejäänud failid on erinevustega. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Kahe või kolme sisendfaili hõlpus ühendamine</title>
+<para
+>KDiff3 võib ühendada kaks või kolm sisendfaili, sealjuures võimalikult palju juba automaatselt. Tulemust näidatakse redigeeritavas aknas, kus enamiku konflikte saab lahendada üheainsa hiireklõpsuga: vali nupuribalt A, B või C määramaks, millist allikat kasutada. Valida võib ka enam kui ühe allika. Kuna väljundiaken on samal ajal redaktor, siis saab isegi selliseid konflikte, mille puhul tuleb midagi täiendavalt teha, lahendada ilma mingit muud abivahendit kasutamata. </para>
+</sect2>
+
+<sect2
+><title
+>Ja veel...</title>
+<itemizedlist>
+   <listitem
+><para
+>Kiire liikumine nuppude abil.</para
+></listitem>
+   <listitem
+><para
+>Hiireklõps kokkuvõttetulbal sünkroniseerib kõik aknad ühele positsioonile.</para
+></listitem>
+   <listitem
+><para
+>Valimine ja kopeerimine mis tahes aknast ning asetamine ühendamisaknasse.</para
+></listitem>
+   <listitem
+><para
+>Ülevaatetulp, mis näitab, kus esineb muudatusi ja konflikte.</para
+></listitem>
+   <listitem
+><para
+>Värve saab kohandada just kasutaja maitsele.</para
+></listitem>
+   <listitem
+><para
+>Kohandatav tabeldusmärgi suurus.</para
+></listitem>
+   <listitem
+><para
+>Võimalus lisada tabeldusmärkide asemel tühikud.</para
+></listitem>
+   <listitem
+><para
+>Failide hõlpus avamine dialoogiga või võimalus määrata faile käsureal.</para
+></listitem>
+   <listitem
+><para
+>Stringide otsimine kõigis tekstiakendes (Otsi ehk CTRL+F ja Otsi järgmine ehk F3).</para
+></listitem>
+   <listitem
+><para
+>Iga rea reanumbri näitamine. </para
+></listitem>
+   <listitem
+><para
+>Lõikepuhvri sisu asetamine või teksti lohistamine võrdlemise sisendaknasse.</para
+></listitem>
+   <listitem
+><para
+>Võrguläbipaistvus KIO moodulite vahendusel.</para
+></listitem>
+   <listitem
+><para
+>Võimalus kasutada KDevelop3 erinevuste näitajana.</para
+></listitem>
+   <listitem
+><para
+>Pikkade ridade murdmine.</para
+></listitem>
+   <listitem
+><para
+>Unicode'i, UTF-8 ja muude kodeeringute toetus.</para
+></listitem>
+   <listitem
+><para
+>Paremalt vasakule kirjutatavate keelte toetus.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Failide võrdlemise ja ühendamise seletused</title>
+
+<sect1 id="commandline"
+><title
+>Käsurea võimalused</title>
+
+<sect2
+><title
+>Kahe faili võrdlemine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fail1 fail2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kahe faili ühendamine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fail1 fail2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fail1 fail2</replaceable
+> -o <replaceable
+>väljundfail</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kolme faili võrdlemine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fail1 fail2 fail3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kolme faili ühendamine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fail1 fail2 fail3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fail1 fail2 fail3</replaceable
+> -o <replaceable
+>väljundfail</replaceable
+>
+</screen>
+<para
+>Pane tähele, et <replaceable
+>fail1</replaceable
+> kujutab endast baasi <replaceable
+>fail2</replaceable
+> ja <replaceable
+>fail3</replaceable
+> jaoks. </para>
+</sect2>
+
+<sect2
+><title
+>Erijuhtum: ühenimelised failid </title>
+<para
+>Kui kõigil failidel on sama nimi, aga nad asuvad erinevates kataloogides, võib kirjutamisvaeva vähendada, andes ainult esimese faili nime. Näiteks: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kataloog1/failinimi kataloog2 kataloog3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kataloogide võrdlemine või ühendamine käsureal: </title>
+<para
+>See käib samamoodi, ainult et tegu on kataloogidega.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2</replaceable
+> -o <replaceable
+>sihtkataloog</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2 kataloog3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2 kataloog3</replaceable
+> -o <replaceable
+>sihtkataloog</replaceable
+>
+</screen>
+<para
+>Kataloogide võrdlemisest ja ühendamisest saab täpsemalt lugeda <link linkend="dirmerge"
+>siit</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Rohkem infot käsurea võtmete kohta annab käsk: </title>
+<screen
+><command
+>kdiff3</command
+> --help
+Võtmed:
+  -m, --merge               Sisendi liitmine.
+  -b, --base file           Baasfail. Ühilduvuseks teatud vahenditega.
+  -o, --output file         Väljundfail. Eelduseks -m. Nt.: -o newfile.txt
+  --out file                Taas väljundfail. (Ühilduvuseks teatud vahenditega.)
+  --auto                    GUI puudub, kui kõik konfliktid on automaatselt lahenevad. (Vajalik on -o file)
+  --qall                    Konflikte ei lahendata automaatselt. (Ühilduvuseks...)
+  --L1 alias1               Sisendfaili 1 (baas) näidatava nime asendus.
+  --L2 alias2               Sisendfaili 2 näidatava nime asendus.
+  --L3 alias3               Sisendfaili 3 näidatava nime asendus.
+  -L, --fname alias         Alternatiivne näidatava nime asendus. Tuleb anda kord iga sisendi kohta.
+  -u                        Toimeta. Ühilduvuseks teatud vahenditega.
+</screen>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Avamisdialoog</title>
+<para
+>Et mitme sisendfaili korral nad lihtsalt peavad olema valitavad, on rakendusel eriline avamisdialoog: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Avamisdialoog võimaldab redigeerida failinimesid käsitsi, valida need failidialoogis ("Fail...") või kasutada hüpikmenüüs olevaid hiljuti avatud faile. Kui avad dialoogi uuesti, on seal kirjas parajasti aktiivsed failinimed. Kolmanda sisendvälja täitmine ei ole kohustuslik. Kui "C" tühjaks jätta, analüüsitakse ainult kahe faili erinevusi. </para
+><para
+>Nupule "Kataloog..." klõpsates saab valida kataloogi. Kui A jaoks on määratud kataloog, saab alustada kataloogide võrdlemist-ühendamist. Kui A on fail, kuid B, C või väljund kataloogid, kasutab KDiff3 A failinime määratud kataloogides. </para
+><para
+>Kui märkida "Ühenda", saab kasutada ka välja "Väljund". Siiski ei ole nõutav väljundfaili nime kohe määrata, selle võib edasi lükata ka salvestamise ajale. </para
+><para
+>Klõps nupule "Seadista..." avab valikute dialoogi, kus saab enne analüüsi midagi muuta, kui pead seda vajalikuks. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Sisendi asetamine ja lohistamine</title>
+<para
+>Vahel võib tekkida vajadus võrrelda tekstilõke, mis ei kujuta endast omaette faile. KDiff3 võimaldab väga lihtsalt asetada teksti lõikepuhvrist parajasti fookuses olevasse võrdlemise sisendaknasse. Võrdlusanalüüs algab kohe seejärel. Avamisdialoogis ei ole sellisel juhul vajalik määrata faile, vaid selle võib kohe sulgeda klõpsuga nupule "Loobu". </para
+><para
+>Samuti võib kasutada lohistamist: lohista fail failihalduris või valitud tekst redaktorist ning kukuta see võrdlemise sisendaknasse. </para
+><para
+>Milleks see hea on? Mõnikord võib fail sisaldada kaht sarnast funktsiooni, kuid kontrollimine, kui sarnased nad ikkagi on, võib olla päris tülikas, kui sa pead näiteks kõigepealt looma kaks faili ja siis nad mõlemad avama. Nüüd aga on võimalik vajalikud osad lihtsalt kopeerida, asetada ja võrdlemine võibki alata. </para
+><para
+>Märkus: praegu ei ole võimalik midagi KDiff3-st välja lohistada, toetatud on ainult lohistamine võrdlemise sisendaknasse. </para
+><para
+>Hoiatus: mõned redaktorid tõlgendavad lohistamist muusse rakendusse mitte kopeerimise, vaid lõikamisena. See tähendab, et sa võid kaotada oma esialgsed andmed. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Info tõlgendamine sisendaknas</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Iga tekstiakna ülaservas asub "inforiba". Sisendakende inforibal seisab täht "A", "B" või "C", failinimi ning aknas esimesena näha oleva rea number. (Pane tähele, et akent "C" ei pruugi olemas olla.) Iga inforiba on erinevat värvi. Kui näiteks failinimi on liiga pikk, et ära mahtuda, võib hiire viia riba kohale ning näha täielikku nime ilmuval kohtspikril. </para
+><para
+>Kolmele sisendaknale on omistatud tähed "A", "B" ja "C". "A" värviks on sinine, "B" roheline ja "C" magenta. Need on vaikeväärtused, mida saab muuta seadistustemenüüst. </para
+><para
+>Erinevuse avastamisel näitab värv, milline sisendfail erineb. Kui erinevad mõlemad sisendfailid, siis väljendab seda vaikimisi punane värv (seadistuste kohaselt "konflikti värv"). Värviskeem tuleb eriti kasuks kolme sisendfaili korral, mida võib näha järgmises osas (<link linkend="merging"
+>Ühjendamine</link
+>). </para
+><para
+>Igast tekstist vasakul asub "kokkuvõttetulp". Kui real on erinevusi, näitab kokkuvõttetulp vastavat värvi. Ainult tühimärkide erinevuse korral on kokkuvõttetulbal näha ruuduline muster. See on abiks programmeerimiskeelte korral, kus tühimärkidel ei ole erilist tähendust, võimaldades ühe hetkega tuvastada, kas on ka mingeid olulisi muudatusi (näiteks C/C++ korral on tühimärkidel mingi roll ainult stringides, kommentaarides, preprotsessoris ja veel mõnel äärmiselt esoteerilisel juhtumil). </para
+><para
+>Kokkuvõttetulpa ja teksti lahutav püstjoon on katkestatud, kui sisendfailis pole selles kohas ühtki rida. Reamurdmise lubamisel on püstjoon murtud ridade juures punkteeritud. </para
+><para
+>Paremal on otse kerimisriba kõrval näha "ülevaateriba". See näitab kokkusurutult sisendfaili "A" kokkuvõttetulpa. Nii on kõik erinevused ja konfliktid korraga näha. Kui kasutada ainult kaht sisendakent, on kõik erinevused punased, sest iga erinevus on sellisel juhul ju ka konflikt. Must ristkülik tähistab parajasti aknas näha olevat tekstiosa. Väga pikkade sisendfailide korral, kus sisendi ridade arv on suurem kui ülevaatetulba kõrgus pikslites, mahutatakse ühele ülevaatereale mitu sisendirida. Konflikti näitamist eelistatakse sellisel juhul tavalisele erinevusele ning viimast muutmata olekule, nii ei jää kindlasti nägemata ükski erinevus või konflikt. Ülevaateribale klõpsates näidatakse vastavat kohta tekstis. </para>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Ühendamine ja ühendamisväljundi redigeerimisaken</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Ka ühendamisväljundi redigeerimisaknal (allpool võrdlemise sisendaknaid) on ülaservas inforiba, kus seisab "Väljund:", failinimi ja "[Muudetud]", kui oled midagi muutnud. Tavaliselt leidub seal automaatse ühendamise vahendite pakutav tekst, kuid tihtipeale ka konfliktid. </para
+><para
+>!!! Salvestamine on võimalik alles siis, kui kõik konfliktid on lahendatud !!! (allesjäänud konfliktide lahendamiseks kasuta nuppe "Liigu eelmisele/järgmisele lahendamata konfliktile") </para
+><para
+>Kui on ainult kaks sisendfaili, on iga erinevus ühtlasi konflikt, mis tuleb käsitsi lahendada. </para
+><para
+>Kolme sisendfaili korral käsitletakse esimest baasina, teist ja kolmandat aga potentsiaalseid muudatusi sisaldavate failidena. Kui muudetud on rida ainult sisendis B või C, aga mitte mõlemas, valitakse automaatselt muudetud allikas. Kui aga nii B kui C on (erinevalt) muutnud üht ja sama rida, märgitakse see konfliktina, mis tuleb käsitsi lahendada. Kui B ja C on ühesugused, aga erinevad A-st, valitakse C. </para
+><para
+>Ka ühendamisväljundi redigeerimisaknal on vasakus servas kokkuvõtteriba. See näitab sisendi tähte, millest rida on valitud, või mitte midagi, kui rida on kõigis kolmes allikas võrdne. Konflikti korral on seal küsimärk "?" ning real endal seisab "&lt;Ühendamise konflikt&gt;, kõik ilusasti puust ja punaseks tehtud. Kuna konfliktide lahendamine rida-realt võib võtta päris palju aega, on read rühmitatud gruppidesse, millel on ühesugused erinevuse ja konflikti omadused. Samas on ainult tühimärkide konfliktid eraldatud muudest konfliktidest, et hõlbustada selliste failide ühendamist, kus taanet on muudetud paljudel ridadel. </para
+><para
+>Kui klõpsata hiire vasaku nupuga kokkuvõttetulbal mis tahes aknas, siis valitakse selle rea grupp kõigis akendes ning näidatakse antud grupi algust (see võib kaasa tuua automaatse asukohavahetuse akendes, kui grupi algus ei ole parajasti näha). Valitud grupp muutub sellega "aktiivseks grupiks", see tõstetakse esile "praeguse vahemiku tausta värviga" ning tekstist vasakule ilmub must tulbake. </para
+><para
+>Pane tähele tähtedega "A", "B" ja "C" sisendivalija nuppe menüüriba all. Mõnele neist klõpsates lisatakse selle sisendi read valitud grupi lõppu, kui grupp ei sisaldanud varem seda allikat. Vastasel juhul eemaldatakse selle allika read. </para
+><para
+>Lisaks saab vahetult redigeerida mis tahes rida. Kokkuvõttetulp näitab tähte "m" iga muudetud rea kohta. </para
+><para
+>Vahel võib juhtuda, et rida eemaldatakse automaatse liitmisega või redigeerides. Kui gruppi ei ole jäänud enam ühtki rida, ilmub sellele reale tekst &lt;Lähterida puudub&gt;. See on kõigest grupi kohatäitja juhuks, kui muudad meelt ja valid taas mõne allika. Seda teksti ei ole näha ei salvestatud failis ega kopeeritavates/asetatavates valikutes. </para
+><para
+>Tekst "&lt;Ühendamise konflikt&gt;" seevastu liigub küll lõikepuhvrisse, kui valida ja kopeerida/asetada sellist rida sisaldav tekst. Seepärast tasuks sellise võimalusega ettevaatlik olla. </para
+><para
+>Tavaline ühendamine lahendab lihtsad konfliktid automaatselt. Menüü "Ühendamine" pakub lisaks mõningaid toiminguid muude levinumate vajaduste rahuldamiseks. Kui sul tuleb enamasti konfliktide puhul valida üks ja sama baas, võid valida kõikjal "A", "B" või "C" või ainult veel lahendamata konfliktidele või ainult lahendamata tühimärkide konfliktidele. Kui soovid lahendada iga erinevuse ise käsitsi, võid lülitada sisse võimaluse "Määra erinevused konfliktideks". Kui soovid aga taas panna KDiff3 automaatselt konflikte lahendama, vali "Lahenda automaatselt lihtsad konfliktid". Seejärel alustab KDiff3 uuesti ühendamist. Kui selle käigus muudetakse midagi, mida oled varem muutnud, küsib KDiff3 enne jätkamist, mida soovid teha. </para
+><para
+>Märkus: kui valid lahendamata tühimärkide konfliktide baasi ning võimalus "Numbreid ignoreeritakse" või "C/C++ kommentaare ignoreeritakse" on sisse lülitatud, koheldakse muutusi numbrites või kommentaarides samuti tühimärkidena. </para>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Liikumine ja redigeerimine</title>
+<para
+>Enamasti saab liikuda kerimisribade ja hiirega, kuid soovi korral on võimalik liikuda ka klahvidega. Kui klõpsata mis tahes aknasse, saab sarnaselt muude rakendustega kasutada noolenuppe, Page Up ja Page Down, Home, End, Ctrl+Home, Ctrl+End. Liikumiseks saab kasutada ka sisendafailide kerimisribast paremal pool asuvat ülevaateriba, mis võimaldab vajalikule kohale liikuda klõpsuga riba vajalikule kohale. </para
+><para
+>Üles-alla kerimiseks saab kasutada ka hiireratast. </para
+><para
+>Ühndamisväljundi redigeerimisaknas saab samuti kasutada kõiki tavalisi teksti redigeerimisel kasutatavaid klahve. Klahviga Insert saab lülitada lisamis- ja ülekirjutamisrežiimi (vaikimisi kehtib lisamisrežiim). </para
+><para
+>Klõps hiire vasaku nupuga mis tahes kokkuvõttetulbal sünkroniseerib kõik aknad, nii et neid näitavad üht ridadegruppi (seda selgitas lähemalt osa <link linkend="merging"
+>Ühendamine</link
+>). </para
+><para
+>Nupureal on seitse liikumisnuppu, millega saab hüpata praegusele/esimesele/viimasele erinevusele, eelmisele/järgmisele erinevusele (Ctrl+Nool üles/Ctrl+Nool alla), eelmisele/järgmisele konfliktile (Ctrl+Page Down/Ctrl+Page Up) või eelmisele/järgmisele lahendamata konfliktile. Pane tähele, et KDiff3 jaoks jääb "konflikt", mida ei lahendata automaatselt ühendamise alguses, "konfliktiks" ka pärast selle käsitsi lahendamist. Seepärast on ka eristatud "lahendamata konfliktid". </para
+><para
+>Lisaks neile on nupp "Pärast allikavalikut liigutakse automaatselt järgmisele lahendamata konfliktile". Seda sisse lülitades hüppab KDiff3 allika valimisel automaatsel selles leiduval lahendamata konfliktile. See on abiks, kui soovid tavaliselt valida ainult ühe allika. Kui sul läheb vaja mõlemat allikat või soovid pärast valimist tegelda redigeerimisega, on tõenäoliselt mõttekas see välja lülitada. Enne järgmisele lahendamata konfliktile liikumist näitab KDiff3 hetkeks langetatud valiku toimet. Kui kaua see näitamine kestab, saab määrata seadistustes: "automaatse edasiliikumise viivitus" on võimalik määrata millisekundites 0 ja 2000 vahel. Vihje: kas oled tüdinud kogu aeg klõpsimast? Kasuta siis pisikest automaatse edasiliikumise viivitust ning kiirklahve Ctrl+1/2/3 A/B/C valimiseks. </para>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Valimine, kopeerimine ja asetamine</title>
+<para
+>Sisendaknas kursorit ei näidata, seepärast tuleb valimine teha hiirega, klõpsates vasaku nupuga valiku alguses, hoides nuppu all ja liikudes valiku lõppu, pärast mida võib nupu vabastada. Sõna saab valida ka sellel topeltklõpsu tehes. Ühendamisväljundi redigeerimisaknas saab valida ka klaviatuuri abil, hoides all klahvi Shift ja liikudes noolenuppudega. </para
+><para
+>Lõikepuhvrisse kopeerimiseks tuleb vajutada nuppu "Kopeeri" (Ctrl+C või Ctrl+Insert). Lisaks sellele on olemas ka võimalus "Valiku automaatne kopeerimine". Selle sisselülitamisel kopeeritakse kõik, mida oled valinud, automaatselt ning sul puudub vajadus anda mis tahes moel kopeerimiskäsku. Kuid ole selle võimalusega ettevaatlik, sest nii võib kogemata üle kirjutada vajaliku lõikepuhvri sisu. </para
+><para
+>Käsk "Lõika" (Ctrl+X või Shift+Delete) kopeerib valitud teksti lõikepuhvisse ning kustutab selle, "Aseta" (Ctrl+V või Shift+Insert) aga asetab lõikepuhvris oleva teksti kursori asukohta või aktiivse valiku asemele. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Salvestamine</title>
+<para
+>Salvestamine on võimalik ainult siis, kui kõik konfliktid on lahendatud. Kui fail on juba olemas ning sisse on lülitatud valik "Failidest tehakse varukoopia", antakse olemasolevale failile laiend ".orig". Kui selline peaks juba olemas olema, see kustutatakse. Kui väljud või oled alustanud uud võrdlusanalüüsi ning andmeid ei ole veel salvestatud, pärib KDiff3 sinu käest, kas soovid salvestada, loobuda või jätkata ilma salvestamata (KDiff3 ei salvesta andmeid seesmiselt, nii et kui KDiff3 väljastpoolt "tappa", lähevad andmed kaotsi). </para
+><para
+>Realõpud salvestatakse vastavalt operatsioonisüsteemi tavale. UNIXi korral lõpetab rea reavahetusmärk "\n", Win32 süsteemides kelgu tagastamise sümbol pluss reavahetusmärk "\r\n". KDiff3 ei säilita sisendfailide realõppe, mis ühtlasi tähendab, et KDiff3 kasutamisel binaarfailidega peaks olema erakordselt ettevaatlik. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Stringide otsimine</title>
+<para
+>Stringe saab otsida KDiff3 kõigis tekstiakendes. Redigeerimismenüü käsk "Otsi..." (Ctrl+F) avab dialoogi, kus saab määrata, mida otsida. Samuti saab valida, millises aknas otsida. Otsimine algab alati teksti algusest. Käsk "Otsi järgmine" (F3) viib otsitava stringi järgmise esinemise juurde (kui seda muidugi on). Kui valid otsimise mitmes aknas, otsitakse esmalt ülalt alla läbi esimene aken, seejärel taas ülalt alla teine aken jne. </para>
+</sect1>
+
+
+<sect1 id="options"
+><title
+>Valikud</title>
+<para
+>Valikud ja viimati avatud failide nimekiri salvestatakse alati, kui rakendusest väljud, ning laaditakse uuesti rakenduse taaskäivitamisel (menüükäsk Seadistused -> KDiff3 seadistamine...) </para>
+<sect2
+><title
+>Font</title>
+<para
+>Valib fikseeritud laiusega fondi (mõnes süsteemis pakub dialoog ka muutuva laiusega fonti, kuid seda ei tasuks kasutada). </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Kaldkiri erinevustele:</emphasis
+></term
+><listitem
+><para
+>Selle valimisel näidatakse teksti erinevusi valitud fondi kaldkirjas. Kui valitud font kaldkirja ei toeta, ei tee see midagi.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Värvid</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Esiplaani värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt must. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tausta värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt valge. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Erinevuse tausta värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt helehall. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Värv A:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt tumesinine. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Värv B:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt tumeroheline. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Värv C:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt tume magenta. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Konflikti värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt punane.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Praeguse vahemiku tausta värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt helekollane.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Praeguse vahemiku erinevuse tausta värv:</emphasis
+></term
+><listitem
+><para
+>Tavaliselt tumekollane.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Ainult 16 või 256 värviga süsteemides ei pruugi mõned värvid puhtal kujul saadaval olla. Sellistes süsteemides valib puhta värvi nupp "Vaikeväärtused". </para>
+</sect2>
+
+<sect2
+><title
+>Redaktori seadistused</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>TAB lisab tühikud:</emphasis
+></term
+><listitem
+><para
+>Kui see ei ole sees, lisatakse tabeldusklahvile vajutades tabeldusmärk, kui see on sees, vastav kogus tühikuid.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>TABi suurus:</emphasis
+></term
+><listitem
+><para
+>Kohandatav oma maitsele. Vaikimisi 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automaatne taandus:</emphasis
+></term
+><listitem
+><para
+>Vajutades klahvile Enter, kasutatakse uuel real eelmise rea taandust. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Valiku automaatne kopeerimine:</emphasis
+></term
+><listitem
+><para
+>Iga tekstivalik kopeeritakse otsekohe lõikepuhvrisse, ilma et oleks vaja anda spetsiaalset kopeerimiskäsku. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Realõpu stiil:</emphasis
+></term
+><listitem
+><para
+>Salvestamisel saab valida, millist realõpu stiili eelistada. Vaikimisi on see valitud operatsioonisüsteemi põhjal. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kohaliku kodeeringu kasutamine:</emphasis
+></term
+><listitem
+><para
+>Mitte-ladina sümbolite näitamiseks. Tasub kasutada, kui mõningaid sinu keele sümboleid ei näidata korrektselt. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Erinevuse ja ühendamise seadistused</title>
+<para
+>Faile võrreldes püüab KDiff3 kõigepealt seada kokku read, mis on kõigis sisendfailides ühtmoodi. Ainult sel etapil võib ta eirata tühimärke. Teisel etapil võrreldakse iga rida ning nüüd võetakse arvesse ka tühimärgid. Tühimärke ei ignoreerita ka ühendamisel. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Säilitatakse reavahetus:</emphasis
+></term
+><listitem
+><para
+>Mõned redaktorid mõnes süsteemis salvestavad iga rea lõpu kelgu tagastuse märgiga '\r' ning reavahetusmärgiga '\n', teised aga ainult reavahetusmärgiga '\n'. Üldiselt KDiff3 ignoreerib kelgu tagastuse sümbolit, kuid sellisel juhul võivad tegelikult erineva suurusega failid paista võrdlemisel ühesugustena. Selle valiku sisselülitamisel on kelgutagatusmärgid näha, kuid neid koheldakse tühimärkidena. Ühendamise ajal tuleb see võimalus välja lülitada. Vaikimisi on väljas.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Numbreid ignoreeritakse:</emphasis
+></term
+><listitem
+><para
+>Vaikimisi väljas. Numbrilisi sümboleid ('0'-'9', '.', '-') ignoreeritakse analüüsi esimeses, üldvõrdlevas osas. Lõpptulemuses näidatakse siiski erinevusi, aga neid käsitletakse kui tühimärke. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>C/C++ kommentaare ignoreeritakse:</emphasis
+></term
+><listitem
+><para
+>Vaikimisi väljas. Muudatusi kommentaarides tõlgendatakse tühimärkide muudatustena. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tõstu ignoreeritakse:</emphasis
+></term
+><listitem
+><para
+>Vaikimisi väljas. Tähtede tõstu erinevusi (näiteks 'A' vs. 'a') tõlgendatakse tühimärkide muudatustena. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Eeltöötluse käsk:</emphasis
+></term
+><listitem
+><para
+>Vaata <link linkend="preprocessors"
+>järgmist osa</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ridade sobivuse eeltöötluse käsk:</emphasis
+></term
+><listitem
+><para
+>Vaata <link linkend="preprocessors"
+>järgmist osa</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Karm uurimine:</emphasis
+></term
+><listitem
+><para
+>Püüab tuvastada ka kõige pisemad erinevused. Vaikimisi sees. Ilmselt on sellest rohkem kasu keerulisemate ja suurte failide korral. Aga mõistagi on see väga suurte failide puhul ka väga aeglane. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automaatse edasiliikumise viivitus (ms):</emphasis
+></term
+><listitem
+><para
+>Kui automaatne edasiliikumine on sisse lülitatud, määrab see võimalus, kui kaua näidatakse valiku tulemust, enne kui hüpatakse järgmisele lahendamata konfliktile. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tühimärkide käsitlemine 2/3 faili ühendamisel:</emphasis
+></term
+><listitem
+><para
+>Lahendab automaatselt kõik tühimärkide konfliktid määratud faili valides (vaikimisi käsitsivalik). Kasulik, kui tühimärgid pole olulise tähtsusega. Kui seda läheb ainult mõnikord vaja, kasuta parem ühendamismenüü käske "Vali A/B/C kõigi lahendamata tühimärgikonfliktide korral". Pane tähele, et kui sees on "Numbreid ignoreeritakse" või "C/C++ kommentaare ignoreeritakse", rakendub see automaatne valik ka kõigile numbrite või kommentaaride konfliktidele. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Kataloogide ühendamine</title>
+<para
+>Need valikud käivad kataloogide uurimise ja nende ühendamise kohta, millest täpsemalt räägib osa <link linkend="dirmergeoptions"
+>Kataloogide võrdlemise ja ühendamise seletused</link
+>. </para
+><para
+>Siiski on üks valik, mis käib ka üksikfailide salvestamise kohta: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Failidest tehakse varukoopia:</emphasis
+></term
+><listitem
+><para
+>Kui faili salvestamisel on sellest olemas vanem versioon, antakse viimasele laiend ".orig". Kui peaks olemas olema ka samanimeline varasem fail laiendiga ".orig", siis see kustutatakse. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Riigi ja keele valikud</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Keel:</emphasis
+></term
+><listitem
+><para
+>Kasutajaliidese keele määramine. Selle muutmine ei mõjuta töötavat rakendust. Keele muutmiseks tuleb KDiff3 sulgeda ja uuesti käivitada. (See valik ei ole kasutatav KDiff3 KDE versioonis, sest seal saab keele määrata KDE üldises seadistuses.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Kõikjal kasutatakse kodeeringut:</emphasis
+></term
+><listitem
+><para
+>Järgnevaid kodeeringuvalikuid saab määrata eraldi, välja arvatud juhul, kui äsjatoodud valik on sisse lülitatud, sest siis võtavad kõik valikud esimese valiku väärtuse. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Kohalik kodeering:</emphasis
+></term
+><listitem
+><para
+>Kodeeringu valimise väljade kohal seisab märge, mis annab teada kohaliku kodeeringu (see ei ole muudetav, vaid lihtsalt teadmiseks, kui sa ei peaks oma kodeeringut teadma). </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>A/B/C kodeering:</emphasis
+></term
+><listitem
+><para
+>Sisendfailide kodeeringu kohandamine. See mõjutab inglise tähestikku mittekuuluvate sümbolite esitamist. Kohandada saab iga kodeeringut eraldi, nii et sul on isegi võimalus võrrelda ja ühendada faile, mis on salvestatud erinevas kodeeringus. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Kodeering ühendamisväljundil ja salvestamisel:</emphasis
+></term
+><listitem
+><para
+>Kui muudad faili, saad siis määrata, millises kodeeringus salvestatakse see kettale. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Eelprotsessori failide kodeering:</emphasis
+></term
+><listitem
+><para
+>Kui oled määranud eelprotsessorid, võib juhtuda, et nad ei suuda sinu kodeeringut töödelda (kui näiteks sinu failid on 16-bitises Unicode''is, eelprotsessor suudab aga töödelda vaid 8-bitist ASCII-d). Siin saad määrata eelprotsessori väljundi kodeeringu. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Paremalt vasakule keeled:</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Muud</title>
+<para
+>(neid valikuid ja toiminguid saab kasutada menüü või nupuriba vahendusel)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Näita reanumbreid:</emphasis
+></term
+><listitem
+><para
+>Võimalus valida, kas sisendfailidel näidatakse ridade numbreid.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Näita erinevusi tühiku- ja tabeldusmärkides:</emphasis
+></term
+><listitem
+><para
+>Vahel võivad nähtavad tühikud ja tabeldusmärgid tõsiselt häirida, millisel juhul on võimalik nende näitamine välja lülitada.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Näita tühimärke:</emphasis
+></term
+><listitem
+><para
+>Selle väljalülitamisel ei tõsteta esile tühimärkide erinevusi tekstis ega ülevaatetulbal. Pane tähele, et et kui sees on "Numbreid ignoreeritakse" või "C/C++ kommentaare ignoreeritakse", rakendub see ka kõigile numbrite või kommentaaride konfliktidele.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Ülevaate valikud:</emphasis
+></term
+><listitem
+><para
+>Neid valikuid saab kasutada ainult kolme faili võrdlemisel. Tavarežiimis näidatakse erinevusi ühel värvilisel ülevaatetulbal. Kuid vahel võivad huvi pakkuda kolmest faili ainult kahe erinevused. Valides vastavalt ülevaate "A vs. B", "A vs. C" või "B vs. C", näidatakse tavalise ülevaatetulba kõrval teist vajaliku infoga. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Reamurdmine võrdlusakendes:</emphasis
+></term
+><listitem
+><para
+>Read murtakse, kui nende pikkus ületab akna laiust. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Näita akent A/B/C:</emphasis
+></term
+><listitem
+><para
+>Vahel võib tekkida tahtmine ekraanil ruumi juurde tekitada, et näha paremini näiteks pikki ridu. Sellisel juhul saab peita aknad, mis ei ole hetkel olulised (menüü Aken).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Lülita poolitamissuund:</emphasis
+></term
+><listitem
+><para
+>Lülitab võrdlusakende asetsemist üksteise kõrval (A vasakul pool B ja B vasakul pool C) ning üksteise kohal (A B kohal ja B C kohal). Ka see võib olla abiks pikkade ridade korral (menüü Aken). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Kiirühendamine:</emphasis
+></term
+><listitem
+><para
+>Mõnikord võib leida erinevuste vaatamisel, et käes on aeg tegelda ühendamisega. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Ühenda praegune fail" menüüs Kataloog toimib ka siis, kui sa võrdled ainult kaht faili. Ühekordne klõps käivitab ühendamise ning kasutab vaikimisi väljundifaili nimena viimase sisendfaili nime (kui seda on kasutatud ühendamise taaskäivitamiseks, väljundfaili nimi säilitatakse).</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Kiirklahvide seadistamine</title>
+<para
+>Praegu toetab ainult KDE versioon kasutaja võimalust määrata kiirklahve (menüükäsk Seadistused -> Kiirklahvide seadistamine...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Eeltöötluse käsud:</title>
+<para
+>KDiff3 toetab kaht eeltöötluse võimalust. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Eeltöötluse käsk:</emphasis
+></term
+><listitem
+><para
+>Mis tahes faili lugemisel filtreeritakse see läbi siin määratud käsu. Algse faili asemel näeb siis antud käsu väljundit. Sul on võimalik panna kirja oma eeltöötluse käsk, mis rahuldaks just sinu vajadused. Kasuta seda võimalust näiteks faili ülearuste osade kõrvaldamiseks või taande automaatseks korrigeerimiseks vms. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ridade sobivuse eeltöötluse käsk:</emphasis
+></term
+><listitem
+><para
+>Mis tahes faili lugemisel filtreeritakse see läbi siin määratud käsu. Kui määratud on ka eeltöötluse käsk (vaata eespool), on eeltöötluse käsu väljund ridade sobivuse eeltöötluse käsu sisendiks. Viimase väljundit kasutatakse ainult analüüsi esimeses, reasobivuse faasis. Sul on võimalik panna kirja oma eeltöötluse käsk, mis rahuldaks just sinu vajadused. Igal sisendi real peab olema talle vastav väljundi rida. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>Selle mõte on pakkuda kasutajale suuremat paindlikkust võrdlemistulemuse seadistamisel. Kuid see nõuab välist programmi ja mõistagi ei taha enamik sellist ise kirjutama hakata. Õnneks suudab enamasti selliste asjadega toime tulla <command
+>sed</command
+> või <command
+>perl</command
+>. </para>
+<para
+>Näide: lihtne testnäide: Võtame faili a.txt (6 rida): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> Ja faili b.txt (3 rida): <screen>
+      cg
+      dg
+      eg
+</screen
+> Ilma eeltöötluseta seatakse vastavusse järgmised read: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Tõenäoliselt ei ole see sugugi see, mida sa soovisid, sest oluliseks infokandjaks on just esimesed tähed. Et sobivusalgoritn jätaks arvesse võtmata teise tähe, kasutame reasobivuse eeltöötluse käsku, mis asendab 'g' 'a'-ga: <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Selle käsu korral on võrdlemise tulemus järgmine: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Seesmisel näeb sobivusalgoritm faile juba pärast reasobivuse eeltöötluse rakendamist, kuid ekraanil jääb fail muutmata. (Tavaline eeltöötlus muudaks andmeid ka ekraanil.) </para>
+
+<sect2 id="sedbasics"
+><title
+><command
+>sed</command
+> põhitõed</title>
+<para
+>Selles osas tutvustame ainult programmi <command
+>sed</command
+> üksikuid põhimõttelisi omadusi. Rohkem infot leiab käsuga <ulink url="info:/sed"
+>info:/sed</ulink
+> või aadressilt <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+> http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Windowsi eelkompileeritud versioon asub aadressil <ulink url="http://unxutils.sourceforge.net"
+> http://unxutils.sourceforge.net</ulink
+>. Pane tähele, et järgmistes näidetes eeldame, et käsk <command
+>sed</command
+> asub mõnes keskkonnamuutujaga PATH määratud kataloogis. Kui see nii ei ole, tuleb sul määrata käsu täielik asukoht. Pane tähele ka seda, et järgnevates näidetes on kasutatud ühekordset jutumärki ('), mis Windowsis ei toimi - seal tuleb kasutada topeltjutumärke ("). </para>
+<para
+>Antud kontekstis kasutatakse ainult <command
+>sed</command
+>-i asenduskäsku: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGULAARAVALDIS</replaceable
+>/<replaceable
+>ASENDUS</replaceable
+>/<replaceable
+>LIPUD</replaceable
+>'
+</screen
+> Enne uue käsu kasutamist KDiff3-ga võiks seda esmalt testida konsoolil. Siin tuleb kasuks käsk <command
+>echo</command
+>. Näide: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Toodud näites on tegemist äärmiselt lihtsa sed-käsuga, kus asendatakse esimene "a" "o"-ga. Kui soovid asendada kõik esinemiskorrad, tuleb kasutada lippu "g"-flag: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Sümbol "|" on torukäsk, mis edastab eelmise käsu väljundi järgmise käsu sisendile. Kui soovid testida pikema failiga, võid kasutada käsku <command
+>cat</command
+>, kui tegemist on UNIX-i süsteemiga, või <command
+>type</command
+>, kui tegu on Windowsiga. <command
+>sed</command
+> sooritab asenduse igal real. <screen
+><command
+>cat</command
+> <replaceable
+>failinimi</replaceable
+> | <command
+>sed</command
+> <replaceable
+>võtmed</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Näited <command
+>sed</command
+>-i kasutamise kohta KDiff3-ga</title>
+<sect3
+><title
+>Muud tüüpi kommentaaride ignoreerimine</title>
+<para
+>Praegu mõistab KDiff3 ainult C/C++ kommentaare. Reasobivuse eeltöötluse käsuga saab aga ignoreerida ka muud tüüpi kommentaare, teisendades need C/C++ kommentaarideks. Näide: kui soovid ignoreerida kommentaare, mille alguses on "#", tuleks need teisendada nii, et alguses oleks "//". Pane tähele, et seejuureks peaks olema võimalus "C/C++ kommentaare ignoreeritakse" olema sisse lülitatud, muidu pole asjal mõtet. Vastav reasobivuse eeltöötluse käsk näeb välja selline: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Kuna <command
+>sed</command
+> omistab sümbolile "/" eritähenduse, on oluline asetada asendusstringis iga "/" ette sümbol "\". Mõnikord on "\" vajalik teatud ertähendusega sümbolite lisamiseks või eemaldamiseks. Nüüd on olulised üksikjutumärgid (') enne ja pärast asenduskäsku, sest vastasel juhul püüab shell mõningaid erisümboleid, näiteks '#', '$' või '\' tõlgendada juba enne nende edastamist käsule <command
+>sed</command
+>. Pane tähele, et Windowsis tuleb anda topeltjutumärgid ("). Windows asendab ka muid sümboleid, näiteks '%', nii et siin võib olla vajalik veidi eksperimenteerida. </para>
+</sect3>
+<sect3
+><title
+>Tõstutundetu võrdlus</title>
+<para
+>Järgmise reasobivuse eeltöötluse käsuga saab kogu sisendi muuta suurtäheliseks: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Siin on ".*" regulaaravaldis, mis sobib iga stringiga, antud kontekstis siis iga real asuva sümboliga. "\1" asendusstringis tähistab sobivat teksti esimeses "\(" and "\)" paaris. "\U" teisendab sisestatud teksti suurtäheliseks. </para>
+</sect3>
+
+<sect3
+><title
+>Versioonikontrolli võtmesõnade ignoreerimine</title>
+<para
+>CVS ja muud versioonikontrolli süsteemid kasutavad mitmeid võtmesõnu automaatselt genereeritavate stringide lisamiseks (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Kõik need järgivad mustrit "$VÕTMESÕNA genereeritud tekst$". Nüüd läheb meil vaja reasobivuse eeltöötluse käsku, mis eemaldaks ainult genereeritud teksti: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Võimalikke võtmesõnu eraldab "\|". Seda loendit võid mõistagi vastavalt oma vajadustele muuta. Enne "$" on kindlasti vajalik "\", sest muidu on "$" sobivuseks rea lõpp. </para>
+<para
+>Kui katsetad <command
+>sed</command
+>-iga, hakkad arvatavasti veidi aduma regulaaravaldiste mõtet ja võib-olla isegi neid armastama. Iseenesest on regulaaravaldised väga kasulikud, sest päris paljud programmid toetavad sarnast võimalust. </para>
+</sect3>
+
+<sect3
+><title
+>Numbrite ignoreerimine</title>
+<para
+>Numbrite ignoreerimine on tegelikult juba sisseehitatud võimalus. Kuid näitame siinkohal, kuidas see näeks välja reasobivuse eeltöötluse käsuna: <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Sobivad kõik sümbolid '[' ja ']' vahel ning neid ei asendatagi, vaid lihtsalt kõrvaldatakse. </para>
+</sect3>
+
+<sect3
+><title
+>Teatud veergude ignoreerimine</title>
+<para
+>Tekst võib olla rangelt vormindatud ning sisaldada näiteks veergu, mida soovid alati ignoreerida, samas aga muid veerge analüüsiks kasutada. Järgnevas näites ignoreeritakse viit esimest veergu (sümbolit), järgmised kümme säilitatakse, siis ignoreeritakse taas viit veergu ning ülejäänud rida säilitatakse. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Iga punkt '.' vastab ühele sümbolile. "\1" ja "\2" asendusstringis tähistavad sobivat teksti esimeses ja teises "\(" ja "\)" paaris, märkides säilitatavat teksti. </para>
+</sect3>
+
+<sect3
+><title
+>Mitme asenduse kombineerimine</title>
+<para
+>Vahel võib tekkida tahtmine teha mitu asendust korraga. Selleks tuleb nende eraldamiseks kasutada semikoolonit ';'. Näide: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+><command
+>perl</command
+>-i kasutamine <command
+>sed</command
+>-i asemel</title>
+<para
+><command
+>sed</command
+>-i asemel võib kasutada ka midagi muud, näiteks <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGULAARAVALDIS</replaceable
+>/<replaceable
+>ASENDUS</replaceable
+>/<replaceable
+>LIPUD</replaceable
+>'
+</screen
+> Kuid <command
+>perl</command
+> on mõnevõrra erinev. Pane tähele, et kui <command
+>sed</command
+>-ile oli vaja "\(" ja "\)", siis <command
+>perl</command
+>-ile on vaja lihtsalt "(" ja ")" ilma eelneva '\'. Näide: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Eeltöötluse sooritamise järjekord</title>
+<para
+>Andmed suunatakse läbi sisemiste ja väliste eeltöötluse käskude järgmises järjekorras </para>
+<itemizedlist>
+<listitem
+><para
+>Tavaline eeltöötlus,</para
+></listitem>
+<listitem
+><para
+>Reasobivuse eeltöötlus,</para
+></listitem>
+<listitem
+><para
+>Tõstu ignoreerimine (teisendamine suurtäheliseks),</para
+></listitem>
+<listitem
+><para
+>C/C++ kommentaaride tuvastamine,</para
+></listitem>
+<listitem
+><para
+>Numbrite ignoreerimine,</para
+></listitem>
+<listitem
+><para
+>Tühimärkide ignoreerimine</para
+></listitem>
+</itemizedlist>
+<para
+>Tavalise eeltöötluse tulemusandmed säilitatakse näitamiseks ja ühendamiseks. Muud operatsioonid muudavad ainult andmeid, mida näeb reasobivuse võrdlusalgoritm. </para
+><para
+>Neil harvadel juhtudel, kui kasutad tavalist eeltöötluse käsku, arvesta, et reasobivuse eeltöötluse käsk peab tavalise eeltöötluse käsu väljundit oma sisendiks. </para>
+</sect2>
+
+<sect2
+><title
+>Hoiatus</title>
+<para
+>Eeltöötluse käsud on sageli vägagi kasulikud, aga nagu ikka võimalustega, mis muudavad sinu teksti või peidavad automaatselt teatud erinevused, võib sel moel kogemata mõningad erinevused kahe silma vahele jätta või eriti halval juhul isegi olulised andmed hävitada. </para
+><para
+>Seetõttu teatab KDiff3 ühendamisel sellest, et kasutatakse tavalist eeltöötluse käsku, ning pärib, kas seda lubada vi mitte. Kuid sind ei hoiatata, kas reasobivuse eeltöötluse on aktiivne või mitte. Ühendamine on valmis alles siis, kui kõik konfliktid on lahendatud. Kui lülitad välja võimaluse "Tühimärkide näitamine", siis on nähtamatud ka erinevused, mis eemaldati reasobivuse eeltöötluse käsuga. Kui ühendamisel ei saa kasutada nuppu 'Salvesta' (sest failis on veel konflikte), lülita "tühimärkide näitamine" sisse. Kui sa ei soovi neid enamasti vähese tähtsusega erinevusi käsitsi ühendada, vali ühendamismenüüst käsk "Vali [A|B|C] kõigi lahendamata tühimärgikonfliktide korral". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Kataloogide võrdlemine ja ühendamine</title>
+<sect1 id="dirmergeintro"
+><title
+>Sissejuhatus</title>
+<para
+>Programmeerijad peavad sageli oma eesmärgi saavutamiseks muutma kataloogis paljusid faile. Selle ülesande kergendamiseks võimaldab KDiff3 võrrelda ja ühendada ka terveid katalooge koos nende alamkataloogidega! </para
+><para
+>Kuigi kataloogide võrdlemine ja ühendamine tundub olevat üsna lihtne ja selge, tuleks siin siiski arvestada mitme asjaga. Kõige olulisem on kahtlemata see, et sellisel juhul puudutab iga operatsioon paljusid faile korraga. Kui sa ei ole esialgsetest andmetest varukoopiat teinud, võib algoleku taastamine olla väga raske või isegi võimatu. Seepärast kontrolli enne ühendamise alustamist alati, et andmed on turvaliselt varundatud ja et sul on alati võimalus tagasi minna. Kas kasutada arhiveerimist või mõnda versioonide kontrollimise süsteemi, on sinu enda otsustada, kuid pea silmas, et ka ülikogenud programmeerijad vajavad aeg-ajalt vanu alliktekste. Ning ühtlasi arvesta sedagi, et kuigi mina (see tähendab, KDiff3 autor) olen püüdnud anda endast parima, ei saa ma täie kindlusega öelda, et rakendus on ideaalne ja täiesti veatu. Nagu ütleb GNU Üldine Avalik Litsents, ei ole sellel rakendusel MITTE MINGIT garantiid. Seepärast pea alati meeles, et </para>
+<blockquote
+><para>
+   <emphasis
+>Eksimine on inimlik, aga tõelise segaduse korraldamiseks läheb vaja arvutit.</emphasis>
+</para
+></blockquote>
+<para
+>Vaatame siis, mida meie rakendus suudab teha. KDiff3... </para>
+<itemizedlist>
+     <listitem
+><para
+>... loeb ja võrdleb kaht või kolme kataloogi koos alamkataloogidega</para
+></listitem>
+     <listitem
+><para
+>... peab spetsiaalselt silmas nimeviitu</para
+></listitem>
+     <listitem
+><para
+>... võimaldab faile vaadelda hiire topeltklõpsuga</para
+></listitem>
+     <listitem
+><para
+>... iga elemendi korral pakub välja ühendamisoperatsiooni, mida sul on voli muuta enne tegeliku kataloogide ühendamise alustamist</para
+></listitem>
+     <listitem
+><para
+>... võimaldab ühendamist simuleerida, näidates ära toimingud, mis ette võetakse, ilma neid tegelikult veel tegemata</para
+></listitem>
+     <listitem
+><para
+>... võimaldab mõistagi ka tegelikku ühendamist ning pakub sulle sekkumise võimalust kõikjal, kus selleks vajadus tekib</para
+></listitem>
+     <listitem
+><para
+>... võimaldab käivitada valitud toimingu kõigil elementidel (klahv F7) või ainult valitud elemendil (klahv F6)</para
+></listitem>
+     <listitem
+><para
+>... lubab jätkata pärast sekkumist ühendamist klahvile F7 vajutades</para
+></listitem>
+     <listitem
+><para
+>... lisavõimalusena loob varukoopiad laiendiga ".orig"</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Kataloogide võrdlemise või ühendamise alustamine</title>
+<para
+>See on väga sarnane failide ühendamisele ja võrdlemisele. Sul tuleb lihtsalt valida kataloogid käsureal või avamisdialoogis. </para>
+<sect2
+><title
+>Kahe kataloogi võrdlemine/ühendamine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2</replaceable
+> -o <replaceable
+>sihtkataloogr</replaceable
+>
+</screen>
+<para
+>Kui sihtkataloogi ei määrata, on KDiff3 jaoks selleks <replaceable
+>kataloog2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Kolme kataloogi võrdlemine/ühendamine: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2 kataloog3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kataloog1 kataloog2 kataloog3</replaceable
+> -o <replaceable
+>sihtkataloog</replaceable
+>
+</screen>
+<para
+>Kolme kataloogi ühendamisel võetakse <replaceable
+>kataloog1</replaceable
+> ühendamise baasiks. Kui sihtkataloogi ei ole määratud, on selleks KDiff3 silmis <replaceable
+>kataloog3</replaceable
+>. </para>
+
+<para
+>Pane tähele, et automaatselt algab ainult võrdlemine, mitte aga ühendamine. Viimase jaoks tuleb kasutada vastavat menüükäsku või klahvi F7 (sellest räägime pikemalt veidi hiljem). </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Nähtav info</title>
+<para
+>Kataloogide lugemisel ilmub teatekast, mis näitab edenemise käiku. Kui katkestad kataloogi läbiuurimise, näidatakse ainult neid faile, mida selle hetkeni jõuti võrrelda. </para
+><para
+>Kui kataloogide skaneerimine on lõpule jõudnud, näitab KDiff3 nimekirjakasti, kus vasakul on tulemused... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... ja paremal üksikasjad parajasti valitud elemendi kohta: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>Nimeveerg</title>
+<para
+>Iga skaneerimisel leitud faili ja kataloogi näidatakse puus. Vajaliku elemendi saab valida sellel hiirega klõpsates. </para
+><para
+>Vaikimisi on kataloogid suletud. Neid saab avada või sulgeda klõpsuga nende ees seisvale "+"/"-" või topeltklõpsuga kirjel või klahvidega Nool vasakule/paremale. Menüüs "Kataloog" on käsud "Ava kõik alamkataloogid" ja "Sule kõik alamkataloogid", mis lubavad korraga avada/sulgeda kõik alamkataloogid. </para
+><para
+>Failil topeltklõpsu tehes alustatakse võrdlemist ning ilmub failide võrdlemise aken. </para>
+<para
+>Pilt nimeveerus kajastab faili tüüpi esimeses kataloogis ("A"). See võib olla üks järgmistest: </para>
+<itemizedlist>
+     <listitem
+><para
+>Tavaline fail</para
+></listitem>
+     <listitem
+><para
+>Tavaline kataloog (kaustakujuline pilt)</para
+></listitem>
+     <listitem
+><para
+>Viit failile (failipilt viidanoolega)</para
+></listitem>
+     <listitem
+><para
+>Viit kataloogile (kaustakujuline pilt viidanoolega)</para
+></listitem>
+</itemizedlist>
+<para
+>Kui failitüüp on erinevates kataloogides erinev, on see näha veergudes A/B/C ning aknas, mis näitab valitud elemendi üksikasju. Pane tähele, et sellisel juhul ei ole võimalik automaatselt käivitada ühendamist. Kui seda siiski tehakse, antakse kasutajale teada, miks see ei ole võimalik. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Veerud A/B/C ja värviskeem</title>
+<para
+>Nagu ülal näha, kasutatakse veergudes A/B/C punast, rohelist, kollast ja musta värvi. </para>
+<itemizedlist>
+     <listitem
+><para
+>Must: selles kataloogis sellist elementi ei ole.</para
+></listitem>
+     <listitem
+><para
+>Roheline: uusim element.</para
+></listitem>
+     <listitem
+><para
+>Kollane: vanem kui roheline, uuem kui punane.</para
+></listitem>
+     <listitem
+><para
+>Punane: vanime element.</para
+></listitem>
+</itemizedlist>
+<para
+>Võrdlemisel ühesuguseks osutunud elementide värv on siiski samuti ühesugune ka siis, kui nad on erineva vanusega. </para
+><para
+>Katalooge peetakse võrdseks, kui kõik nendes olevad elemendid on samasugused. Siis võib neil olla ka ühesugune värv. Ka kataloogide korral ei mõjuta värvi vanus. </para
+><para
+>Selle värviskeemi mõtte andis mulle <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. Need värvid meenutavad mõneti puulehte, mis värskena on roheline, muutub hiljem kollaseks ja lõpuks punaseks. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>Operatsiooniveerg</title>
+<para
+>Pärast kataloogide võrdlemist hindab KDiff3 ühendamise võimalusi. Seda näitab veerg "Operatsioon". Operatsiooni on võimalik muuta, kui klõpsata sellel operatsioonil, mida soovid muuta. Ilmub väike hüpikmenüü, mis lubab valida antud elemendile vajaliku operatsiooni. (Kõige vajalikumad operatsioonid saab valida ka klaviatuurilt, näiteks Ctrl+1/2/3/4/Del valib vastavalt võimalusele A/B/C/Ühenda/Kustuta.) Valitud operatsioon tehakse teoks ühendamise käigus. Valikud sõltuvad elemendist ning ühendamisrežiimist. Viimaseks võib olla üks järgmistest: </para>
+<itemizedlist>
+     <listitem
+><para
+>Kolme kataloogi ühendamine ("A" on sellisel juhul teistele baasiks).</para
+></listitem>
+     <listitem
+><para
+>Kahe kataloogi ühendamine.</para
+></listitem>
+     <listitem
+><para
+>Kataloogide sünkroniseerimine (selle saab aktiveerida valikuga "Kataloogide sünkroniseerimine").</para
+></listitem>
+</itemizedlist>
+<para
+>Kolme kataloogi ühendamisel on operatsioonide valikuks juhul, kui... </para>
+<itemizedlist>
+     <listitem
+><para
+>... kõik kolm kataloogi on võrdsed: kopeeri C-st</para
+></listitem>
+     <listitem
+><para
+>... A ja C on võrdsed, aga B mitte: kopeeri B-st (või kui B-d ei ole, siis kustuta sihtmärk, kui see on olemas)</para
+></listitem>
+     <listitem
+><para
+>... A ja B on võrdsed, aga C mitte: kopeeri C-st (või kui C-d ei ole, siis kustuta sihtmärk, kui see on olemas)</para
+></listitem>
+     <listitem
+><para
+>... B ja C on võrdsed, aga A mitte: kopeeri C-st (või kui C-d ei ole, siis kustuta sihtmärk, kui see on olemas)</para
+></listitem>
+     <listitem
+><para
+>... ainult A on olemas: kustuta sihtmärk (kui on olemas)</para
+></listitem>
+     <listitem
+><para
+>... ainult B on olemas: kopeeri B-st</para
+></listitem>
+     <listitem
+><para
+>... ainult C on olemas: kopeeri C-st</para
+></listitem>
+     <listitem
+><para
+>... A, B ja C ei ole võrdsed: ühenda</para
+></listitem>
+     <listitem
+><para
+>... A, B ja C ei ole sama tüüpi (nt. A on kataloog, B fail): "Viga: failitüüpide vastuolu". Kui elemendid on sellised, ei saa kataloogide ühendamist alustada.</para
+></listitem>
+</itemizedlist>
+<para
+>Kahe kataloogi ühendamisel on operatsioonide valikuks juhul, kui... </para>
+<itemizedlist>
+     <listitem
+><para
+>... mõlemad kataloogid on võrdsed: kopeeri B-st</para
+></listitem>
+     <listitem
+><para
+>... A on olemas, aga mitte B: kopeeri A-st</para
+></listitem>
+     <listitem
+><para
+>... B on olemas, aga mitte A: kopeeri B-st</para
+></listitem>
+     <listitem
+><para
+>... nii A kui B on olemas, aga mitte võrdsed: ühenda</para
+></listitem>
+     <listitem
+><para
+>... A ja B ei ole sama tüüpi (nt. A on kataloog, B fail): "Viga: failitüüpide vastuolu". Kui elemendid on sellised, ei saa kataloogide ühendamist alustada.</para
+></listitem>
+</itemizedlist>
+<para
+>Sünkroniseerimisrežiimi saab kasutada ainult siis, kui tegemist on kahe kataloogiga, märgitud ei ole konkreetset sihtmärki ning sisse on lülitatud valik "Kataloogide sünkroniseerimine". KDiff3 valib sel juhul vaikeoperatsiooni, et muuta mõlemad kataloogid võrdseks. Juhul kui... </para>
+<itemizedlist>
+     <listitem
+><para
+>... mõlemad kataloogid on võrdsed: midagi pole teha.</para
+></listitem>
+     <listitem
+><para
+>... A on olemas, aga mitte B: kopeeri A -> B</para
+></listitem>
+     <listitem
+><para
+>... B on olemas, aga mitte A: kopeeri B -> A</para
+></listitem>
+     <listitem
+><para
+>... A ja B on mõlemad olemas, aga mitte võrdsed: ühenda ja salvesta tulemus mõlemas kataloogis (kasutaja näeb B salvestamist, kuid KDiff3 kopeerib ka B-st A-sse).</para
+></listitem>
+     <listitem
+><para
+>... A ja B ei ole sama tüüpi (nt. A on kataloog, B fail): "Viga: failitüüpide vastuolu". Kui elemendid on sellised, ei saa kataloogide ühendamist alustada.</para
+></listitem>
+</itemizedlist>
+<para
+>Kui kahe kataloogi ühendamisel on sisse lülitatud valik "Ühendamise asemel kopeeritakse uuem", uurib KDiff3 kuupäevi ning pakub välja uuema faili valimise. Kui failid ei ole võrdsed, ent on sama kuupäevaga, näitab operatsiooniveerg teadet "Viga: kuupäevad on samad, aga mitte failid." Kui kataloogis on selliseid elemente, ei ole võimalik ühendamist alustada. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>Staatuseveerg</title>
+<para
+>Ühendamisel võetakse ette üks fail teise järel. Staatuseveerg näitab kirjet "Tehtud" elementide puhul, mille ühendamist saatis edu, ning midagi muud, kui ühendamise käigus tuli ette midagi ootamatut. Kui ühendamine on lõpule jõudnud, võiksid üle kontrollida ka staatuseveeru, et näha, kas kõik seal ikka rahuldab sind. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Statistikaveerg</title>
+<para
+>Kui seadistustes on sisse lülitatud failide võrdlemise režiim "Täielik analüüs", näitab KDiff3 lisatuple, kus on kirjas lahendamata, lahendatud, tühimärkide ja mitte-tühimärkide konfliktide arv. (Lahendatud konflitkide arvuga tulpa näidatakse ainult kolme kataloogi võrdlemisel või ühendamisel.) </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Ühendamine</title>
+<para
+>Ühendada on võimalik parajasti valitud element (fail või kataloog) või kõik elemendid. Kui oled langetanud kõik operatsioonivalikud (ka alamkataloogides), võid alustada tegelikku ühendamist. </para
+><para
+>Pane tähele, et kui sa ei määranud sihtkataloogi, peetakse kolme kataloogi ühendamisel selleks "C", kahe kataloogi ühendamisel "B" ning sünkroniseerimisel "A" ja/või "B". </para
+><para
+>Kui oled sihtkataloogi määranud, kontrolli, et kõik elemendid, mis peaksid olema väljundis, oleksid olemas ka puus. Kasutada saab mõningaid valikuid, mis jätavad teatud elemendid kataloogide võrdlemisel ja ühendamisel arvesse võtmata. Vaata need valikud üle, et vältida ebameeldivaid üllatusi: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Rekursiivsed kataloogid": kui see on väljas, ei kaasata elemente alamkataloogides.</para
+></listitem>
+     <listitem
+><para
+>"Failimuster"/"Anti-failimuster": kaasatakse/jäetakse välja mustriga sobivad elemendid</para
+></listitem>
+     <listitem
+><para
+>"Peidetud failid jäetakse välja"</para
+></listitem>
+     <listitem
+><para
+>"Ainult erinevuste näitamine": failid, mis on kõigis kataloogides ühesugused, jäävad puus näitamata ja seega ei ole neid ka sihtkataloogis.</para
+></listitem>
+</itemizedlist>
+<para
+>(Praeguses versioonis tuleb taasskaneerimine pärast kataloogide skaneerimist mõjutavate valikute muutmist käsuga "Kataloog"->"Uuri uuesti läbi" uuesti ette võtta.) </para
+><para
+>Kui kõik on korras, siis ülejäänud on juba lihtne. </para
+><para
+>Kõigi elementide ühendamine: vali menüüst "Kataloog" käsk "Alusta/jätka kataloogi ühendamist" või kasuta kiirklahvi F7. Ainult aktiivse elemendi ühendamine: vali "Käivita operatsioon käesoleva elemendiga" või vajuta F6. </para
+><para
+>Kui failitüüpide konflikti tõttu esineb veel mõningaid sobimatute operatsioonidega elemente, ilmub teatekast, mis osutab sellistele elementidele, nii et sa saad valida neile vajalikud operatsioonid. </para
+><para
+>Kui ühendad kõik elemendid, ilmub dialoog, kus valikuvõimalusteks on "Tee ära", "Simuleeri" ja "Loobu". </para>
+<itemizedlist>
+     <listitem
+><para
+>Vali "Simuleeri", kui soovid näha, mida ette võetakse, ilma et seda tegelikult ette võetaks. Näidatakse põhjalikku ülevaadet, milliseid aktsioone sinu tegevus endaga kaasa tooks.</para
+></listitem>
+     <listitem
+><para
+>Ühendamise tegelikuks alustamiseks vali "Tee ära".</para
+></listitem>
+</itemizedlist>
+<para
+>Seejärel asub KDiff3 kõigi elementidega läbi viima neile määratud operatsioone. Kui vaja läheb käsitsi sekkumist (konkreetse faili ühendamisel), ilmub ühendamisaken (<link linkend="dirmergebigscreenshot"
+>vaata suurt pilti</link
+>). </para
+><para
+>Kui oled faili kallal kõik vajaliku ära teinud, vali uuesti menüükäsk "Alusta/jätka kataloogi ühendamist" või vajuta klahvi F7. Kui sa ei ole veel salvestanud, ilmub dialoog, mis teeb sulle vastava ettepaneku. Seejärel võtab KDiff3 ette järgmise elemendi. </para
+><para
+>Kui KDiff3 satub silmitsi veaga, annab ta sellest sulle teada ning näitab ka põhjalikku infot vea kohta, mis võib aidata kaasa arusaamisele, mis viga põhjustas. Kui valid ühendamise jätkamise (klahv F7), võimaldab KDiff3 sul antud elemendi ühendamist uuesti proovida või see vahele jätta. See tähendab, et sa saad enne jätkamist valida mõne muu operatsiooni või jätta hetkel asi nii, nagu on, et leida lahendus hiljem. </para
+><para
+>Kui ühendamine on lõpule jõudnud, annab KDiff3 sellest teatekastiga sulle märku. </para
+><para
+>Kui mõned elemendi on ühendatud individuaalselt, jätab KDiff3 selle (antud ühendamisseansi ajal) meelde ega hakka neid enam ühendama, kui valid hiljem kõigi elementide ühendamise. Isegi juhul, kui ühendamine jäeti tegelikult vahele või midagi ei salvestatud, peetakse neid elemente ühendatuks, nii et nendega saab hakata uuesti tegelema alles siis, kui oled vahetanud ühendamisoperatsiooni. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Kataloogide võrdlemise ja ühendamise valikud</title>
+<para
+>KDiff3 seadistustes (menüükäsk "Seadistused"-&gt;"KDiff3 seadistamine") on sektsioon "Kataloogide ühendamine" järgmiste valikutega: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Rekursiivsed kataloogid:</emphasis
+></term
+><listitem
+><para
+>Võimalus valida, kas kataloogid otsitakse läbi rekursiivselt, see tähendab, koos alamkataloogidega.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Failimustrid:</emphasis
+></term
+><listitem
+><para
+>Puus näidatakse ainult faile, mis vastavad siin määratud mustrile. Rohkem kui ühe mustri saab valida, kui kasutada eraldajana semikoolonit ";". Kasutada tohib metamärke '*' ja '?' (nt. "*.cpp;*.h"). Vaikimisi on muster "*". Kataloogid mustrit ei vaja.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-failimustrid:</emphasis
+></term
+><listitem
+><para
+>Selle mustriga sobivad failid ja kataloogid jäetakse puust välja. Rohkem kui ühe mustri saab valida, kui kasutada eraldajana semikoolonit ";". Kasutada tohib metamärke '*' ja '?'. Vaikimisi on muster "*.orig;*.o".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>.cvsignore kasutamine:</emphasis
+></term
+><listitem
+><para
+>Ignoreeritakse faile ja katalooge, mida ignoreerib ka CVS. CVS eirab paljusid automaatselt genereeritud faile. Selle suureks eeliseks on see, et see võib olla kataloogipõhine kohaliku ".cvsignore" faili vahendusel (vaata <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Peidetud failide ja kataloogide otsimine:</emphasis
+></term
+><listitem
+><para
+>Mõnes failisüsteemis on failidel atribuut "peidetud", teistes süsteemides peidab failid nende nime ees seisev punkt ("."). See valik lubab sul määrata, kas sellised failid kaasatakse puusse või mitte. Vaikimisi sees.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Failiviitade järgimine:</emphasis
+></term
+><listitem
+><para
+>Kui on väljas, võrreldakse nimeviitu, kui sees, siis faile, millele viidatakse. Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kataloogiviitade järgimine:</emphasis
+></term
+><listitem
+><para
+>Kui on väljas, võrreldakse nimeviitu, kui sees, peetakse viitu kataloogideks ning neid skaneeritakse rekursiivselt. (Pane tähele, et programm ei kontrolli, kas viit on "rekursiivne", nii et kui viita kataloogile sisaldav kataloog tekitab lõputu silmuse, siis mõne aja pärast, kui pinu on ületäidetud või mälu otsa saab, elab programm üle krahhi.) Vaikimisi väljas.</para
+></listitem
+></varlistentry
+>   
+   <varlistentry
+><term
+><emphasis
+>Ainult erinevuste näitamine:</emphasis
+></term
+><listitem
+><para
+>Näidatakse ainult elemente, mis ei ole sisendkataloogides võrdsed ning muudetud faile. Seepärast ei kopeerita ka kataloogides võrdseid faile ühendamisele ning kui sihtkataloog sellist faili eelnevalt ei sisaldanud, võibki see ilma selliste failideta jääda (võimalik, et tulevastes versioonides see valik muutub). Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+
+   <varlistentry
+><term
+><emphasis
+>Failide võrdlemise režiim:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Binaarne võrdlemine:</emphasis
+></term
+><listitem
+><para
+>See on vaikimisi failide võrdlemise režiim. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Täielik analüüs:</emphasis
+></term
+><listitem
+><para
+>Sooritab iga faili täieliku analüüsi ja näitab statistikatulpi (lahendatud, lahendamata, tühimärkide ja mitte-tühimärkide konfliktide arv). Täielik analüüs on aeglasem kui tavaline binaarne analüüs ning palju aeglasem, kui tegemist on failidega, mis ei sisalda teksti. (Määra sobivad anti-failimustrid.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Muutmiskuupäeva usaldamine:</emphasis
+></term
+><listitem
+><para
+>Suurte kataloogide võrdlemisel üle aeglase võrgu on usutavasti kiirem võimalus võrrelda ainult muutmiskuupäevi ja failide suurust. Kuid kui see ka suurendab kiirust, võib see ometi kaasa tuua eksimusi. Seepärast tasuks selle kasutamisse ettevaatlikult suhtuda. Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Suuruse usaldamine:</emphasis
+></term
+><listitem
+><para
+>Sarnane muutmiskuupäeva usaldamisele. Tegelikku võrdlemist ei teostata. Kaht faili peetakse võrdseks, kui nende failisuurus on võrdne. See on abiks, kui failide kopeerimisel ei säilunud muutmise aeg. Kasuta seda siiski ettevaatlikult. Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Kataloogide sünkroniseerimine:</emphasis
+></term
+><listitem
+><para
+>Aktiveerib "sünkroniseerimisrežiimi", mille puhul võrreldakse kaht kataloogi ilma konkreetset sihtkataloogi määramata. Selles režiimis valitakse operatsioonid nii, et lõpptulemusena oleks kaks kataloogi võrdsed. Ka ühendamise tulemused kirjutatakse mõlemasse kataloogi. Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ühendamise asemel kopeeritakse uuem:</emphasis
+></term
+><listitem
+><para
+>Ühendamise asemel pakutakse operatsiooniks uuema allika kopeerimine. Seda võimalust peetakse ebaturvaliseks, sest see eeldab, et teist faili ei ole redigeeritud. Seda aga tasuks igal juhul konkreetselt kontrollida. Vaikimisi väljas.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Failidest tehakse varukoopia:</emphasis
+></term
+><listitem
+><para
+>Kui fail või terve kataloog asendatakse teisega või kustutatakse, säilitatakse algne versioon, andes sellele laiendi ".orig". Kui on juba olemas varasem varukoopia laiendiga ".orig", siis see kustutatakse. See toimib nii kataloogide kui failide liitmisel. Vaikimisi sees.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Muud funktsioonid</title>
+<sect2
+><title
+>Ekraani poolitamine ja täisekraanirežiim</title>
+<para
+>Tavaliselt jääb faili võrdlemisel või ühendamisel kataloogi ühndamise nimekiri nähtavale. Hiirega võid aga liigutada failide nimekirja võrdlusaknast eraldavat riba. Kui sa seda soovi, võid menüüst "Kataloog" võmaluse "Poolitamisvaade" välja lülitada. Seejärel võid kasutada menüüs "Kataloog" olevat võimalust "Lülita vaadet", et vahetada kogu ekraani täitvat failinimekirja või võrdlusakna vaadet. </para>
+</sect2>
+<sect2
+><title
+>Ühe faili võrdlemine või ühendamine</title>
+<para
+>Võib juhtuda, et eelistad võrdlemiseks kasutada lihtsalt klõpsu failil. Samasugune käsk on siiski olemas ka menüüs "Kataloog". Samuti saab vahetult ühendada konkreetse faili ilma kataloogide ühendamist käivitamata, kui valida menüst "Kataloog" käsk "Ühenda üks fail". Tulemuse salvestamisel märgitakse selles staatuseks "Tehtud" ning kui seejärel käivitada kataloogide ühendamine, seda faili enam ei kaasata. </para
+><para
+>Kuid pane tähele, et see staatus läheb kaduma, kui käivitad uuesti kataloogi skaneerimise (menüü "Kataloog", käsk "Uuri uuesti läbi") </para>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Mitmesugused teemad</title>
+<sect1 id="networktransparency">
+<title
+>Võrguläbipaistvus KIO vahendusel</title>
+<sect2
+><title
+>KIO moodulid</title>
+<para
+>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. </para
+><para
+>Näide: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.faraway.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hacker/archive.tar.gz/dir ./dir
+</screen>
+</para>
+<para
+>Esimene rida võrdleb kohalikku faili failiga FTP serveril. Teine rida võrdleb kataloogi arhiivifailis kohaliku kataloogiga. </para
+><para
+>Muud huvipakkuvad KIO moodulid: </para>
+<itemizedlist>
+<listitem
+><para
+>WWW failid (http:)</para
+></listitem>
+<listitem
+><para
+>FTP failid (ftp:)</para
+></listitem>
+<listitem
+><para
+>Krüptitud failiedastused (fish:, sftp:)</para
+></listitem>
+<listitem
+><para
+>Windowsi ressursid (smb:)</para
+></listitem>
+<listitem
+><para
+>Kohalikud failid (file:)</para
+></listitem>
+</itemizedlist>
+<para
+>Muud asjad, mis on võimalikud, aga arvatavasti vähekasutatavad: </para>
+<itemizedlist>
+<listitem
+><para
+>Man-leheküljed (man:)</para
+></listitem>
+<listitem
+><para
+>Info-leheküljed (info:)</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Kuidas kirjutada URL-e</title>
+<para
+>Võrreldes kohalike failide ja kataloogide asukohaga on URL-il teistsugune süntaks. Silmas tuleks pidada järgmisi asju: </para>
+<itemizedlist>
+<listitem
+><para
+>Asukoht võib olla suhteline ja sisaldada märke "." või "..". See ei ole võimalik URL-ide puhul, mis on alati absoluutsed. </para
+></listitem
+><listitem
+><para
+>Erisümbolid tuleb alati "päästa" ("#" -> "%23", tühik -> "%20" jne.). Näiteks failil nimega "/#foo#" on URL "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>Kui URL ei toimi oodatult, proovi see avada Konqueroris. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>KIO moodulite võimalused</title>
+<para
+>Võrguläbipaistvusel on üks puudus: mitte kõik ressurssid ei paku ühesuguseid võimalusi. </para
+><para
+>Vahel sõltub see serveri failisüsteemis, vahel protokollist. Toome siin ära lühikese piirangute loetelu: </para>
+<itemizedlist>
+<listitem
+><para
+>Vahel ei ole viidad toetatud. </para
+></listitem
+><listitem
+><para
+>Vahel aga ei ole võimalik eristada, kas viit osutab failile või kataloogile: Sellisel juhul eeldatakse alati faili (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Alati pole võimalik määrata failisuurust. </para
+></listitem
+><listitem
+><para
+>Piiratud õiguste toetus. </para
+></listitem
+><listitem
+><para
+>Puudub võimalus muuta õigusi või muutmisaega, mistõttu koopia õigused või aeg erinevad originaalist - vaata ka võimalust "Suuruse usaldamine". (See on võimalik ainult kohalike failidega.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>&kdiff3; kui KPart</title>
+<para
+>&kdiff3; on KPart. Hetkel on teostatud liides KParts::ReadOnlyPart. </para
+><para
+>Selle peamine kasutusala on erinevuste vaatamine KDevelopis. KDevelop käivitab alati esmalt oma seesmise erinevuste näitaja. KDiff3 väljakutsumiseks klõpsa hiire parema nupuga erinevuste näitaja aknal ja vali kontekstimenüüst "Näita KDiff3-s". </para
+><para
+>KDiff3 vajab tavaliselt sisendiks kaht faili. Komponendina kasutades eeldab KDiff3, et sisendfail on paigafail unifitseeritud vormingus. Seejärel hangib KDiff3 paigafailist algupärased failinimed. Vähemalt üks kahest failist peab olema kättesaadav. Seejärel kutsub KDiff3 välja käsu <command
+>patch</command
+> teise faili taasloomiseks. </para
+><para
+>Konqueroris võib valida paigafaili ning seejärel kontekstimenüüst "Eelvaatlus KDiff3-s". Arvesta, et see ei toimi, kui ühtegi algupärast faili ei ole saadaval, ning see ei ole eriti usaldusväärne, kui algfaili või ka mõlemat algfaili on muudetud pärast paigafaili loomist. </para
+><para
+>Komponendina käivitades pakub KDiff3 ainult kahe faili võrdlemist, väga pisikest tööriistariba ja menüüd. Ühendamine ega kataloogide võrdlemine ei ole praegu toetatud. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Küsimused ja vastused</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Miks on selle nimi "KDiff3"? </para
+></question
+><answer
+><para
+>Sellised vahendid, nagu "KDiff" ja "KDiff2" (nüüd nimega "Kompare") olid juba olemas. Samuti laseb "KDiff3" oletada, et see tuleb toime ühendamisega samamoodi nagu "diff3" vahend Diff-Tool paketis. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Miks on selle litsents GPL? </para
+></question
+><answer
+><para
+>Ma olen GPL programme kasutanud juba väga pikka aega ning väga palju õppinud arvukaid lähtekoode uurides. Seepärast kuulub ka minu siiras tänu kõigile, kes on nii talitanud, talitavad või alles kavatsevad talitada. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Mõned nupud ja funktsioonid on puudu. Mis lahti? </para
+></question
+><answer
+><para
+>Kompileerisid ilmselt rakenduse lähtekoodist, kuid jätsid konfigureerimisel korrektse KDE prefiksi määramata. Vaikimisi igatseb .configure paigalduse ette võtta kataloogis /usr/local, kuid sellisel juhul ei leia KDE kasutajaliides ressursifaili (st. kdiff3ui.rc). Korrektsest prefiksist räägib pikemalt fail README. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Enamasti on sarnased, aga mitte samased read teineteise kõrval, aga mitte alati. Miks? </para
+></question
+><answer
+><para
+>Ridu, mis erinevad ainult tühimärkide arvu poolest, peetakse algul "võrdseks", samas muudab ka üksainus teistsugune tühimärk failid "erinevaks". Kui sarnased read satuvad teineteise kõrvale, on see tegelikult kokkusattumus, aga õnneks esineb seda päris sageli. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Miks peavad enne salvestamist olema lahendatud kõik konfliktid? </para
+></question
+><answer
+><para
+>Iga võrdse või erineva sektsiooni korral jätab redaktor ühendamise tulemuse aknas meelde, kus see algab või lõpeb. Seda on vaja selleks, et konflikte oleks võimalik käsitsi lahendada lihtsalt allikanuppu (A, B või C) valides. See info läheb kaotsi, kui tekst salvestada ning sellise spetsiaalse failivormingu loomine, mis toetaks kogu vajaliku info salvestamist ja taastamist, oleks liiga keeruline ning raske. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Miks puudub redaktoril ühendamise tulemuste aknas "tagasivõtmise" funtksioon? </para
+></question
+><answer
+><para
+>Ka see nõuaks asjade praeguse seisu juures liiga palju tööd ja vaeva. Vajalik versioon on võimalik alati taastada konkreetse allika (A, B või C) põhjal lihtsalt vastavat nuppu klõpsates. Suurema redigeerimise korral on nagunii soovitatav kasutada mõnda muud redaktorit. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Eemaldasin veidi teksti ja järsku ilmus "&lt;Lähterida puudub&gt;", mida ei saa kuidagi kõrvaldada. Mida see tähendab ja kuidas sellest lahti saada? </para
+></question
+><answer
+><para
+>Iga võrdse või erineva sektsiooni korral jätab redaktor ühendamise tulemuse aknas meelde, kus see algab või lõpeb. "&lt;Lähterida puudub&gt;" tähendab, et sektsiooni ei ole enam midagi jäänud, isegi mitte reavahetusmärki. See võib juhtuda automaatsel ühendamisel või redigeerimise ajal. Tegelikult ei ole see üldse mingi probleem, sest salvestatud failis seda viidet enam ei ole. Kui soovid algvarianti tagasi, vali lihtsalt sektsioon (klõpsuga vasakul asuval kokkuvõttetulbal) ning seejärel klõpsa vajaliku sisuga allkfaili nuppu (A/B või C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Miks KDiff3 ei toeta süntaksi esiletõstu? </para
+></question
+><answer
+><para
+>KDiff3 kasutab niigi palju värve erinevuste esiletõstmiseks. Veelgi rohkem värve ajaks asja ainult arusaamatult kirjuks. Kui sa siiski soovid süntaksi esiletõstu, tuleb sul leppida mõne muu redaktoriga. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Siin on küll palju infot, aga mitte vastust minu küsimusele! </para
+></question
+><answer
+><para
+>Palun saada oma küsimus mulle. Ma olen väga rõõmus igasuguse tagasiside üle. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Autorid ja litsents</title>
+
+<para
+>&kdiff3; - failide ja kataloogide võrdlemise ja ühendamise vahend </para>
+<para
+>Rakenduse autoriõigus 2002-2005: Joachim Eibl <email
+>joachim.eibl AT gmx.de</email
+> </para>
+<para
+>Mitmed lahedad ideed ja vearaportid on pärit minu kolleegidelt ning paljudelt metsiku veebi asukatelt. Tänud teile kõigile! </para>
+
+<para
+>Dokumentatsiooni autoriõigus &copy; 2002-2005: Joachim Eibl <email
+>joachim.eibl AT gmx.de</email
+> </para>
+
+<para
+>Tõlge eesti keelde: Marek Laane <email
+>bald@online.ee</email
+></para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Paigaldamine</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>&kdiff3; hankimine</title>
+
+<para
+>KDiff3 uusima versiooni saab alla laadida selle koduleheküljelt <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>KDiff3 on saadaval ka muudele platvormidele. Vaata lähemalt koduleheküljelt. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Nõuded</title>
+
+<para
+>&kdiff3; kõigi omaduste edukaks kasutamiseks on vajalik &kde; 
+>3.1. </para
+><para
+>Infot selle kohta, kuidas panna KDiff3 tööle muudel platvormidel ilma KDE-ta, vaata palun <ulink url="http://kdiff3.sourceforge.net"
+>koduleheküljelt</ulink
+>. </para
+><para
+>Muudatuste nimekirka leiab internetist <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> või lähtepaketist failis "ChangeLog". </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Kompileerimine ja paigaldamine</title>
+
+<para
+>&kdiff3; kompileerimiseks ja paigaldamiseks KDE-d kasutavas süsteemis anna &kdiff3; paketi baaskataloogis viibides käsureal korraldused:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-kataloog</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-kataloog</replaceable
+> määrab kataloogi süsteemis, kuhu on paigaldatud KDE. Kui sa ei ole selles kindel, loe faili README. </para>
+<para
+>Kuna &kdiff3; kasutab programme <command
+>autoconf</command
+> ja <command
+>automake</command
+>, ei tohiks kompileerimisel probleeme esineda. Kui neid siiski tekib, anna neist palun teada &kde; meililistides.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/et/iteminfo.png b/doc/et/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/et/iteminfo.png
diff --git a/doc/et/letter_by_letter.png b/doc/et/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/et/letter_by_letter.png
diff --git a/doc/et/merge_current.png b/doc/et/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/et/merge_current.png
diff --git a/doc/et/new.png b/doc/et/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/et/new.png
diff --git a/doc/et/open_dialog.png b/doc/et/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/et/open_dialog.png
diff --git a/doc/et/screenshot_diff.png b/doc/et/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/et/screenshot_diff.png
diff --git a/doc/et/screenshot_merge.png b/doc/et/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/et/screenshot_merge.png
diff --git a/doc/et/triple_diff.png b/doc/et/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/et/triple_diff.png
diff --git a/doc/et/white_space.png b/doc/et/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/et/white_space.png
diff --git a/doc/fr/Makefile.am b/doc/fr/Makefile.am
new file mode 100644
index 0000000..4cc442d
--- /dev/null
+++ b/doc/fr/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = fr
+
+
diff --git a/doc/fr/dirbrowser.png b/doc/fr/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/fr/dirbrowser.png
diff --git a/doc/fr/dirmergebig.png b/doc/fr/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/fr/dirmergebig.png
diff --git a/doc/fr/index.docbook b/doc/fr/index.docbook
new file mode 100644
index 0000000..86bd294
--- /dev/null
+++ b/doc/fr/index.docbook
@@ -0,0 +1,2320 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "kdeextragear-1">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % French "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>Le guide de &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+</authorgroup>
+
+&traducteurSimonDepiets; 
+
+<copyright>
+<year
+>2002-2004</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2004-05-29</date>
+<releaseinfo
+>0.9.84</releaseinfo>
+
+
+<abstract>
+<para
+></para>
+<para
+>&kdiff3; est un comparateur fusionneur de fichiers et dossiers <itemizedlist>
+<listitem
+><para
+>qui compare et fusionne deux ou trois fichiers textes ou dossiers</para
+></listitem>
+<listitem
+><para
+>montre les différences ligne par ligne et caractère par caractère,</para
+></listitem>
+<listitem
+><para
+>proposant une fusion automatique facilitée,</para
+></listitem>
+<listitem
+><para
+>ayant un éditeur pour résoudre facilement les conflits de fusion</para
+></listitem>
+<listitem
+><para
+>proposant une transparence réseau via KIO</para
+></listitem>
+<listitem
+><para
+>ayant des options pour surligner ou cacher les changements dans les espaces ou commentaires.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Ce document décrit kdiff3 version 0.9.84. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>fusion</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>triple comparaison</keyword>
+<keyword
+>comparer</keyword>
+<keyword
+>fichiers</keyword>
+<keyword
+>dossiers</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>fusion à trois voies</keyword>
+<keyword
+>différences à la ligne</keyword>
+<keyword
+>synchronise</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>transparence réseau</keyword>
+<keyword
+>éditeur</keyword>
+<keyword
+>espace</keyword>
+<keyword
+>commentaires</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Introduction</title>
+<sect1 id="why"
+><title
+>Encore une autre interface Diff ?</title>
+<para
+>Beaucoup d'outils graphiques pour diff existent. Pourquoi choisir KDiff3  Laissez moi vous expliquer pourquoi je l'ai écrit. </para
+><para
+>Kdiff3 a été créé car j'ai eu a faire une fusion difficile. Fusionner est nécessaire quand beaucoup de gens travaillent sur les mêmes fichiers dans un projet. Une fusion peut parfois être automatisée, quand l'outil de fusion n'a pas seulement les fichiers modifiés (appelés "branches"), mais aussi le fichier original (appelé "base"). L'outil de fusion choisira automatiquement la modification faite uniquement dans une seule branche. Quand beaucoup de contributeurs auront changé les mêmes lignes, alors l'outil de fusion détectera un conflit et vous devrez le résoudre manuellement. </para
+><para
+>La fusion fut donc difficile car un contributeur a changé beaucoup de choses. Un autre a aussi changé beaucoup de texte dans le même fichier, ce qui résulte en beaucoup de conflits lors de la fusion. </para
+><para
+>L'outil que j'ai utilisé ne m'a donc montré que les lignes modifiées mais pas ce qui avait changé dans ces lignes. La fusion fut un vrai cauchemar. </para
+><para
+>Voila donc le début. La première version a montré les différences dans une ligne et les différences d'espaces. Plus tard beaucoup d'autres options furent ajoutées pour augmenter l'utilité. </para
+><para
+>Par exemple si vous voulez comparer du texte rapidement, alors vous pouvez le copier dans le presse-papiers et le coller dans une autre fenêtre diff. </para
+><para
+>Une option qui me demanda beaucoup d'efforts fut la comparaison de dossiers et la facilitation de la fusion, qui a transformé le navigateur en navigateur complet. </para
+><para
+>J'espère que KDiff3 marche chez vous aussi. Amusez vous ! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Captures d'écrans et caractéristiques</title>
+<para
+>Cette capture d'écran montre la différence entre deux fichiers texte.</para>
+<para
+>(Utilisant une ancienne version de KDiff3) :</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>La fusion à trois voies est pleinement supportée. Ceci est utile si deux personnes ont changé le code indépendamment. Le fichier original (la base) est utilisé pour aider KDiff3 a sélectionner les bons changements. L'éditeur de fusion situé sous la fenêtre diff vous autorise à résoudre les conflits, en vous montrant le résultat que vous obtiendrez. Vous pouvez aussi éditer le résultat. Cette capture d'écran montre trois fichiers en train d'être fusionnés. </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>KDiff3 vous aide aussi à comparer et fusionner des dossiers complets. Cette capture d'écran montre KDiff3 pendant une fusion de dossiers : </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Plus d'options</title>
+<sect2
+><title
+>Visionneuse de différences ligne par ligne et caractère par caractère</title>
+<para
+>En utilisant les possibilités d'affichages colorés d'une interface graphique, KDiff3 montre exactement quelle est la différence. Quand vous aurez a traiter beaucoup de texte, cela vous aidera beaucoup. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Voir les différences d'espaces en un coup d'oeil.</title>
+<para
+>Les espaces et alinéas apparaissent visiblement. Quand des lignes diffèrent seulement d'un espace, cela peut être vu en un coup d'oeil dans la colonne sur le côté gauche. Plus de problèmes quand les gens changent les espaces. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Triple comparaison</title>
+<para
+>Analyser trois fichiers et voir en quoi ils diffèrent. </para
+><para
+>Les fenêtres de gauche/millieu/droite sont appelées A/B/C et on respectivement les couleurs bleu/vert/mauve. </para
+><para
+>Si un des fichiers et le même et un des fichiers est différent sur une ligne alors la couleur montre quel fichier est différent. La couleur rouge montre que les deux sont différents. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Fusion confortable de deux ou trois fichiers.</title>
+<para
+>KDiff3 peut être utilisé pour fusionner deux ou trois fichiers et faire autant de fusions automatiques que possible. Le résultat est représenté dans une fenêtre modifiable ou la plupart des conflits peuvent être résolus avec un simple clic de souris. Sélectionnez les boutons A/B/C depuis la barre des boutons pour sélectionner la source qui doit être utilisée. Vous pouvez aussi utiliser plus d'une source. Cette fenêtre est aussi un éditeur pour les conflits nécessitant des corrections plus poussées pouvant être corrigées sans autre outil. </para>
+</sect2>
+
+<sect2
+><title
+>Et ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Une navigation rapide via les bouttons.</para
+></listitem>
+   <listitem
+><para
+>Un clic de souris dans la colonne du sommaire synchronise toutes les fenêtres pour indiquer la même position.</para
+></listitem>
+   <listitem
+><para
+>Sélectionnez et copiez depuis n'importe qu'elle fenêtre et collez dans la fenêtre de résultat de la fusion.</para
+></listitem>
+   <listitem
+><para
+>La colonne d'aperçu qui montre où les changements et conflits sont situés.</para
+></listitem>
+   <listitem
+><para
+>Les couleurs sont ajustables a vos préférences.</para
+></listitem>
+   <listitem
+><para
+>Taille des alinéas ajustable.</para
+></listitem>
+   <listitem
+><para
+>Option pour insérer des espaces à la place des alinéas.</para
+></listitem>
+   <listitem
+><para
+>Ouvrir les fichiers confortablement via une boîte de dialogue ou spécifier les fichiers via la ligne de commande.</para
+></listitem>
+   <listitem
+><para
+>Chercher une partie d'un texte dans toutes les fenêtres. Trouver (Ctrl+F) et trouver le suivant (F3).</para
+></listitem>
+   <listitem
+><para
+>Indiquer le numéro de ligne pour chaque ligne. </para
+></listitem>
+   <listitem
+><para
+>Coller le presse-papiers ou tirer un texte dans une fenêtre diff.</para
+></listitem>
+   <listitem
+><para
+>Transparence réseau via KIO.</para
+></listitem>
+   <listitem
+><para
+>Peut être utilisé pour voir les diff dans KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Coupage des mots dans les lignes longues.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Documentation de la comparaison et fusion de fichiers</title>
+
+<sect1 id="commandline"
+><title
+>Options en ligne de commande</title>
+
+<sect2
+><title
+>Comparer 2 fichiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fusionner 2 fichiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2</replaceable
+> -o <replaceable
+>fichier-résultat</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Comparer 3 fichiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2 fichier3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fusionner 3 fichiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2 fichier3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fichier1 fichier2 fichier3</replaceable
+> -o <replaceable
+>fichier-résultat</replaceable
+>
+</screen>
+<para
+>Notez que <replaceable
+>fichier1</replaceable
+> sera traité comme étant la base de <replaceable
+>fichier2</replaceable
+> et <replaceable
+>fichier3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Cas spécial : fichiers du même nom </title>
+<para
+>Si tous les fichiers ont le même nom mais sont situés dans des dossiers différents, vous pouvez réduire la saisie en ne spécifiant que le nom d'un fichier, pour le premier fichier. Ex : </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dos1/fichier dos2 dos3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Ligne de commande pour lancer une comparaison ou fusion de dossiers : </title>
+<para
+>C'est assez similaire, mais cela concerne désormais des dossiers.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dos1 dos2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dos1 dos2</replaceable
+> -o <replaceable
+>dossier-de-destination</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dos1 dos2 dos3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dos1 dos2 dos3</replaceable
+> -o <replaceable
+>dossier-de-destination</replaceable
+>
+</screen>
+<para
+>Pour la comparaison et fusion de dossiers vous pouvez continuer à lire <link linkend="dirmerge"
+>ici</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Pour plus d'informations sur les options en ligne de commande, utilisez : </title>
+<screen
+><command
+>kdiff3</command
+> --help
+Options :
+  -m, --merge               Fusionner.
+  -b, --base file           Fichier de base explicite. Par compatibilité avec certains outils.
+  -o, --output file         Fichier de résultat. Implique -m. Ex. : -o newfile.txt
+  --out file                Fichier de résultat, encore. (Par compatibilité avec certains outils).
+  --auto                    Pas d'interface graphique si tous les conflits se résolvent tout seuls. (Nécessite -o fichier)
+  --qall                    Ne pas résoudre les conflits automatiquement. (Par compatibilité)...
+  --L1 alias1               Alias pour le fichier 1 (base).
+  --L2 alias2               Alias pour le fichier 2.
+  --L3 alias3               Alias pour le fichier 3.
+  -L, --fname alias         Alias alternatif. Mettez cela une fois pour chaque entrée.
+  -u                        N'a pas d'effet. Pour la compatibilité avec certains outils.
+</screen>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Fenêtre d'ouverture</title>
+<para
+>Étant donné que plusieurs fichiers doivent être sélectionnes en entrée, le programme a une fenêtre d'ouverture spéciale : </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>La fenêtre d'ouverture vous permet d'éditer les noms des fichier à la main, en sélectionnant un fichier via le navigateur ("Fichier...") ou vous permet de choisir des fichiers récemment utilisés via la liste défilante. Si vous rouvrez la fenêtre, alors les noms actuels seront toujours ici. Le troisième fichier d'entrée n'est pas nécessaire. SI l'entrée pour "C" reste vide, alors une analyse diff de deux fichiers seulement sera effectuée. </para
+><para
+>Vous pouvez aussi sélectionner un dossier via "Dossier...". Si pour A un dossier est spécifié alors une comparaison/fusion de dossiers débutera. </para
+><para
+>Si "Fusionner" est sélectionné, alors la ligne "Sortie" devient éditable. Mais il n'est pas nécessaire de spécifier le fichier du résultat de la fusion immédiatement. Vous pouvez aussi le faire au moment de l'enregistrement. </para
+><para
+>Le bouton "Configurer..." ouvre la fenêtre des options pour que vous puissiez mettre en place les options avant de débuter l'analyse. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>La saisie en Coller et Lâcher</title>
+<para
+>Parfois vous voulez comparer les parties d'un texte qui n'est pas un fichier. KDiff3 vous permet aussi de coller le texte du presse-papiers dans une fenêtre de diff sélectionnée. L'analyse diff est alors immédiate. Dans la fenêtre ouverte vous n'aurez pas besoin de spécifier des fichiers, mais simplement de la fermer via "Annuler". </para
+><para
+>Vous pouvez aussi utiliser la méthode du tirer/lâcher : Tirez un fichier depuis le navigateur ou sélectionnez du texte depuis un éditeur et lâchez le dans la fenêtre de diff. </para
+><para
+>Quelle est l'idée ? Parfois un fichier contient deux fonctions similaires, mais vérifier à quel niveau elles sont similaires est compliqué si vous devez d'abord créer deux fichiers puis les charger. Maintenant vous pouvez simplement copier, coller et comparer les sections en question. </para
+><para
+>Note : Actuellement vous ne pouvez rien tirer depuis KDiff3. Seulement le lâchage dans l'entrée de diff est géré. </para
+><para
+>Attention : Certains éditeurs interprètent toujours la méthode du tirer/lâcher vers un autre programme comme un couper (à la place de copier) et coller. Vos données originales pourraient alors être perdues. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Interpréter l'information dans les fenêtres de saisie</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>En haut de chaque fenêtre il y a sa "ligne d'informations". Les lignes d'informations des fenêtres de saisie contiennent une lettre "A", "B" ou "C", le nom de fichier et le numéro de ligne de la première ligne visible dans la fenêtre. (Notez que la fenêtre "C" est optionnelle). Chaque ligne d'information apparaît dans une couleur différente. (Si les chemins sont trop longs, alors vous pouvez déplacer la souris sur la ligne d'information et une bulle apparaîtra, vous montrant le nom complet). </para
+><para
+>Les trois fenêtres de saisies sont assignées aux lettres "A", "B" et "C". "A" a la couleur bleue, "B" le vert et "C" le mauve. (Ce sont les options par défaut, mais elles peuvent être changées via le Menu Options). </para
+><para
+>Quand une différence est détectée les couleurs montrent quel fichier diffère. Quand les deux fichiers en entrée diffèrent, alors la couleur utilisée est le rouge par défaut ("Couleur de conflit" dans les Options). Ce schéma de couleur est particulièrement utile si vous avez trois fichiers en entrée, ce qui sera vu dans la prochaine section (<link linkend="merging"
+>Fusion</link
+>). </para
+><para
+>A la gauche de chaque texte se trouve la "colonne de résumé". Si des différences sont trouvées sur une ligne alors la colonne de résumé affiché la couleur respective. Pour une différence d'espace seulement la colonne est changée. Pour les langages de programmation où les espaces ne sont pas si importants, il est pratique de voir d'un coup d'oeil si quelque chose d'important a été modifié. (En C/C++ les espaces ne sont intéressants que dans les chaînes, commentaires, pour le préprocesseur et dans quelques situations très ésotériques). </para
+><para
+>La ligne verticale séparant la colonne de résumé et le texte est interrompue si le fichier en entrée n'a pas de lignes. Quand la coupe des mots est activée, alors cette ligne verticale apparaît en pointillé. </para
+><para
+>Sur le côté droit une colonne d'"aperçu" est visible à gauche de la barre de défilement verticale. Cela montre la colonne de résumé compressée de l'entrée "A". Toutes les différences et conflits sont visibles d'un coup d'oeil. Quand seulement deux fenêtre de saisie sont utilisées, alors toutes les différences apparaîtront en rouge ici car chaque différence est aussi un conflit. Un rectangle noir encadre les parties visibles des entrées. Pour les fichiers très longs, quand le nombre de lignes est plus grand que la hauteur de la colonne d'aperçu en pixels, alors plusieurs lignes partagent la seule ligne d'aperçu. Un conflit a alors la priorité maximale sur les autres simples différences, qui ont la priorité sur les lignes ou rien ne change, pour qu'aucune différence ou conflit ne soit perdu ici. En cliquant sur cette colonne d'aperçu le texte correspondant sera affiché. </para>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Fusionner et la Fenêtre d'édition du Résultat de la Fusion</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>La fenêtre d'édition du résultat de la fusion (située sous la fenêtre de saisie de diff) a aussi une ligne d'information en haut affichant "Résultat :", le nom du fichier et "[Modifié]" si vous avez édité quelque chose. Habituellement elle contiendra du texte à travers les facilités de fusion automatique, mais conserve souvent quelques conflits. </para
+><para
+>!!! L'enregistrement est désactivé avant que tous les conflits ne soient résolus !!! (Utilisez les boutons "Aller au conflit suivant/précédent" pour trouver les conflits restants). </para
+><para
+>Avec seulement deux fichiers en entrée, chaque différence est aussi un conflit devant être résolu manuellement. </para
+><para
+>Avec trois fichiers en entrée, le premier fichier est traité comme la base, alors que les second et troisième fichiers en entrée contiennent des modifications. Quand dans une ligne seulement soit B ou C a changé mais pas les deux, la source changée sera sélectionnée. Seulement si B et C ont changé sur les mêmes lignes, alors l'outil détectera un conflit devant être résolu manuellement. Quand B et C sont les mêmes, mais différents de A, alors C est sélectionné. </para
+><para
+>La fenêtre d'édition du résultat de la fusion a aussi une colonne de résumé sur la gauche. Elle affiche la lettre de l'entrée sélectionnée pour une ligne ou rien si les trois sources étaient égales sur une ligne. Pour les conflits, elle affiche un point d'interrogation "?" et la ligne affiche "&lt;Conflit de Fusion&gt;" tout en rouge. Étant donné que la résolution des conflits ligne par ligne prendrait beaucoup de temps, les lignes sont groupées en groupes ayant les mêmes caractéristiques de différences et conflits. Seuls les conflits d'espaces sont séparés des autres conflits pour faciliter la fusion de fichiers où l'indentation a changé pour beaucoup de lignes. </para
+><para
+>Quand vous cliquez dans la colonne de résumé avec le bouton gauche de la souris dans une fenêtre alors le groupe correspondant à cette ligne sera sélectionné dans toutes les fenêtres et le début de ce groupe sera affiché. (Cela peut invoquer un saut de repositionnement automatique dans la fenêtre si le début d'un groupe n'est pas visible). Ce groupe devient alors le "groupe actuel". Il est surligné et une barre noire apparaît sur le côté gauche du texte. </para
+><para
+>Regardez les bouttons de sélection de l'entrée contenant les lettres "A", "B" et "C" dans la barre des bouttons sous la barre de menu. Quand vous cliquez sur un bouton de sélection d'entrée, les lignes de cette entrée seront ajoutées à la fin du groupe sélectionné si ce groupe ne contenait pas déjà cette source auparavant. Sinon les lignes de cette entrée seront supprimées. </para
+><para
+>En outre, vous pouvez éditer directement n'importe quelle ligne ici. La colonne de résumé affichera "m" pour chaque ligne ayant été modifiée. </para
+><para
+>Parfois, quand une ligne est supprimée soit par fusion automatique ou édition et qu'aucune autre ligne ne reste dans ce groupe, alors le texte &lt;Pas de ligne à la source&gt; apparaîtra sur cette ligne. C'est juste pour vous souvenir qu'il y avait une source ici si vous changez d'idée et sélectionnez une ligne de nouveau. Ce texte n'apparaîtra pas dans le fichier enregistré ou dans n'importe quelle sélection que vous copierez et collerez. </para
+><para
+>Le texte "&lt;Conflit de Fusion&gt;" apparaîtra dans le presse-papiers si vous copiez et collez du texte contenant une ligne au maximum. Mais faites toujours attention à cela. </para
+><para
+>La fusion normale démarrera par la résolution automatique de conflits simples. Mais le menu "Fusion" propose quelques actions pour d'autres besoins communs. Si vous avez à sélectionner la même source pour la plupart des conflits, alors vous pouvez choisir "A",  "B" ou "C" partout, ou seulement pour les conflits restant non résolus, ou pour les conflits d'espacement non résolus. Si vous voulez décider chaque différence vous même, vous pouvez "Mettre des deltas aux conflits". Ou si vous voulez retourner aux choix automatiques de KDiff3 alors sélectionnez "Résoudre automatiquement les conflits simples". KDiff3 redémarre alors la fusion. Pour les actions changeant vos précédentes modifications KDiff3 vous demandera votre confirmation avant de continuer. </para
+><para
+>Note : Quand vous choisissez une des sources pour les conflits d'espacement non résolus et que les options "Ignorer les nombres" ou "Ignorer les commentaires C/C++" sont utilisées alors les changements dans les nombres ou commentaires seront aussi traités comme des espaces. </para>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigation et Édition</title>
+<para
+>La majorité de la navigation sera effectuée avec les barres de défilement et la souris mais vous pouvez aussi naviguer avec les touches. Si vous cliquez dans une des fenêtres alors vous pouvez utilisez les touches page précédente, page suivante, home, fin, ctrl-home, ctrl-fin et les flèches comme vous le feriez dans les autres programmes. La colonne de résumé située à côté de la barre de défilement verticale des fichiers en entrée peut aussi être utilisée pour naviguer en cliquant dessus. </para
+><para
+>Vous pouvez aussi utiliser la molette de la souris pour monter et descendre. </para
+><para
+>Dans l'éditeur de résultat de la fusion vous pouvez aussi utiliser les autres touches pour l'édition. Vous pouvez basculer entre les modes insérer et remplacer avec la touche Insertion. (Le mode par défaut est le mode d'insertion). </para
+><para
+>Un clic gauche dans une colonne de résumé synchronisera toutes les fenêtres pour qu'elles affichent le début du même groupe de lignes (comme expliqué dans la section <link linkend="merging"
+>"Fusion"</link
+>). </para
+><para
+>La barre de boutons contient aussi sept bouttons de navigation avec lesquels vous pouvez naviguer vers la première/actuelle/dernière différence, vers la différence précédente/suivante (ctrl-haut/ctrl-bas), vers le conflit précédent/suivant (ctrl-pgpréc/ctrl-pgsuiv), ou vers le conflit non résolu précédent/suivant. Notez que pour KDiff3 un "conflit" qui n'a pas été résolu automatiquement au début de la fusion reste un "conflit" même s'il est résolu. Voila la nécessité de distinguer les "conflits non résolus". </para
+><para
+>Il y a aussi un bouton "Aller automatiquement au conflit non résolu suivant après la sélection de la source" (Avancée automatique). Si vous activez cette option, alors, quand une source est sélectionnée, KDiff3 avancera automatiquement en sélectionnant le prochain conflit non résolu. Cela vous aidera si vous voulez toujours ne choisir qu'une source. Si vous avez besoin de deux sources, ou si vous voulez éditer après la sélection, alors vous voudrez probablement désactiver cette fonctionnalité. Avant d'avancer au conflit suivant KDiff3 vous montre les modifications de ce choix pour un court laps de temps. Ce délai est ajustable dans les Options de Fusion et de Diff : Vous pouvez spécifier le "Délai d'avancée automatique" en millisecondes entre 0 et 2000. Astuce : Vous êtes fatigué d'effectuer trop de clics ? - Utilisez un court délai d'avancée automatique et les raccourcis Ctrl-1/2/3 pour sélectionner A/B/C pour les conflits. </para>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Sélectionner, Copier et Coller</title>
+<para
+>La fenêtre d'entrée n'affiche pas de curseur, les sélections peuvent donc être effectuées via la souris en cliquant avec le bouton gauche au début, en gardant le bouton pressé et en se déplaçant à la fin de la sélection souhaitée, où vous relâchez le bouton. Vous pouvez aussi sélectionner un mot en double cliquant dessus. Dans l'éditeur de résultat de la fusion vous pouvez aussi sélectionner via le clavier en gardant le bouton "Maj" pressé et en naviguant via les flèches. </para
+><para
+>Pour copier vers le presse-papiers vous devez cliquez sur le boutton "Copier" (Ctrl-C ou Ctrl-Inser). Mais il existe une fonctionnalité "Copier automatiquement la sélection". Si elle est activée, alors tout ce que vous sélectionnerez sera copié automatiquement vers le presse papier et vous n'aurez pas besoin de copier. Mais faites attention lorsque vous utilisez cela car le contenu du presse-papiers peut être effacé accidentellement. </para
+><para
+>"Couper" (Ctrl-X ou Maj-Suppr) copie le texte vers le presse-papiers et supprime celui-ci et "Coller" (Ctrl-V ou Maj-Inser) insère le texte du presse-papiers à la position du curseur à la place de la sélection actuelle. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Enregistrer</title>
+<para
+>L'enregistrement ne sera autorisé que quand tous les conflits seront résolus. Si le fichier existe déjà et que la fonctionnalité "Effectuer une copie de sauvegarde des fichiers" est activée alors le fichier existant sera renommé avec une extension en ".orig", mais si un fichier .orig existe déjà il sera supprimé. Quand vous quittez ou lancez une autre analyse diff et que les données n'ont pas encore été enregistrées, alors KDiff3 vous demandera si vous voulez enregistrer, annuler ou continuer sans enregistrer. (KDiff3 ne saisit aucun signal. Donc si vous "tuez" KDiff3 vos données seront perdues). </para
+><para
+>Les fins de ligne sont enregistrées selon la méthode normale de l'OS. Pour les Unix chaque fin de ligne se termine avec un caractère "\n", tandis que pour les systèmes basés sur Win32 chaque ligne se termine avec un retour chariot et "\r\n". KDiff3 ne préserve pas les fins de ligne des fichiers en entrée, ce qui signifie aussi que vous ne devriez pas utiliser KDiff3 pour les fichiers binaires. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Trouver des chaînes</title>
+<para
+>Vous pouvez chercher une chaîne dans n'importe quelle fenêtre de KDiff3. La commande "Chercher..." (Ctrl-F) dans le menu Édition ouvre une fenêtre vous permettant de spécifier la chaîne à rechercher. Vous pouvez aussi sélectionner la fenêtre dans laquelle la chaîne doit être cherchée. La recherche reste toujours au premier plan. En utilisant "Chercher le suivant" (F3), vous chercherez l'occurrence suivante. Si vous sélectionner plusieurs fenêtres, alors la première fenêtre sera scannée du début jusqu'à la fin avant que la recherche ne démarre dans la fenêtre suivante au premier plan, etc. </para>
+</sect1>
+
+
+<sect1 id="options"
+><title
+>Options</title>
+<para
+>Les options et la liste des fichiers récemment ouverts seront enregistrées lorsque vous quitterez le programme, et rechargées lorsque vous le démarrerez. (Menu Options / Configurer KDiff3)... </para>
+<sect2
+><title
+>Police</title>
+<para
+>Sélectionnez un taille de police fixe. (Sur certains systèmes cette fenêtre présentera aussi des tailles de police variable, mais vous ne devriez pas les utiliser). </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Police italique pour les différences :</emphasis
+></term
+><listitem
+><para
+>Si vous sélectionnez cela, alors les différences de texte seront affichées dans la version italique de la police. Si la police ne supporte pas l'italique, cela ne fera rien.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Couleurs</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Couleur du premier plan :</emphasis
+></term
+><listitem
+><para
+>Habituellement le noir. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur de l'arrière plan :</emphasis
+></term
+><listitem
+><para
+>Habituellement le blanc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur de l'arrière plan de Diff :</emphasis
+></term
+><listitem
+><para
+>Habituellement le gris clair. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur A :</emphasis
+></term
+><listitem
+><para
+>Habituellement le bleu foncé. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur B :</emphasis
+></term
+><listitem
+><para
+>Habituellement le vert foncé. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur C :</emphasis
+></term
+><listitem
+><para
+>Habituellement le mauve foncé. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur de conflit :</emphasis
+></term
+><listitem
+><para
+>Habituellement le rouge.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur de l'arrière plan de la sélection actuelle :</emphasis
+></term
+><listitem
+><para
+>Habituellement le jaune clair.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Couleur de l'arrière plan de la sélection différant actuelle :</emphasis
+></term
+><listitem
+><para
+>Habituellement le jaune foncé</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Pour les systèmes ne comprenant que 16 ou 256 couleurs certaines couleurs ne sont pas disponibles en forme pure. Sur ces systèmes le boutton "Par défaut" choisira une couleur pure. </para>
+</sect2>
+
+<sect2
+><title
+>Options de l'éditeur</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Tabulation insère des espaces :</emphasis
+></term
+><listitem
+><para
+>Si ceci est désactivé et que vous pressez la touche de tabulation, un caractère de tabulation est inséré, sinon la quantité appropriée de caractères est insérée.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Taille de la tabulation :</emphasis
+></term
+><listitem
+><para
+>Peut être ajustée pour vos besoins spécifique. Par défaut, 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Indentation automatique :</emphasis
+></term
+><listitem
+><para
+>Quand vous pressez le bouton Entrée ou Retour l'indentation de la ligne précédente est utilisée pour la nouvelle ligne. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copier automatiquement la sélection :</emphasis
+></term
+><listitem
+><para
+>Chaque sélection est copiée automatiquement vers le presse-papiers quand cette option est activée. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Style de fin de ligne :</emphasis
+></term
+><listitem
+><para
+>Quand vous enregistrez vous pouvez sélectionner quel style de fin de ligne vous préférez. La configuration par défaut est le choix commun pour le système d'exploitation utilisé. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Utiliser un encodage local :</emphasis
+></term
+><listitem
+><para
+>Pour afficher des caractères étrangers. Essayez de changer cela si certains caractères de votre langue ne sont pas affichés correctement. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Options de Comparaison et de Fusion</title>
+<para
+>Quand vous comparez des fichiers, KDiff3 essaie d'abord de comparer les lignes qui sont égales dans les trois fichiers. Il ne peut ignorer les espaces que dans cette étape. La seconde étape compare chaque ligne. Dans cette étape les espaces ne seront pas ignorés. Durant la fusion les espaces ne seront pas ignorés non plus. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Se préserver contre le Retour Chariot :</emphasis
+></term
+><listitem
+><para
+>Certains éditeurs (sur certains systèmes) enregistrent les caractères de retour chariot '\r' et saut de ligne '\n', tandis que les autres n'enregistrent que le saut de ligne '\n'. Habituellement KDiff3 ignore le retour chariot, mais alors les fichiers n'auront pas la même taille, mais seront les mêmes en comparaison terme à terme. Quand cette option est activée, alors les caractères de retour chariot seront visibles mais traités comme des espaces. Cette option doit être désactivée lors d'une fusion. Elle est désactivée par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorer les nombres :</emphasis
+></term
+><listitem
+><para
+>Désactivé par défaut. Les chiffres ('0'-'9', '.', '-') seront ignorés dans la première partie de l'analyse durant laquelle la comparaison des lignes est effectuée. Dans le résultat les différences seront affichées dans tous les cas, mais elles sont traitées comme des espaces. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorer les commentaires C/C++ :</emphasis
+></term
+><listitem
+><para
+>Désactivé par défaut. Les changements dans les commentaires seront traités comme les changements dans les espaces. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorer la casse :</emphasis
+></term
+><listitem
+><para
+>Désactivé par défaut. Les différences de casse de caractères (comme 'A' et 'a') seront traitées comme des changements dans les espaces. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Commande Préprocesseur :</emphasis
+></term
+><listitem
+><para
+>Se reporter à la <link linkend="preprocessors"
+>section suivante</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Commande préprocesseur de comparaison de ligne :</emphasis
+></term
+><listitem
+><para
+>Se reporter à la <link linkend="preprocessors"
+>section suivante</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>S'efforcer :</emphasis
+></term
+><listitem
+><para
+>S'efforcer de trouver des différences encore plus petites. (Activé par défaut). Ceci sera probablement efficace pour les fichiers lourds et compliqués, lent pour les fichiers très lourds. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Délai d'avancée automatique (en ms) :</emphasis
+></term
+><listitem
+><para
+>Quand le mode d'avancée automatique est activé, cette option spécifie la durée d'affichage du résultat de la sélection avant de sauter au conflit non résolu suivant. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Choix par défaut pour les espaces lors d'une fusion à 2/3 fichiers :</emphasis
+></term
+><listitem
+><para
+>Résoudre automatiquement tous les conflits d'espaces en choisissant le fichier spécifié. (Le choix par défaut est le choix manuel). Utile si tous les espaces ne sont pas vraiment importants dans les fichiers. Si vous avez besoin de cela occasionellement, il est mieux d'utiliser "Choisir A/B/C pour tous les conflits d'espaces non résolus" dans le menu de fusion. Notez que si vous activésoit "Ignorer les nombres" ou "Ignorer les commentaires C/C++" alors ce choix automatique est aussi appliqué pour les conflits dans les nombres ou les commentaires. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Fusion de dossiers</title>
+<para
+>Ces options sont en relation avec le scan de dossiers et le déroulement de la fusion : Reportez-vous à la <link linkend="dirmergeoptions"
+>Documentation sur la Comparaison/Fusion de dossiers</link
+> pour plus de détails. </para
+><para
+>Il y a déjà une option ici qui est aussi pertinente pour l'enregistrement de fichiers seuls : </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Fichiers de sauvegarde :</emphasis
+></term
+><listitem
+><para
+>Quand un fichier est enregistré et qu'une ancienne version existe déjà, alors la version originale sera renommée avec une extension ".orig". Si un ancien fichier de sauvegarde portant l'extension ".orig" existe déjà, alors il sera supprimé sans sauvegarde. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Divers</title>
+<para
+>(Ces options et actions sont disponibles dans les menus ou la barre des boutons).</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Afficher les numéros de ligne :</emphasis
+></term
+><listitem
+><para
+>Vous pouvez sélectionner si les numéros de ligne doivent être affichés pour les fichiers en entrée.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Afficher les espaces et les alinéas pour les différences :</emphasis
+></term
+><listitem
+><para
+>Parfois les espaces et alinéas visibles peuvent vous déranger. Vous pouvez désactiver cette option.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Afficher les espaces :</emphasis
+></term
+><listitem
+><para
+>Désactivez cette option pour supprimer tous les surlignements ou les changements d'espaces dans le texte ou dans les colonnes d'aperçu. (Notez que cela s'applique aussi aux changements dans les nombres ou commentaires quand les options "Ignorer les nombres" ou "Ignorer les commentaires" sont actives).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Options de l'aperçu :</emphasis
+></term
+><listitem
+><para
+>Ces choix ne sont disponibles que si vous comparez trois fichiers. Dans le mode normal toutes les différences sont affichées dans une colonne d'aperçu codée en une seule colonne. Mais parfois vous pouvez être particulièrement intéressés par les différences entre seulement deux de ces trois fichiers. En sélectionnant l'aperçu "A et B", "A et C" ou "B et C", une seconde colonne d'aperçu sera affichée avec les informations nécessaires à côté de l'aperçu normal. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Fenêtre de coupe des mots :</emphasis
+></term
+><listitem
+><para
+>Coupe des mots lorsque leur longueur dépasse la largeur de la fenêtre. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Afficher la fenêtre A/B/C :</emphasis
+></term
+><listitem
+><para
+>Parfois vous voudrez mieux utiliser l'espace sur l'écran pour les longues lignes. Cachez les fenêtres qui ne sont pas importantes. (Dans le menu Fenêtre).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Sens de la séparation des fenêtres :</emphasis
+></term
+><listitem
+><para
+>Choisir entre les fenêtres de comparaison affichées côte à côte (A à côté de B à côté de C) ou l'une au-dessus de l'autre (A sur B sur C). Cela devrait aussi vous aider si les lignes sont longues. (Dans le menu Fenêtre). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Démarrer une fusion rapide :</emphasis
+></term
+><listitem
+><para
+>Parfois vous voyez des différences et vous décidez de fusionner. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Fusionner le fichier actuel" dans le menu Dossiers fonctionne aussi si vous voulez comparer deux fichiers. Un simple clic démarre la fusion et utilise le nom de fichier du dernier fichier en entrée comme étant le nom du fichier résultat de la fusion par défaut. (Quand ceci est utilisé pour redémarrer une fusion, alors le nom de fichier résultat sera conservé).</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Configurer les raccourcis clavier</title>
+<para
+>Actuellement seule la version KDE supporte la configuration des raccourcis clavier par l'utilisateur. (Menu Configuration / Configurer les raccourcis clavier)... </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Commandes préprocesseur</title>
+<para
+>KDiff3 supporte deux options préprocesseur. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Commande Préprocesseur :</emphasis
+></term
+><listitem
+><para
+>Quand un fichier est lu, il sera traité à travers cette commande externe. Le résultat de cette commande sera visible à la place du fichier original. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Utilisez cela pour exclure les parties du fichier qui vous gênent, ou corriger automatiquement l'indentation, etc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Commande préprocesseur de comparaison de ligne :</emphasis
+></term
+><listitem
+><para
+>Quand un fichier est lu, il sera traité à travers cette commande externe. Si une commande préprocessus (voir ci-dessus) est aussi spécifiée, alors le fichier résultat de la commande préprocesseur est utilisé pour le préprocessus de traitement de lignes. Le résultat de cette dernière ne sera utilisé que durant la phase de comparaison de lignes de l'analyse. Vous pouvez écrire votre propre commande préprocesseur qui remplit des besoins spécifiques. Chaque ligne en entrée a une ligne en sortie correspondante. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>L'idée est de permettre à l'utilisateur d'avoir une plus grande flexibilité de configuration du résultat de la comparaison. Mais cela nécessite un programme externe, et beaucoup d'utilisateurs ne veulent pas en écrire un eux-mêmes. La bonne nouvelle est que très souvent <command
+>sed</command
+> ou <command
+>perl</command
+> feront l'affaire. </para>
+<para
+>Exemple : Cas simple : Considérons le fichier a.txt (6 lignes) : <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> Et le fichier b.txt (3 lignes) : <screen>
+      cg
+      dg
+      eg
+</screen
+> Sans commande préprocesseur les lignes suivantes seront placées les unes à côté des autres  <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Ceci n'est probablement pas voulu étant donné que la première lettre contient l'information intéressante actuelle. Pour aider l'algorithme à ignorer la seconde lettre nous pouvons utiliser un préprocesseur qui remplacera 'g' par 'a' : <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Avec cette commande le résultat de la comparaison devrait être : <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> L'algorithme de comparaison regarde les fichiers après avoir lancé le préprocesseur, mais à l'écran le fichier est inchangé. (Le préprocesseur normal aurait changé aussi les données affichées à l'écran). </para>
+
+<sect2 id="sedbasics"
+><title
+>Bases de <command
+>sed</command
+></title>
+<para
+>Cette section n'introduit qu'aux fonctions les plus basiques de <command
+>sed</command
+>. Pour plus d'informations reportez vous à <ulink url="info:/sed"
+>la page info de sed</ulink
+> ou <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Une version précompilée pour Windows peut être trouvée à <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Notez que les exemples qui suivent partent du principe que la commande <command
+>sed</command
+> est dans un dossier de la variable d'environnement PATH. Si ce n'est pas le cas, vous devrez spécifier le chemin complet absolu pour la commande. Notez aussi que les exemples qui suivent utilisent les guillemets simples (') qui ne fonctionnent pas sous windows. Sur windows vous devez utilisez les doubles guillemets (") à la place. </para>
+<para
+>Dans ce contexte seule la commande de substitution <command
+>sed</command
+> est utilisée : <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>REPLACEMENT</replaceable
+>/<replaceable
+>FLAGS</replaceable
+>'
+</screen
+> Avant d'utiliser une nouvelle commande dans KDIff3, vous devriez d'abord la tester dans la console. Ici la commande <command
+>echo</command
+> est utile. Exemple : <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Cet exemple affiche une commande sed très simple qui remplace la première occurrence de "a" par un "o". Si vous voulez remplacer toutes les occurrences vous aurez besoin du flag "g" : <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Le symbole "|" est la commande tuyau qui transfère la sortie de la commande précédente vers l'entrée de la commande suivante. Si vous voulez tester avec un fichier plus long vous pouvez utiliser <command
+>cat</command
+> sur les systèmes basés sur Unix ou <command
+>type</command
+> sur les systèmes Windows. <command
+>sed</command
+> fera la substitution pour chaque ligne. <screen
+><command
+>cat</command
+> <replaceable
+>nom-du-fichier</replaceable
+> | <command
+>sed</command
+> <replaceable
+>options</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Exemples d'utilisations de <command
+>sed</command
+> dans KDiff3</title>
+<sect3
+><title
+>Ignorer les autres types de commentaires</title>
+<para
+>Actuellement KDiff3 ne comprend que les commentaires C/C++. En utilisant la commande préprocesseur de traitement de ligne vous pouvez aussi ignorer d'autres types de commentaires, en les convertissant en commentaires C/C++. Exemple : Pour ignorer les commentaires commençant par "#", vous devriez les convertir en "//". Notez que vous devrez aussi activer l'option "Ignorer les commentaires C/C++" pour que cela ait un effet. La commande préprocesseur de traitement de ligne appropriée serait <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Étant donné que pour <command
+>sed</command
+> le caractère "/" a un sens particulier, il est nécessaire de placer le caractère "\" devant chaque "/" dans une chaîne de remplacement. Parfois le "\" est nécessaire pour ajouter ou supprimer un sens particulier de certains caractères. Le guillemet simple (') avant et après la commande de substitution est désormais important, car sinon le shell essaierait d'interpréter certains caractères spéciaux comme'#', '$' ou '\' avant de les passer à <command
+>sed</command
+>. Notez que sur Windows vous aurez besoin des doubles marques de citation ici ("). Windows substitue les autres caractères comme '%', alors vous pourriez avoir quelques essais à faire. </para>
+</sect3>
+<sect3
+><title
+>Comparaison non sensible à la casse</title>
+<para
+>Utilisez la commande préprocesseur de traitement de ligne suivante pour convertir toutes ce qui est situé en entrée en majuscules : <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Ici ".*" est une expression rationnelle qui trouve, dans ce contexte, tous les caractères de la ligne. Le "\1" est la chaîne de remplacement en référence au texte trouvé dans la première paire de "\(" et "\)". Le "\U" convertit le texte inséré en majuscules. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorer les mots clés CVS</title>
+<para
+>CVS et d'autres systèmes de contrôle de version utilisent des mots clés pour insérer les chaînes générées automatiquement (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Tous suivent le modèle "$KEYWORD generated text$". Nous avons maintenant besoin d'une commande préprocesseur de traitement de ligne qui ne supprime que le texte généré : <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Le "\|" sépare les mots clés possibles. Vous pouvez vouloir modifier cette liste selon vos besoins. Le "\" avant le "$" est nécessaire car sinon le "$" signifie fin de la ligne. </para>
+<para
+>Quand vous ferez des expérimentations avec <command
+>sed</command
+> vous pourrez arriver à comprendre toutes ces expressions rationnelles. Elles sont utiles car beaucoup d'autres programmes supportent ces mêmes fonctionnalités. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorer les nombres</title>
+<para
+>Ignorer les nombres est actuellement une option intégrée. Mais en tant qu'autre exemple, c'est ce qui se passerait si vous aviez mis comme commande préprocesseur de traitement de ligne. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Chaque caractère dans '[' ']' est remplacé par rien. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorer certaines colonnes</title>
+<para
+>Parfois un texte est très strictement formaté, et il y a certaines colonnes que vous voudrez toujours ignorer, tandis que vous voudrez en gardez d'autres pour l'analyse. Dans l'exemple qui suit les cinq premières colonnes (caractères de chaque ligne) sont ignorés, les dix colonnes suivantes sont conservées, puis de nouveaux cinq colonnes sont ignorées et le reste de la ligne est conservé. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Chaque point '.' correspond à un caractère. Le "\1" et "\2" dans la chaîne de remplacement réfère au texte correspondant situé entre la première paire de "\(" et"\)" dénotant que le texte doit être conservé. </para>
+</sect3>
+
+<sect3
+><title
+>Combiner plusieurs substitutions</title>
+<para
+>Parfois vous voudrez appliquer plusieurs substitutions à la fois. Vous pouvez alors utilisez le point-virgule ';' pour les séparer les unes des autres. Exemple : <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Utiliser <command
+>perl</command
+> à la place de <command
+>sed</command
+></title>
+<para
+>A la place de <command
+>sed</command
+> vous pouvez vouloir utiliser quelque chose d'autre comme <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>REPLACEMENT</replaceable
+>/<replaceable
+>FLAGS</replaceable
+>'
+</screen
+> Mais certains détails sont différents avec <command
+>perl</command
+>. Notez que la où <command
+>sed</command
+> à besoin de "\(" and "\)" <command
+>perl</command
+> n'a besoin que de "(" and ")" sans les '\' qui le précède. Exemple : <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Ordre d'exécution des commandes préprocesseur</title>
+<para
+>Les données traversent tous les préprocesseurs internes et externes dans l'ordre suivant : </para>
+<itemizedlist>
+<listitem
+><para
+>Préprocesseur normal,</para
+></listitem>
+<listitem
+><para
+>Préprocesseur de traitement de ligne,</para
+></listitem>
+<listitem
+><para
+>Ignorer la casse (conversion en majuscule),</para
+></listitem>
+<listitem
+><para
+>Détection des commentaires C/C++,</para
+></listitem>
+<listitem
+><para
+>Ignorer les nombres,</para
+></listitem>
+<listitem
+><para
+>Ignorer les espaces</para
+></listitem>
+</itemizedlist>
+<para
+>Les données après le préprocesseur normal seront conservées pour l'affichage et la fusion. Les autres opérations ne modifient que les données que l'algorithme de comparaison de lignes peut voir. </para
+><para
+>Dans les rares cas ou vous utiliserez un préprocesseur normal, notez que le préprocesseur de traitement de ligne prend la sortie du préprocesseur normal en tant qu'entrée. </para>
+</sect2>
+
+<sect2
+><title
+>Attention</title>
+<para
+>Les commandes préprocesseur sont très souvent utiles, mais comme avec toutes les options modifiant vos textes ou cachant certaines différences automatiquement, vous pouvez accidentellement sauter certaines différences et dans le pire des cas supprimer des données importantes. </para
+><para
+>C'est pour cette raison que durant une fusion, si une commande préprocesseur normale est utilisée, KDiff3 vous en informera et vous demandera si elle doit être ou non désactivée. Mais ne vous inquiétez pas si une commande préprocesseur de traitement de ligne est active. La fusion ne sera pas terminée tant que tous les conflits ne seront pas résolus. SI vous avez désactivé "Afficher les espaces", alors les différences qui seront supprimées avec la commande préprocesseur de traitement de ligne seront aussi invisibles. Si le boutton d'enregistrement reste désactivé durant une fusion (à cause de conflits restants), assurez vous d'avoir activé "Montrer les espaces". Si vous ne voulez pas fusionner ces différences moins importantes manuellement, vous pouvez sélectionner "Choisir [A|B|C] pour tous les conflits d'espaces non résolus" dans le menu Fusion. </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Comparaison et Fusion de dossiers avec KDiff3</title>
+<sect1 id="dirmergeintro"
+><title
+>Introduction</title>
+<para
+>Souvent les programmeurs doivent modifier beaucoup de fichiers dans un dossiers pour parvenir à leur but. Pour cela KDiff3 vous permet aussi de comparer et de fusionner des dossiers complets récursivement ! </para
+><para
+>Bien souvent la comparaison et la fusion de dossiers semble bien compliquée, il y a beaucoup de détails dont que vous devriez savoir. Le plus important est bien sur le fait que maintenant beaucoup de fichiers peuvent  être affectés par chaque opération. Si vous n'avez pas de sauvegardes de vos données originales, alors il  peut être très difficile voire impossible de revenir à l'état original. Donc, avant de démarrer une fusion, assurez-vous que vos données sont en sécurité, et qu'un retour à l'état initial est possible. Vous pouvez faire une archive ou utiliser un système de contrôle de version (CVS), mais même les programmeurs expérimentés et les intégrateurs ont besoin des anciennes sources. Et notez que même si moi (auteur de KDiff3) ait essayé de faire de mon mieux, je ne peux pas garantir qu'il n'y ait pas de bogues. Et selon la GNU-GPL il n'y a AUCUNE GARANTIE sur quoi que ce soit pour ce programme. Alors soyez humble et gardez toujours à l'esprit : </para>
+<blockquote
+><para>
+   <emphasis
+>L'erreur est humaine, mais pour vraiment faire n'importe quoi vous avez besoin d'un ordinateur.</emphasis>
+</para
+></blockquote>
+<para
+>Voila ce que ce programme peut faire pour vous : KDiff3... </para>
+<itemizedlist>
+     <listitem
+><para
+>...lit et compare deux ou trois dossiers récursivement,</para
+></listitem>
+     <listitem
+><para
+>... fait spécialement attention aux liens symboliques,</para
+></listitem>
+     <listitem
+><para
+>... vous permet de naviguer dans vos fichiers avec des double-clics,</para
+></listitem>
+     <listitem
+><para
+>... pour chacun d'eux propose une opération de fusion, que vous pouvez changer avant de démarrer une fusion de dossiers,</para
+></listitem>
+     <listitem
+><para
+>... vous permet de simuler la fusion et de lister les actions qui auraient eu lieu, sans les faire,</para
+></listitem>
+     <listitem
+><para
+>... vous permet de faire réellement la fusion, et vous permet d'interagir lorsqu'une action manuelle est nécessaire,</para
+></listitem>
+     <listitem
+><para
+>... vous permet de lancer l'opération pour tous les éléments (touche F7) ou pour l'élément sélectionné (touche F6),</para
+></listitem>
+     <listitem
+><para
+>... vous permet de continuer la fusion après une interaction manuelle avec la touche F7,</para
+></listitem>
+     <listitem
+><para
+>... crée des copies de sauvegarde en option, portant l'extension ".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Démarrer une comparaison ou une fusion de dossiers</title>
+<para
+>C'est très similaire à la fusion et à la comparaison d'un seul fichier. Vous devrez juste spécifier les dossiers depuis la ligne de commande ou la fenêtre d'ouverture de fichiers. </para>
+<sect2
+><title
+>Comparer/Fusionner deux dossiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dos1 dos2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dos1 dos2</replaceable
+> -o <replaceable
+>dosdedest</replaceable
+>
+</screen>
+<para
+>Si aucun dossier de destination n'est spécifié, alors KDiff3 utilisera <replaceable
+>dos2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Comparer/Fusionner trois dossiers : </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dos1 dos2 dos3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dos1 dos2 dos3</replaceable
+> -o <replaceable
+>dossier de destination</replaceable
+>
+</screen>
+<para
+>Quand trois dossiers sont fusionnés alors <replaceable
+>dos1</replaceable
+> est utilisé comme la base de la fusion. Si aucun dossier de destination n'est spécifié, alors KDiff3 utilisera <replaceable
+>dos3</replaceable
+> comme dossier de destination de la fusion. </para>
+
+<para
+>Notez que seule la comparaison démarre automatiquement, pas la fusion. Pour cela vous devrez sélectionner le choix du menu ou appuyez sur la touche F7. (Plus de détails à la suite). </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Information visible</title>
+<para
+>Lors de la lecture des dossiers, une boîte de dialogue apparat vous informant de la progression. Si vous annulez le scan de dossier, alors seuls les fichiers déjà comparés seront listés. </para
+><para
+>Quand le scan de dossiers est terminé KDiff3 affiche une liste avec les résultats à gauche, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... et les détails concernant l'élément actuellement sélectionné à droite : </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>La colonne de nom</title>
+<para
+>Chaque fichier et dossier ayant été trouvé durant le scan et affiché ici dans une arborescence. Vous pouvez sélectionner un élément en cliquant dessus avec la souris. </para
+><para
+>Les dossiers sont fermés par défaut. Vous pouvez les développer ou les fermer on cliquant sur "+"/"-", en double cliquant sur l'élément ou simplement en utilisant les flèches gauche/droite du clavier. Le menu "Dossier" contient aussi deux actions "Naviguer dans tous les sous-dossiers" et "Refermer tous les sous-dossiers" avec lesquelles vous pouvez fermer ou développer tous les dossiers d'un seul coup. </para
+><para
+>Si vous double-cliquez sur un fichier, alors la comparaison démarre et la fenêtre de comparaison apparaîtra. </para>
+<para
+>L'image de la colonne de nom reflète du type de fichier dans le premier dossier ("A"). Cela peut être : </para>
+<itemizedlist>
+     <listitem
+><para
+>Fichier normal</para
+></listitem>
+     <listitem
+><para
+>Dossier normal (image de dossier)</para
+></listitem>
+     <listitem
+><para
+>Lien vers un fichier (image de fichier avec une flèche)</para
+></listitem>
+     <listitem
+><para
+>Lien vers un dossier (image de dossier avec une flèche)</para
+></listitem>
+</itemizedlist>
+<para
+>SI le type de fichier est différent dans les autres dossiers, alors cela est visible dans les colonnes A/B/C et dans la fenêtre affichant les détails concernant les éléments sélectionnés. Notez que dans un cas comme cela aucune opération de fusion ne peut être sélectionnée automatiquement. Quand une fusion est démarrée, alors l'utilisateur sera informé de problèmes de ce type. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Les colonnes A/B/C et le système de coloration</title>
+<para
+>Comme cela peut être vu dans l'image ci-dessous les couleurs rouge, vert, jaune et noir sont utilisées dans les colonnes A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Noir : Cela ne semble pas exister dans ce dossier.</para
+></listitem>
+     <listitem
+><para
+>Vert : Élément le plus récent.</para
+></listitem>
+     <listitem
+><para
+>Jaune : Plus vieux que le vert, plus récent que le rouge.</para
+></listitem>
+     <listitem
+><para
+>Rouge : Élément le plus ancien.</para
+></listitem>
+</itemizedlist>
+<para
+>Mais pour les éléments qui sont identiques dans la comparaison leur couleur est aussi identique même si leur âge ne l'est pas. </para
+><para
+>Les dossiers sont considérés comme égaux si tous les éléments qu'ils contiennent sont égaux. Alors ils auront aussi la même couleur. Mais l'âge d'un dossier n'est pas considéré pour sa couleur. </para
+><para
+>L'idée pour le schéma de coloration vient de <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. Les couleurs ressemblent aux couleurs d'une feuille d'un arbre qui est verte au printemps, puis devient jaune à l'automne pour devenir rouge à l'hiver. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>La colonne d'opération</title>
+<para
+>Après avoir comparé les dossiers, KDiff3 évalue aussi une proposition pour l'opération de fusion. Cela est affiché dans la colonne "Opération". Vous pouvez modifier l'opération en cliquant sur l'opération que vous voulez changer. Un petit menu se déroulera vous permettant de sélectionner une opération pour cet élément. (Vous pouvez aussi sélectionner les opérations les plus importantes via le clavier. Ctrl+1/2/3/4/Del sélectionnera ainsi respectivement A/B/C/Fusion/Suppression (si disponibles). Cette opération sera exécutée durant la fusion. Cela dépend de l'élément et du mode de fusion dans lequel vous êtes. Le mode de fusion est un des modes qui suit  </para>
+<itemizedlist>
+     <listitem
+><para
+>Fusion à trois dossiers ("A" est considéré comme la base des deux autres).</para
+></listitem>
+     <listitem
+><para
+>Fusion de deux dossiers.</para
+></listitem>
+     <listitem
+><para
+>Deux dossiers en mode synchronisé (activé via l'option "Synchroniser les dossiers").</para
+></listitem>
+</itemizedlist>
+<para
+>Dans le cas d'une fusion à trois dossiers l'opération proposée sera : Si pour un élément ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... les trois dossiers sont égaux : Copie depuis C</para
+></listitem>
+     <listitem
+><para
+>... A et C sont égaux mais B ne l'est pas : Copier depuis B (ou si B n'existe pas, supprimer la destination si elle existe)</para
+></listitem>
+     <listitem
+><para
+>... A et B sont égaux mais C ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)</para
+></listitem>
+     <listitem
+><para
+>... B et C sont égaux mais A ne l'est pas : Copier depuis C (ou si C n'existe pas, supprimer la destination si elle existe)</para
+></listitem>
+     <listitem
+><para
+>... seul A existe : Supprimer la destination (si elle existe)</para
+></listitem>
+     <listitem
+><para
+>... seul B existe : Copier depuis B</para
+></listitem>
+     <listitem
+><para
+>... seul C existe : Copier depuis C</para
+></listitem>
+     <listitem
+><para
+>... A, B et C ne sont pas égaux : Fusion</para
+></listitem>
+     <listitem
+><para
+>... A, B et C n'ont pas le m me type de fichier (par exemple A est un dossier, B un fichier : "Erreur : Conflit de types de fichiers". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer.</para
+></listitem>
+</itemizedlist>
+<para
+>Dans la fusion à deux dossiers, l'opération proposée sera : Si pour un élément ... </para>
+<itemizedlist>
+     <listitem
+><para
+>les deux dossiers sont égaux : Copier depuis B</para
+></listitem>
+     <listitem
+><para
+>... A existe, mais pas B : Copier depuis A</para
+></listitem>
+     <listitem
+><para
+>... B existe, mais pas A : Copier depuis B</para
+></listitem>
+     <listitem
+><para
+>... A et B existent mais ne sont pas égaux : Fusion</para
+></listitem>
+     <listitem
+><para
+>... A, et B n'ont pas le même type de fichier (par exemple A est un dossier, B un fichier : "Erreur : Conflit de types de fichiers". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer.</para
+></listitem>
+</itemizedlist>
+<para
+>Le mode de synchronisation est actif si il n'y a que deux dossiers, qu'aucune destination explicite n'a été spécifiée et que l'option "Synchroniser les dossiers" est active. KDiff3 sélectionne alors une opération par défaut pour que les deux dossiers soient les m mes après-coup. Si pour un élément ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... les deux dossiers sont égaux : Rien ne sera fait.</para
+></listitem>
+     <listitem
+><para
+>... A existe, mais pas B : Copier A vers B</para
+></listitem>
+     <listitem
+><para
+>... B existe, mais pas A : Copier B vers A</para
+></listitem>
+     <listitem
+><para
+>... A et B existent, mais sont différents : Fusion et stockage du résultat dans les deux dossiers. Pour l'utilisateur le nom de fichier visible est B, mais alors KDiff3 copie aussi B vers A).</para
+></listitem>
+     <listitem
+><para
+>... A, et B n'ont pas le même type de fichier (par exemple A est un dossier, B un fichier : "Erreur : Conflit de types de fichiers". Tant que des éléments comme ceux-ci existent la fusion de dossiers ne peut pas commencer.</para
+></listitem>
+</itemizedlist>
+<para
+>Quand deux dossiers sont fusionnés et que l'option "Copier le plus récent à la place de fusionner" est sélectionnée, alors KDiff3 regardera les dates et proposera de choisir le fichier le plus récent. Si les fichiers ne sont pas égaux mais ont les mêmes dates alors l'opération contiendra "Erreur : Les dates sont les mêmes mais les fichiers ne le sont pas". Tant que des éléments comme ceux-ci existent la fusion ne pourra pas commencer. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>La colonne d'état</title>
+<para
+>Durant la fusion, les fichiers seront traités les uns après les autres. La colonne d'état affichera "Terminé" pour les éléments où l'opération de fusion s'est bien déroulée, et d'autres textes si une chose non attendue est arrivée. Quand une fusion est terminée, vous devriez faire une dernière vérification pour voir si l'état de tous les éléments est correct. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Colonne de statistiques</title>
+<para
+>Quand le mode de comparaison de fichiers "Analyse complète" est activé dans les options, alors KDiff3 affichera des colonnes contenant le nombres de conflits non résolus, résolus et conflits d'espacement ou non. (La colonne résolu s'affichera seulement lors de la comparaison ou fusion de trois dossiers). </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Faire une fusion</title>
+<para
+>Vous pouvez soit fusionner l'élément sélectionné actuellement (fichier ou dossier), out tous les éléments. Quand vous aurez fait tous les choix (aussi dans les sous-dossiers) alors vous pourrez démarrer la fusion. </para
+><para
+>Soyez conscient que si vous ne spécifiez pas de dossier de destination explicitement, alors la destination sera "C" dans le mode de fusion a trois dossiers, "B" dans le mode de fusion à deux dossiers, et dans le mode synchronisé, ce sera "A" ou/et "B" </para
+><para
+>Si vous avez spécifié un dossier de destination vérifiez aussi que tous éléments devant être à la sortie, sont dans l'arborescence. Il y a quelques options qui font que certains éléments sont oubliés de la comparaison et la fusion de dossiers. Vérifiez ces options pour éviter des mauvaises surprises : </para>
+<itemizedlist>
+     <listitem
+><para
+>"Dossiers récursifs" : Si cette option est désactivée, alors les éléments contenus dans les sous-dossiers ne seront pas trouvés.</para
+></listitem>
+     <listitem
+><para
+>"Modèle"/"Anti-modèle" : Inclure/exclure les éléments qui correspondent</para
+></listitem>
+     <listitem
+><para
+>"Exclure les fichiers cachés"</para
+></listitem>
+     <listitem
+><para
+>"Ne lister que les différences" : Les fichiers qui sont identiques dans tous les dossiers n'apparaîtront pas dans l'arborescence, ni dans le dossier de destination.</para
+></listitem>
+</itemizedlist>
+<para
+>(Dans la version actuelle, vous devez rescanner via "Dossier"/"Rescan" vous même après avoir changé les options affectant le scan de dossiers). </para
+><para
+>Si vous êtes satisfaits ici, le reste et simple. </para
+><para
+>Pour fusionner tous les éléments : Sélectionnez "Démarrer/Continuer la fusion de dossiers" dans le menu "Dossier" ou appuyez sur la touche F7 (qui est le raccourci). Pour fusionner seulement l'élément actuel : Sélectionnez "Lancer l'opération pour l'élément actuel" ou appuyez sur F6. </para
+><para
+>Si à cause de conflits de type de fichiers certains éléments portant des opérations non valables existent, alors un boîte de dialogue apparaîtra et certains de ces éléments seront pointés, pour que vous puissiez sélectionner une opération valable </para
+><para
+>Si vous fusionnez tous les éléments, une fenêtre apparaîtra vous proposant de "Le faire", "Le simuler" ou "Annuler". </para>
+<itemizedlist>
+     <listitem
+><para
+>Sélectionnez "Le simuler" si vous voulez voir comment cela serait sans le faire réellement. Une liste de toutes les opérations sera affichée.</para
+></listitem>
+     <listitem
+><para
+>Sinon sélectionnez "Le faire" pour démarrer réellement la fusion.</para
+></listitem>
+</itemizedlist>
+<para
+>Alors KDiff3 lancera l'opération spécifiée pour tous les éléments. Si une interaction manuelle est nécessaire (fusion d'un seul fichier), alors une fenêtre de fusion s'ouvrira (<link linkend="dirmergebigscreenshot"
+>voir la grosse capture d'écran</link
+>). </para
+><para
+>Quand vous en aurez terminé avec un fichier, sélectionnez de nouveau "Démarrer/Continuer la fusion de dossiers" ou utilisez la touche F7. SI vous n'avez pas encore enregistré les résultats, une fenêtre vous le proposera. Alors KDiff3 continuera avec l'élément suivant. </para
+><para
+>Quand KDIff3 rencontre une erreur, il vous en informe et affiche l'information détaillée de l'état. Au bas de cette liste, il y aura quelques messages d'erreur qui vous aideront à comprendre la cause du problème. Quand vous continuerez la fusion, KDiff3 vous proposera de réessayer ou de sauter l'élément qui à causé le problème. Cela signifie qu'avant de continuer vous pouvez choisir une autre opération ou résoudre le problèmes par d'autres moyens. </para
+><para
+>Quand la fusion est complète, alors KDiff3 vous informera via une boîte de dialogue. </para
+><para
+>Si certains éléments ont été fusionnés individuellement, KDiff3 s'en rappellera (tant que la session de fusion continue), et ne fusionne pas ces éléments de nouveau plus tard quand la fusion de tous les éléments est lancée. Même si la fusion a été sautée ou si rien n'a été enregistré ces éléments sont comptés comme complétés. La fusion ne sera refaite que si vous changez l'opération de fusion de l'élément. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Options pour la comparaison et la fusion de dossiers</title>
+<para
+>Les options de Kdiff3 (menu "Configuration"/"Configurer KDiff3...") ont maintenant une section appelée "Fusion de dossiers" contenant ces options : </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Dossiers récursifs :</emphasis
+></term
+><listitem
+><para
+>Sélectionner si il faut rechercher les dossiers récursivement.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Modèle(s) de fichier :</emphasis
+></term
+><listitem
+><para
+>Seuls les fichiers qui correspondent à un modèle ici seront mis dans l'arborescence. Plus d'un modèle peut être spécifié en utilisant le point-virgule ";" comme séparateur. Les jokers valables sont '*' et '?' (par exemple pour "*.cpp;*.h". L'option par défaut est "*". Les dossiers ne seront pas reconnus par ce modèle.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-modèle(s) :</emphasis
+></term
+><listitem
+><para
+>Les fichiers et dossiers correspondants à cette règle seront exclus de l'arborescence. Plus d'un modèle peut être spécifié ici en utilisant le point-virgule ";" comme séparateur. Les jokers valides sont : '*' et '?'. Le modèle par défaut est "*.orig;*.o".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorer comme CVS :</emphasis
+></term
+><listitem
+><para
+>Ignorer les fichiers et dossiers qui seraient aussi ignorés par CVS. Beaucoup de fichiers générés automatiquement sont ignorés par CVS. Le gros avantage est que cela peut être spécifique à un dossier via un fichier local ".cvsignore". (Reportez-vous à <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Trouver les fichiers et dossiers cachés :</emphasis
+></term
+><listitem
+><para
+>Sur certains systèmes de fichiers les fichiers ont un attribut "Caché". Sur d'autres un nom de fichier commençant par un point "." le cache. Cette option vous permet de décider si il faut inclure ces fichiers dans l'arborescence ou non. Option activée par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Suivre les liens vers les fichiers :</emphasis
+></term
+><listitem
+><para
+>Pour les liens vers les fichiers : Quand cette option est désactivée, alors les liens symboliques sont comparés. Quand elle est activée, alors ce sont les fichiers situé derrière les liens qui sont comparés. Désactivée par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Suivre les liens vers les dossiers :</emphasis
+></term
+><listitem
+><para
+>Pour les liens vers les dossiers : Quand désactivé, alors les liens symboliques seront comparés. Quand activée alors le lien sera traité comme un dossier et sera scanné récursivement. (Notez que le programme ne vérifie pas si le lien est "récursif". Si par exemple un dossier contenait un lien vers lui-même, cela causerait une boucle infinie, et après quelque temps il y aurait dépassement de tampon ou toute la mémoire serait utilisée, crashant le programme.</para
+></listitem
+></varlistentry
+>   
+   <varlistentry
+><term
+><emphasis
+>Ne lister que les différences :</emphasis
+></term
+><listitem
+><para
+>Seuls les éléments qui ne sont pas égaux dans tous les dossiers seront listés et seuls les fichiers changés seront visibles. Ici les fichiers étant égaux dans tous les dossiers ne seront pas copiés durant une fusion, vous pouvez oublier quelques fichiers après. (Cette option a de fortes chances d'être changée dans une prochaine version). Désactivée par défaut.</para
+></listitem
+></varlistentry>
+
+   <varlistentry
+><term
+><emphasis
+>Mode de comparaison des fichiers :</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Comparaison binaire</emphasis
+></term
+><listitem
+><para
+>C'est le mode de comparaison de fichiers par défaut. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Analyse complète</emphasis
+></term
+><listitem
+><para
+>Faire une analyse complète de chaque fichier et afficher la colonne d'informations statistiques. (Nombre de conflits résolus, non résolus, d'espacement ou non). L'analyse complète est plus lente qu'une simple analyse binaire, et plus lente quand utilisée sur des fichiers ne contenant pas du texte. (Spécifiez les anti-modèles de fichiers appropriés). </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Croire la date de modification :</emphasis
+></term
+><listitem
+><para
+>Si vous comparez des gros dossiers sur un réseau lent, cela peut être plus rapide de ne comparer que les dates de modification et les longueurs des fichiers. Mais cette augmentation de vitesse comporte néanmoins un petit doute. Utilisez cette option avec précaution. Désactivée par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Croire la taille :</emphasis
+></term
+><listitem
+><para
+>Identique à croire la date de modification. Pas de réelle comparaison, les deux fichiers sont considérés comme égaux si leur tailles sont égales. C'est utile lorsqu'une opération de copie ne conserve pas la date de modification. Utilisez cette option avec précaution. Désactivé par défaut.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Synchroniser des dossiers :</emphasis
+></term
+><listitem
+><para
+>Active le "Mode synchroniser" quand deux dossiers sont comparés et qu'il n'y a pas de dossier de destination explicitement spécifié. Dans ce mode les opérations proposées seront choisies pour que les deux dossier sources soient égaux après coup. Aussi le résultat de la fusion sera écrit dans les deux dossiers. Désactivé par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copier le plus récent au lieu de fusionner :</emphasis
+></term
+><listitem
+><para
+>Au lieu de fusionner l'opération proposée sera copier la source la plus récente si des changements ont eu lieu. (Considéré comme peu sur, car cela implique la connaissance que l'autre fichier n'a pas été édité. Vérifiez le pour vous assurez dans tous les cas). Désactivé par défaut.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Fichiers de sauvegarde :</emphasis
+></term
+><listitem
+><para
+>Si un fichier ou un dossier complet est remplacé par un autre ou est supprimé alors la version originale sera renommée avec une extension ".orig". Si un ancien fichier de sauvegarde portant l'extension ".orig" existe toujours alors il sera supprimé sans sauvegarde. Cela affecte aussi la fusion de simples fichiers, pas seulement le mode de fusion de dossiers. Activé par défaut.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Autres fonctions</title>
+<sect2
+><title
+>Mode plein écran/écran partagé</title>
+<para
+>Habituellement la vue de la liste de fusion de dossiers reste visible quand un fichier simple est comparé ou fusionné. Avec la souris vous pouvez déplacer la barre de séparation qui sépare la liste de fichiers de la fenêtre de comparaison. Si vous ne voulez pas faire cela, vous pouvez désactiver "Scinder la fenêtre" Dans le menu "Dossier". vous pouvez aussi utiliser "Basculer la vue" dans le menu "Dossier" pour basculer entre la liste de fichiers et la fenêtre de comparaison qui occupait tout l'écran. </para>
+</sect2>
+<sect2
+><title
+>Comparer ou Fusionner un simple fichier</title>
+<para
+>Probablement vous préférerez un simple double clic sur un fichier pour le comparer. Néanmoins il existe aussi une entrée dans le menu "Dossier". vous pouvez aussi fusionner directement un simple fichier, sans lancer la fusion de dossiers via "Fusionner un simple fichier" dans le menu "Dossier". A l'enregistrement des résultats l'état sera validé, et le fichier ne sera plus fusionné si une fusion de dossiers est démarrée. </para
+><para
+>Mais notez que l'information de l'état sera perdue lorsque vous relancerez un scan de dossier via : "Dossier"/"Rescanner" </para>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Sujets divers</title>
+<sect1 id="networktransparency">
+<title
+>Transparence réseau via KIO</title>
+<sect2
+><title
+>KIO-Slaves</title>
+<para
+>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. </para
+><para
+>Exemple : </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.faraway.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hacker/archive.tar.gz/dos /dos
+</screen>
+</para>
+<para
+>La première ligne compare un fichier local avec un fichier sur un serveur FTP. La seconde compare un dossier contenu dans une archive compressée a un dossier local. </para
+><para
+>Les autres KIOslaves intéressants sont : </para>
+<itemizedlist>
+<listitem
+><para
+>Fichiers depuis le WWW (http:),</para
+></listitem>
+<listitem
+><para
+>Fichiers depuis un FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Transfert de fichier crypté (fish;, sftp;),</para
+></listitem>
+<listitem
+><para
+>Ressources Windows (smb:),</para
+></listitem>
+<listitem
+><para
+>Fichiers locaux (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>D'autres choses sont possibles, mais probablement moins utiles sont : </para>
+<itemizedlist>
+<listitem
+><para
+>Pages man (man:),</para
+></listitem>
+<listitem
+><para
+>Pages info (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Comment écrire des URLs</title>
+<para
+>Une URL a une syntaxe différence par rapport aux chemins pour les fichiers et dossiers locaux. Certains éléments doivent être considérés : </para>
+<itemizedlist>
+<listitem
+><para
+>Un chemin peut être relatif et contenir "." ou "..". Ce n'est pas possible pour les URL qui sont toujours absolues. </para
+></listitem
+><listitem
+><para
+>Les caractères spéciaux doivent être écrits avec des espaces ("#"->"%23", espace
+>"%20", etc). Par exemple un fichier nommé "#foo#" aura l'URL "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>Quand les URLs ne fonctionnent pas comme attendu, essayez de les ouvrir tout d'abord avec Konqueror. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Possibilités des KIO-Slaves</title>
+<para
+>La transparence réseau à un inconvénient : Toutes les ressources n'ont les mêmes possibilités. </para
+><para
+>Parfois ceci est dû au système de fichiers du serveur, parfois au protocole. Voici une liste de restrictions : </para>
+<itemizedlist>
+<listitem
+><para
+>Parfois il n'y a pas de support des liens. </para
+></listitem
+><listitem
+><para
+>Ou il n'y a pas moyen de distinguer si un lien pointe vers un fichier ou un dossier ; on estime que c'est toujours un fichier.(ftp :, sftp :). </para
+></listitem
+><listitem
+><para
+>Ne peut pas toujours déterminer la taille des fichiers. </para
+></listitem
+><listitem
+><para
+>Support limité des permissions. </para
+></listitem
+><listitem
+><para
+>Il est impossible de modifier les permissions ou la date de dernière modification, les permissions ou la date de dernière modification d'une copie diffèrent donc de l'original. (Voir l'option "Croire la taille"). (Modifier les permissions ou la date de dernière modification n'est possible que pour les fichiers locaux). </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Utiliser &kdiff3; en tant que KPart</title>
+<para
+>&kdiff3; fait partie de KPart. Actuellement il implémente l'interface KParts::ReadOnlyPart. </para
+><para
+>Son utilisation principale est en tant que visionneur de différences pour KDevelop. KDevelop démarre tout le temps par le visionneur de différences interne. Pour invoquer KDiff3, faites un clic droit sur le visionneur de différences et sélectionnez "Afficher dans KDiff3Part" depuis le menu contextuel. </para
+><para
+>KDiff3 a normalement besoin de deux fichiers complets en entrée. Quand utilisé dans KPart, KDiff3 estimera que le fichier en entrée est un fichier patch dans le format unifié. KDiff3 retrouvera alors les noms de fichiers originaux depuis le patch. Au moins un des deux fichiers doit être disponible. Kdiff3 invoquera alors <command
+>patch</command
+> pour recréer le second fichier. </para
+><para
+>Dans Konqueror, vous pouvez sélectionner un fichier patch et sélectionner "Aperçu dans"-"KDiff3Part" depuis le menu contextuel. Soyez conscient que cela ne fonctionnera pas si aucun des fichiers originaux n'est disponible, et que ce n'est pas fiable si les fichiers originaux ont changé depuis que le patch a été généré. </para
+><para
+>Quand lancé à l'intérieur de KPart, KDiff3 ne propose qu'une comparaison à deux fichiers, une barre d'outils et un menu très petits. La fusion et la comparaison de dossiers n'est donc pas gérée. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Foire Aux Questions</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Pourquoi l'appeler "KDiff3" ? </para
+></question
+><answer
+><para
+>Des outils nommés "KDiff" et "KDiff2" (désormais appelé "Kompare") existent déjà. "KDiff3" suggère aussi qu'il peut fusionner comme l'outil "diff3" dans la collection des Outils Diff. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Pourquoi le logiciel est-il sous licence GPL ? </para
+></question
+><answer
+><para
+>J'utilise les programmes GPL depuis très longtemps désormais et j'ai appris beaucoup de choses en jetant un oeil aux sources. Voici mon "Merci" à tous les programmeurs qui ont aussi ou qui feront aussi de même. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Certains boutons ou fonctions sont manquantes. Quel est le problème ? </para
+></question
+><answer
+><para
+>Vous avez compilé depuis la source mais vous n'avez probablement pas spécifier le bon préfixe de KDE lors de la configuration. Par défaut configure veut installer dans /usr/local mais dans ce cas KDE ne peut trouver le fichier de ressource de l'interface utilisateur (c.é.d. kdiff3ui.rc). Le fichier README contient plus d'informations à propos du préfixe correct. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Souvent les lignes similaires mais non identiques apparaissent côte à côte mais parfois pas. Pourquoi ? </para
+></question
+><answer
+><para
+>Les lignes ou seules les quantités d'espaces sont différentes sont traitées comme "égales", tandis qu'une différence d'un caractère seulement peut changer l'état des lignes en "différentes". Si des lignes similaires apparaissent côte à côte, c'est actuellement une coïncidence mais heureusement c'est souvent le cas. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Pourquoi tous les conflits doivent-ils être résolus avant que le résultat de la fusion puisse être enregistré ? </para
+></question
+><answer
+><para
+>Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de la fusion se souvient ou elle commence ou se termine. Cela est nécessaire pour que les conflits puissent être résolus manuellement en sélectionnant simplement le bouton de source (A, B ou C). Cette information sera perdue quand vous enregistrerez un texte et c'est trop compliqué de créer un format de fichier spécial supportant l'enregistrement et la restauration de toutes les informations nécessaires. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Pourquoi l'éditeur dans la fenêtre de résultat n'a pas de fonction "annuler" ? </para
+></question
+><answer
+><para
+>C'était très compliqué jusqu'à présent. Vous pouvez toujours restaurer une version depuis une source (A, B ou C) en cliquant sur le bouton respectif. Pour une édition importante, l'utilisation d'un autre éditeur comme Kwrite est recommandée. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Quand j'ai supprimé du texte, soudainement, "&lt;Pas de ligne de la source&gt;" est apparu et ne peut être supprimé. Qu'est-ce que cela signifie et comment supprimer cela ? </para
+></question
+><answer
+><para
+>Pour chaque section égale ou différente, l'éditeur dans la fenêtre de résultat de fusion se souvient, de son début et de sa fin. "&lt;Pas de ligne de la source&gt;" signifie qu'il n'y a plus rien dans une section, même plus de caractère de nouvelle ligne. Cela peut apparaître soit lors de la fusion automatique ou lors de l'édition. Ce n'est pas un problème, étant donné que cela n'apparaîtra pas dans le fichier enregistré. Si vous voulez que la source originale réapparaisse, sélectionnez juste la section (un clic sur la colonne de résumé de gauche) et cliquez alors le bouton de source avec le contenu nécessaire (A/B ou C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Pourquoi KDiff3 ne supporte-t-il pas le surlignement des syntaxes ? </para
+></question
+><answer
+><para
+>KDiff3 utilise déjà beaucoup de couleurs pour le surlignement des différences. Plus de surlignement amènerait de la confusion. Utilisez un autre éditeur pour cela. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Il y a beaucoup d'informations ici, mais votre question ne trouve toujours pas de réponse ? </para
+></question
+><answer
+><para
+>Veuillez m'envoyer vos questions. J'apprécie chaque commentaire. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Remerciements et licence</title>
+
+<para
+>&kdiff3; - Outil de Comparaison et de Fusion de Fichiers et Dossier </para>
+<para
+>Programme protégé par copyright 2002-2004 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Beaucoup de bonnes idées et de rapports de bogue viennent de collègues et de beaucoup d'inconnus du Web. Merci ! </para>
+
+<para
+>Documentation Copyright &copy; 2002-2004 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+<para
+>&traducteurSimonDepiets;</para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installation</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Comment obtenir &kdiff3;</title>
+
+<para
+>Vous pouvez télécharger la dernière version de KDiff3 depuis sa page web <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>KDiff3 est aussi disponibles sur d'autres plates-formes. Veuillez vous reporter à la page web pour plus de détails. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Configuration minimale</title>
+
+<para
+>Pour utiliser avec succès toutes les fonctionnalités de &kdiff3;, vous aurez besoin de &kde; 
+>3.1. </para
+><para
+>Pour plus d'informations sur le lancement de KDiff3 sur d'autres plates-formes sans KDE, veuillez vous reportez à la <ulink url="http://kdiff3.sourceforge.net"
+>page web</ulink
+>. </para
+><para
+>Vous pouvez trouver une liste des changements sur<ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> ou dans le fichier "ChangeLog" de la source. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Compilation et Installation</title>
+
+<para
+>Pour compiler et installer &kdiff3; sur un système avec KDE, saisissez ce qui suit dans le dossier de base de votre dossier de &kdiff3; :</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>dos-kde</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>dos-kde</replaceable
+> spécifie le dossier contenant KDE sur votre système. Si vous ne connaissez pas celui-ci, lisez le fichier README pour les détails. </para>
+<para
+>Étant donné que &kdiff3; utilise <command
+>autoconf</command
+> et <command
+>automake</command
+> vous ne devriez pas avoir de problèmes à les compiler. Si vous rencontriez des problèmes, veuillez les reporter aux listes de diffusion &kde;.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/fr/iteminfo.png b/doc/fr/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/fr/iteminfo.png
diff --git a/doc/fr/letter_by_letter.png b/doc/fr/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/fr/letter_by_letter.png
diff --git a/doc/fr/merge_current.png b/doc/fr/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/fr/merge_current.png
diff --git a/doc/fr/new.png b/doc/fr/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/fr/new.png
diff --git a/doc/fr/open_dialog.png b/doc/fr/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/fr/open_dialog.png
diff --git a/doc/fr/screenshot_diff.png b/doc/fr/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/fr/screenshot_diff.png
diff --git a/doc/fr/screenshot_merge.png b/doc/fr/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/fr/screenshot_merge.png
diff --git a/doc/fr/triple_diff.png b/doc/fr/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/fr/triple_diff.png
diff --git a/doc/fr/white_space.png b/doc/fr/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/fr/white_space.png
diff --git a/doc/it/Makefile.am b/doc/it/Makefile.am
new file mode 100644
index 0000000..e235de1
--- /dev/null
+++ b/doc/it/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = it
+
+
diff --git a/doc/it/dirbrowser.png b/doc/it/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/it/dirbrowser.png
diff --git a/doc/it/dirmergebig.png b/doc/it/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/it/dirmergebig.png
diff --git a/doc/it/index.docbook b/doc/it/index.docbook
new file mode 100644
index 0000000..11d4b21
--- /dev/null
+++ b/doc/it/index.docbook
@@ -0,0 +1,2442 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "kdeextragear-1">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Italian "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>Manuale di &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+</authorgroup>
+
+<othercredit role="translator"
+><firstname
+>Stelvio</firstname
+><surname
+>Rosset</surname
+><affiliation
+><address
+><email
+>srosset@satelgroup.net</email
+></address
+></affiliation
+><contrib
+>Traduzione della documentazione -2004</contrib
+></othercredit
+> <othercredit role="translator"
+><firstname
+>Andrea</firstname
+><surname
+>Celli</surname
+><affiliation
+><address
+><email
+>a.celli@caltanet.it</email
+></address
+></affiliation
+><contrib
+>Aggiornamento e revisione della traduzione - 2005</contrib
+></othercredit
+>  
+
+<copyright>
+<year
+>2002-2005</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2005-01-30</date>
+<releaseinfo
+>0.9.87</releaseinfo>
+
+
+<abstract>
+<para
+></para>
+<para
+>&kdiff3; è uno strumento per verificare differenze ed eseguire fusioni tra file e directory, il quale <itemizedlist>
+<listitem
+><para
+>confronta e fonde due o tre file di testo o directory in ingresso, </para
+></listitem>
+<listitem
+><para
+>mostra le loro differenze riga per riga o carattere per carattere(!), </para
+></listitem>
+<listitem
+><para
+>fornisce semplici automatismi per fonderli,</para
+></listitem>
+<listitem
+><para
+>possiede un editor per la risoluzione dei conflitti di fusione,</para
+></listitem>
+<listitem
+><para
+>rende trasparente la rete con l'uso di KIO,</para
+></listitem>
+<listitem
+><para
+>permette di nascondere o mostrare le differenze costituite da spazi bianchi o commenti,</para
+></listitem>
+<listitem
+><para
+>supporta l'Unicode, UTF-8 e altre codifiche.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Questo documento descrive la versione 0.9.87 di KDiff3. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>merge</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>triplediff</keyword>
+<keyword
+>compare</keyword>
+<keyword
+>file</keyword>
+<keyword
+>directory</keyword>
+<keyword
+>controllo versione</keyword>
+<keyword
+>three-way-merge</keyword>
+<keyword
+>in-line-differences</keyword>
+<keyword
+>synchronise</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>networktransparent</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>spazio bianco</keyword>
+<keyword
+>commenti</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Introduzione</title>
+<sect1 id="why"
+><title
+>Un'altra interfaccia per confrontare file?</title>
+<para
+>Per la comparazione dei file esistono numerosi strumenti grafici. Perché dovresti scegliere KDiff3? Lascia che ti spieghi perché l'ho scritto. </para
+><para
+>KDiff3 è nato perché dovevo eseguire una difficile fusione tra file. La fusione è necessaria quando molte persone, in un progetto, lavorano sugli stessi file. La fusione può essere piuttosto automatica, quando gli strumenti di fusione non solo permettono la modifica dei nuovi file ("rami") ma anche del file originale ("base"). Lo strumento per la fusione sceglierà automaticamente solo le modifiche eseguite all'interno di un ramo. Quando più persone cambiano le stesse righe, allora lo strumento di fusione trova un conflitto che dovrà essere risolto manualmente. </para
+><para
+>In quel caso la fusione era difficile in quanto uno aveva cambiato molte cose e corretto l'indentazione in molti punti. Inoltre, un altro aveva variato molto testo in alcuni file, dando luogo a molti conflitti durante l'operazione di fusione. </para
+><para
+>Lo strumento che utilizzai mostrava solamente le righe variate, ma non cosa era cambiato all'interno di esse. Inoltre non c'era nessuna informazione riguardo la variazione di indentazione. La fusione era un piccolo incubo. </para
+><para
+>Così fu l'inizio. La prima versione poteva mostrare le differenze all'interno di una riga e la differenza degli spazi bianchi. Successivamente molte altre caratteristiche furono introdotte per aumentarne l'utilità. </para
+><para
+>Per esempio, se vuoi comparare velocemente alcuni testi, è possibile copiarne il contenuto negli appunti e quindi incollarlo in una finestra di KDiff3. </para
+><para
+>Una caratteristica che ha richiesto un grosso sforzo è stata la comparazione tra directory e la funzione di fusione, le quali hanno trasformato il programma in un vero e proprio navigatore di file. </para
+><para
+>Spero che KDiff3 sia utile anche a te. Divertiti! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Schermate e caratteristiche</title>
+<para
+>Questa schermata mostra la differenza tra due file di testo</para>
+<para
+>(Usando una versione recente di KDiff3):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>È supportata la fusione di tre file. Questa è particolarmente utile se due persone variano indipendentemente il codice. Il file originale (il file base) è utilizzato per aiutare KDiff3 a selezionare automaticamente i cambiamenti da salvare. Sotto le finestre che evidenziano le differenze una finestra di modifica ti permetterà di risolvere i conflitti riscontrati, mostrandone il risultato ottenuto. Potrai inoltre modificare il risultato delle operazioni. Questa schermata mostra il risultato della fusione di tre file in ingresso: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>KDiff3 aiuta anche a comparare e fondere intere directory. Questa schermata mostra KDiff3 durante una fusione di directory: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Altre caratteristiche</title>
+<sect2
+><title
+>Indicazione delle differenze per riga e per carattere</title>
+<para
+>Sfruttando le possibilità dei monitor grafici a colori, KDiff3 evidenzia accuratamente quali sono le differenze. Quando avrai la necessità di fare molte revisioni di codice, apprezzerai questo aiuto. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Vedere le differenze di spazi bianchi a colpo d'occhio</title>
+<para
+>Saranno visibili spazi e tabulatori che risultano diversi. Quando le righe differiscono solamente di uno spazio bianco questo potrà essere subito visibile nella colonna di sommario posizionata sul lato sinistro. Non dovrai più preoccuparti quando qualcuno cambia l'indentazione! </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Confronto tra tre file</title>
+<para
+>Analizza tre file e verifica dove differiscono. </para
+><para
+>Le finestre sinistra/centrale/destra si chiamano A/B/C ed hanno rispettivamente il colore /blu/verde/magenta. </para
+><para
+>Se per una riga due file sono uguali ed un altro è diverso, il colore mostrerà quello diverso. Il colore rosso significa che tutti i file sono diversi. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Comoda fusione di due o tre file di input</title>
+<para
+>KDiff3 può essere usato per fondere due o tre file di ingresso ed automaticamente fonde quanto è possibile. Il risultato è presentato in una finestra di modifica dove molti conflitti possono essere risolti con un semplice clic del mouse: Selezionando i pulsanti A/B/C dalla barra si seleziona la sorgente che deve essere utilizzata. È possibile selezionare più di un file sorgente. Dato che questa finestra è un editor anche i conflitti che hanno bisogno di ulteriori correzioni possono essere qui risolti senza bisogno di un altro strumento. </para>
+</sect2>
+
+<sect2
+><title
+>Inoltre ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Pulsanti per la navigazione veloce.</para
+></listitem>
+   <listitem
+><para
+>Un clic del mouse nella colonna di sommario sincronizzerà tutte le finestre per mostrare la stessa posizione.</para
+></listitem>
+   <listitem
+><para
+>Seleziona e copia da una qualsiasi finestra ed incolla nella finestra del risultato della fusione.</para
+></listitem>
+   <listitem
+><para
+>Colonna riassuntiva, che mostra dove sono i cambiamenti ed i conflitti.</para
+></listitem>
+   <listitem
+><para
+>È possibile modificare i colori secondo le tue preferenze personali.</para
+></listitem>
+   <listitem
+><para
+>Dimensione della tabulazione modificabile.</para
+></listitem>
+   <listitem
+><para
+>Opzione per inserire spazi invece che tabulatori.</para
+></listitem>
+   <listitem
+><para
+>È possibile aprire i file comodamente dalla finestra di dialogo oppure specificandoli sulla riga di comando.</para
+></listitem>
+   <listitem
+><para
+>Ricerca stringhe in tutto il testo della finestra. Trova (Ctrl-F) e Trova Successivo (F3)</para
+></listitem>
+   <listitem
+><para
+>Mostra il numero di riga per ogni riga. </para
+></listitem>
+   <listitem
+><para
+>Incolla dagli appunti o trascina il testo nella finestra di KDiff3.</para
+></listitem>
+   <listitem
+><para
+>Trasparenza di rete tramite KIO.</para
+></listitem>
+   <listitem
+><para
+>Può essere utilizzato come visualizzatore delle differenze in Kdevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Accapo per righe lunghe.</para
+></listitem>
+   <listitem
+><para
+>Supporto per l'Unicode, UTF-8 e altri codec.</para
+></listitem>
+   <listitem
+><para
+>Supporto per le lingue scritte da destra a sinistra.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Confronto e fusione tra file</title>
+
+<sect1 id="commandline"
+><title
+>Opzioni della riga di comando</title>
+
+<sect2
+><title
+>Confronta 2 file: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>file1 file2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fondi 2 file: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>file1 file2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>file1 file2</replaceable
+> -o <replaceable
+>outputfile</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Confronta 3 file: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>file1 file2 file3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Fondi 3 file: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>file1 file2 file3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>file1 file2 file3</replaceable
+> -o <replaceable
+>outputfile</replaceable
+>
+</screen>
+<para
+>Da notare che <replaceable
+>file1</replaceable
+> potrebbe essere trattato come base di <replaceable
+>file2</replaceable
+> e <replaceable
+>file3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Caso particolare: File con lo stesso nome </title>
+<para
+>Se tutti i file hanno lo stesso nome ma si trovano in directory diverse, è possibile specificare solamente il nome del primo file. Es.: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dir1/filename dir2 dir3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Riga di comando per avviare il confronto e la fusione tra directory: </title>
+<para
+>Non cambia molto, ma ora lavoriamo su delle directory.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dir1 dir2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dir1 dir2</replaceable
+> -o <replaceable
+>destdir</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dir1 dir2 dir3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dir1 dir2 dir3</replaceable
+> -o <replaceable
+>destdir</replaceable
+>
+</screen>
+<para
+>Per maggiori informazioni su confronto e fusione tra directory leggi <link linkend="dirmerge"
+>qui</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Per maggiori informazioni sulle opzioni della riga di comando usa: </title>
+<screen
+><command
+>kdiff3</command
+> --help
+Opzioni:
+  -m, --merge               Fondi l'input.
+  -b, --base file           Fissa il file di base. Per compatibilità con alcuni programmi.
+  -o, --output file           File di output. Implica -m. Es.: -o nuovofile.txt
+  --out file              File di output (Per compatibilità con alcuni programmi).
+  --auto                    Senza GUI se tutti i conflitti possono essere risolti automaticamente (richiede -o file)
+  --qall                    Non risolve i conflitti automaticamente. (Per compatibilità...)
+  --L1 alias1               Sostituzione del nome visibile per file input 1 (base).
+  --L2 alias2               Sostituzione del nome visibile per file input 2.
+  --L3 alias3               Sostituzione del nome visibile per file input 3.
+  -L, --fname alias         Sostituzione del nome visibile alternativo. Da specificare per ogni input.
+  -u                        Non ha effetti. Per compatibilità con alcuni programmi.
+</screen>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Dialogo di apertura file</title>
+<para
+>Poiché devono essere selezionati molti file, il programma ha un particolare dialogo di apertura file: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Il dialogo di apertura file permette di digitare il nome del file, di selezionare un file con il navigatore ("File...") o di scegliere i file più recenti da una lista a comparsa. Quando aprirai nuovamente il dialogo di selezione dei file vi troverai i nomi dei file in uso. Il nome del terzo file non è richiesto. Se il campo per "C" rimane vuoto, le operazioni di confronto riguarderanno solo due file. </para
+><para
+>Puoi anche selezionare una directory con "Directory...". Se per A è specificata una directory allora sarà automaticamente attivata la comparazione/fusione di directory. Se A specifica un file ma B e C o l'output specifica una directory, allora KDiff3 utilizza il nome del file di A nella directory specificata. </para
+><para
+>Se viene selezionato "Fusione", allora l'opzione "Output" diverrà modificabile. Ma non è richiesto di specificare subito il nome del file in uscita. Potrai specificarlo successivamente. </para
+><para
+>L'opzione "Configura..." apre un menu di opzioni, in modo che tu possa impostare le varie opzioni prima di avviare l'analisi. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Incolla e trascina l'input</title>
+<para
+>Molte volte vuoi comparare parti di testo che non sono un file. KDiff3 permette anche di incollare testo dagli appunti nella finestra di verifica delle differenze selezionata. L'analisi delle differenze apparirà immediatamente. Nel dialogo di selezione file non avrai la necessità di specificare i file, potrai semplicemente chiudere con l'opzione "Annulla". </para
+><para
+>È possibile utilizzare il trascinamento: prendi un file dal file manager o seleziona un testo da un editor e trascinalo dentro una finestra di verifica. </para
+><para
+>Qual è l'idea? Alcune volte un file contiene due funzioni simili, ma per controllarne il grado di similitudine sarebbe dispendioso se tu dovessi prima creare due file e quindi ricaricarli. Ora puoi semplicemente copiare, incollare e comparare la sola parte di interesse. </para
+><para
+>Nota: Attualmente non è possibile trascinare qualsiasi cosa all'interno di KDiff3. Puoi solo portare qualcosa nella finestra di verifica delle differenze. </para
+><para
+>Attenzione: Alcuni editor interpretano il trascinamento in altri programmi come operazioni di taglia (invece che copia) ed incolla. In tal caso i dati originali andrebbero quindi persi. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Capire le informazioni della finestra di ingresso</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Sopra ad ogni finestra di testo c'è una "riga informativa". Queste righe contengono una lettera "A", "B" o "C", il nome del file ed il numero della prima riga visibile nella finestra. (Nota che "C" è opzionale). Ogni riga informativa appare con colori diversi. (Se i percorsi sono troppo lunghi, è possibile muovere il mouse sulla riga informativa e un suggerimento visualizzerà l'intero nome). </para
+><para
+>Alle tre finestre di input sono assegnate le lettere "A", "B" e "C". "A" è colorata di blu, "B" di verde e "C" di rosso. Questi sono i colori predefiniti, ma puoi cambiarli dal menu delle impostazioni. </para
+><para
+>Quando si trova una differenza allora il colore mostra quale file di ingresso differisce. Quando entrambi gli altri file di input differiscono il colore utilizzato per evidenziare questo sarà il rosso ("Colore di conflitto" nelle impostazioni). Questo schema di colori è molto utile nel caso di tre file di ingresso, che discuteremo nella prossima sezione (<link linkend="merging"
+>Fusione</link
+>). </para
+><para
+>A sinistra di ogni testo è posizionata la "colonna di sommario". Se ci sono differenze su una riga, la colonna di sommario mostrerà il colore corrispondente. Nel sommario le differenze di soli spazi bianchi saranno evidenziate con una griglia. Per i linguaggi di programmazione in cui non è importante la posizione degli spazi bianchi è molto utile notare a colpo d'occhio se qualcosa di importante è stato variato. (In C/C++ lo spazio bianco è importante solamente all'interno delle stringhe, commenti, istruzioni per il preprocessore e solo in altre situazioni molto particolari). </para
+><para
+>La linea verticale che separa la colonna di sommario ed il testo è interrotta se il file di input non presenta righe in questo punto. Quando è attivato il ritorno a capo questa linea verticale apparirà punteggiata in corrispondenza delle righe che vanno a capo. </para
+><para
+>Sul lato destro, a sinistra della barra di scorrimento, è presente una colonna informativa. Essa mostra sinteticamente la colonna di sommario dell'ingresso "A". Differenze e conflitti sono visibili a colpo d'occhio. Quando vengono utilizzate solo due finestre di input, tutte le differenze appaiono in rosso, in quanto ogni differenza è un conflitto. Un rettangolo nero incornicia la parte visibile dell'input. Per file di ingresso molto lunghi, quando il numero delle righe è maggiore dell'altezza, in pixel, della colonna di sommario, molte righe di ingresso condividono un'unica riga di sommario. Un conflitto qui ha priorità sulle semplici differenze, che hanno priorità sui "non-cambiamenti". In tal modo così nessuna differenza o conflitto viene perso. Con un clic sopra questa colonna di sommario, il testo corrispondente verrà visualizzato. </para>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Operazione di fusione e la finestra di modifica del risultato</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Anche la finestra di modifica del risultato della fusione (sotto la finestra di ingresso) ha una riga informativa sovrastante che mostra "Output:", il nome del file e "[Modificato]" se qualcosa è stato variato. Normalmente essa contiene del testo creato dagli automatismi della fusione, ma spesso conterrà anche dei conflitti. </para
+><para
+>!!! Il salvataggio è disabilitato fino a quando tutti i conflitti non sono risolti !!! (Usa l'opzione "Vai al precedente/prossimo conflitto non risolto" per ricercare i conflitti rimanenti). </para
+><para
+>Se i file di ingresso sono solodue, ogni differenza è un conflitto che deve essere risolto manualmente. </para
+><para
+>Con tre file di input il primo è considerato come base, mentre il secondo ed il terzo contengono le modifiche. Quando in qualche riga solo il file B o il file C presenta una differenza, ma non entrambi, allora il file modificato sarà automaticamente selezionato. Solo quando B e C hanno delle differenze sulle stesse righe il programma si accorgerà del conflitto il quale dovrà essere risolto manualmente. Quando B e C coincidono, ma differiscono con A, allora sarà selezionato C. </para
+><para
+>La finestra di modifica del risultato di fusione ha anche una colonna di sommario sulla sinistra. Essa mostra la lettera dell'input da dove la riga è stata selezionata o nulla se tutte le tre sorgenti hanno la stessa riga. Per i conflitti essa mostra un punto interrogativo "?" e la riga mostra "&lt;Conflitto nel fondere&gt;", tutto in rosso. Dato che risolvere conflitti riga per riga richiede molto tempo, le righe sono raggruppate per gruppi con le stesse caratteristiche di differenza e conflitto. Saranno separati solo i conflitti di spazi bianchi dai conflitti di spazi non bianchi in modo da facilitare la fusione dei file in cui l'indentazione, su molte righe, cambia. </para
+><para
+>Quando si fa clic sulla colonna di sommario con il tasto sinistro del mouse in una finestra, il gruppo appartenente a quella riga sarà selezionato in tutte le finestre e la parte iniziare del gruppo sarà visualizzata. (Questo potrebbe coinvolgere un posizionamento automatico nella finestra se l'inizio del gruppo non è visibile). Questo gruppo diverrà quindi il "gruppo corrente". Esso è visualizzato con il "Colore di fondo per questo intervallo corrente" e una barra nera apparirà sul lato sinistro del testo. </para
+><para
+>I pulsanti di selezione dell'ingresso contengono le lettere "A", "B" e "C" nella barra dei pulsanti sotto la barra dei menu. Quando si fa un clic su un pulsante di selezione dell'ingresso, le righe di questo input saranno aggiunte alla fine del gruppo selezionato se questo gruppo non conteneva già tale testo. Altrimenti le righe di questo file di ingresso saranno rimosse. </para
+><para
+>Inoltre puoi modificare direttamente qualsiasi riga. La colonna di sommario mostrerà "m" su ogni riga che hai modificato. </para
+><para
+>Alcune volte, quando una riga viene rimossa dalla fusione automatica o da una modifica manuale, e non rimangono altre righe nel gruppo, allora apparirà in questa riga il messaggio &lt;Riga origine mancante&gt;. Questa posizione verrà mantenuta dal gruppo nel caso tu cambiassi idea e volessi sezionare qualche altro sorgente. Questo testo non verrà reimmesso nel file salvato o in altre selezioni che desideri copiare ed incollare. </para
+><para
+>Il testo "&lt;Fondi conflitti&gt;" apparirà negli appunti se copi ed incolli del testo contenente questa riga. Fai comunque attenzione nell'eseguire tale operazione. </para
+><para
+>La normale fusione partirà per la risoluzione automatica di semplici conflitti. Ma il menu "Fondi" permette alcune azioni per altre comuni necessità. Se devi selezionare lo stesso sorgente per molti conflitti, potrai selezionare sempre "A", "B" o "C", o solamente per i conflitti non risolti restanti, o per i conflitti di spazi bianchi non risolti. Se vuoi decidere tu stesso ogni singola differenza "Considera le differenze come conflitti". O se vuoi ritornare all'opzione automatica di KDiff3 seleziona "Risolvi automaticamente i conflitti semplici". KDiff3 riavvierà quindi la fusione. Per azioni che cambiano le tue precedenti modifiche KDiff3 ti chiederà la conferma prima di procedere. </para
+><para
+>Nota: Quando scegliendo un sorgente per conflitti non risolti di spazi bianchi e le opzioni "Ignora numeri" o "Ignora commenti C/C++" sono utilizzate allora variazioni nei numeri o nei commenti saranno anch'essi trattati come spazi bianchi. </para>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigazione e modifica</title>
+<para
+>È possibile navigare con le barre di scorrimento, con il mouse oppure con l'uso dei tasti. Se fai clic dentro una finestra potrai usare i pulsanti del cursore sinistra, destra, alto, basso, pagina successiva, pagina precedente, inizio, fine, ctrl-inizio, ctrl-fine come per gli altri programmi. La colonna descrittiva dopo la barra di scorrimento verticale del file di ingresso può anche essere utilizzata per la navigazione facendo clic su questa. </para
+><para
+>È possibile utilizzare la rotellina del mouse solo per scorrere su e giù. </para
+><para
+>Per modificare il risultato della fusione di file puoi utilizzare solamente i tasti di modifica. Puoi invertire la modalità di inserimento e sovrascrittura con il tasto insert. (la modalità di inserimento è quella predefinita). </para
+><para
+>Premendo il pulsante sinistro del mouse dentro una colonna di sommario saranno aggiornate tutte le finestre, che mostreranno l'inizio dello stesso gruppo di righe (come spiegato nella sezione <link linkend="merging"
+>"Fusione"</link
+>). </para
+><para
+>La barra dei pulsanti contiene inoltre altri pulsanti di navigazione con i quali è possibile saltare alla corrente/prima/ultima differenza, alla prossima/precedente differenza (ctrl-giù/ctrl-su), al prossimo/precedente conflitto (ctrl-pgdown/ctrl-pgup), o al prossimo/precedente conflitto non risolto. Nota che per KDiff3 un "conflitto" che non è stato automaticamente risolto all'inizio della fusione permane "conflitto"anche se risolto. Quindi la necessità di distinguere "conflitti non risolti". </para
+><para
+>C'è anche un pulsante "Vai automaticamente al prossimo conflitto non risolto dopo aver selezionato la fonte" (Avanzamento automatico). Selezionandolo quando un sorgente è selezionato, KDiff3 salterà automaticamente alla selezione del prossimo conflitto non risolto. Questo può aiutare quando scegli solamente un unico file di ingresso. Quando hai bisogno di entrambi i sorgenti, o vuoi modificare dopo la selezione, vorrai probabilmente disattivarlo. Prima di procedere al prossimo conflitto non risolto KDiff3 mostrerà l'effetto della tua scelta per un breve periodo. Questo tempo è modificabile nell'impostazione di Verifica &amp; Fusione: È possibile specificare la "Pausa nell'avanzamento automatico" in millisecondi tra 0 e 2000. Suggerimento: Stanco di troppi Clic? - Quando ci sono molti conflitti usa un tempo basso di avanzamento automatico e le scorciatoie Ctrl-1/2/3 per selezionare A/B/C. </para>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Selezione, Copia ed Incolla</title>
+<para
+>La finestre dell'ingresso non mostra un cursore, così le selezioni devono essere fatte con il mouse, fai clic con il tasto sinistro all'inizio, e, mantenendolo premuto, muoversi fino a fine selezione, dove dovrai rilasciare il tasto. Con un doppio clic è possibile selezionare una unica parola. Nella finestra del risultato è possibile selezionare anche tramite la tastiera, mantenendo il tasto "shift" e muovendosi con i tasti del cursore. </para
+><para
+>Per copiare negli appunti è necessario premere il pulsante "Copia" (Ctrl-C o Ctrl-Ins). Ma esiste anche l'opzione "Copia automatica". Se attiva, ogni volta che si seleziona del testo esso verrà copiato immediatamente e non dovrai esplicitarlo. Presta però attenzione all'utilizzo perché i contenuti degli appunti potrebbero accidentalmente essere distrutti. </para
+><para
+>"Taglia" (Ctrl-X o Shift-Delete) copia il testo selezionato negli appunti e lo elimina, mentre "Incolla" (Ctrl-V o Shift-Insert) inserisce il testo contenuto negli appunti nella posizione corrente o in sostituzione all'attuale selezione. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Salvataggio</title>
+<para
+>Il salvataggio sarà permesso solamente quando tutti i conflitti saranno risolti. Se il file esiste e l'opzione "File di copia" è abilitata allora il file esistente sarà rinominato con estensione ".orig", ma se tale file esiste sarà rimosso. All'uscita o all'avvio di un'altra analisi delle differenze se il risultato non è stato ancora salvato KDiff3 richiederà se si vuole salvare, annullare o procedere senza salvare. (KDiff3 non intercetta nessun segnale. Quindi se si esegue un "kill" di KDiff3 tutti i dati saranno persi). </para
+><para
+>I terminatori di riga sono salvati secondo il metodo tradizionale del sistema operativo. Per i sistemi Unix la riga termina con il solo carattere "\n", mentre per i sistemi Win32 ogni riga termina con i caratteri ritorno a capo + nuova riga "\r\n". KDiff3 non mantiene il terminatore originale del file, quindi non utilizzare KDiff3 con i file binari. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Ricerca Stringhe</title>
+<para
+>È possibile ricercare una stringa in ogni finestra di KDiff3. Il comando "Ricerca ..." (Ctrl-F) nel menu di Modifica apre un dialogo che permette di specificare la stringa da ricercare. È anche possibile selezionare la finestra sulla quale fare la ricerca. La ricerca partirà sempre dall'inizio. Usare il comando "Ricerca successivo" (F3) per la prossima occorrenza. Se decidi di cercare su più finestre allora la ricerca sarà dall'alto al basso nella prima finestra, poi dall'alto al basso nella seconda, ecc. </para>
+</sect1>
+
+
+<sect1 id="options"
+><title
+>Opzioni</title>
+<para
+>Le opzioni e la lista del file recenti saranno memorizzate all'uscita del programma, e ricaricate quando verrà avviato. (Menu Impostazioni->Configura KDiff3 ...) </para>
+<sect2
+><title
+>Tipo di caratteri</title>
+<para
+>Seleziona un tipo carattere a larghezza fissa. (in alcuni sistemi questo dialogo potrebbe presentare anche la selezione della larghezza del font, ma non è consigliabile usarla). </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Corsivo per le differenze:</emphasis
+></term
+><listitem
+><para
+>Selezionando questo, le differenze di testo saranno rappresentate con il tipo di carattere scelto ma in stile corsivo. Se il tipo di carattere non supporta il corsivo l'opzione non avrà effetto.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Colori</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Colore primo piano:</emphasis
+></term
+><listitem
+><para
+>Normalmente nero. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore di fondo:</emphasis
+></term
+><listitem
+><para
+>Normalmente bianco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore di fondo per le differenze:</emphasis
+></term
+><listitem
+><para
+>Normalmente grigio chiaro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore A:</emphasis
+></term
+><listitem
+><para
+>Normalmente blu scuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore B:</emphasis
+></term
+><listitem
+><para
+>Normalmente verde scuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore C:</emphasis
+></term
+><listitem
+><para
+>Normalmente magenta scuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore per i conflitti:</emphasis
+></term
+><listitem
+><para
+>Normalmente rosso.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore di sfondo per questo intervallo corrente:</emphasis
+></term
+><listitem
+><para
+>Normalmente giallo chiaro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Colore di sfondo per questo intervallo:</emphasis
+></term
+><listitem
+><para
+>Normalmente giallo scuro.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Su sistemi con soli 16 o 256 colori alcuni colori non sono disponibile nella forma originale. In tali sistemi l'opzione "Predefiniti" selezionerà un colore puro. </para>
+</sect2>
+
+<sect2
+><title
+>Impostazioni dell'editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>I Tab inseriscono spazi:</emphasis
+></term
+><listitem
+><para
+>Se questo è disabilitato e viene premuto il tasto di tabulazione, un carattere tabulatore verrà inserito, altrimenti verranno inseriti un numero appropriato di caratteri.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Dimensione di Tab:</emphasis
+></term
+><listitem
+><para
+>Può essere modificato per le tue necessità. Il predefinito è 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Rientro automatico:</emphasis
+></term
+><listitem
+><para
+>Quando premi Invio o Return verrà utilizzata, per la nuova riga, l'indentazione della riga precedente. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copia automaticamente la selezione:</emphasis
+></term
+><listitem
+><para
+>Ogni selezione è immediatamente copiata negli appunti quando attiva e non sarà necessario esplicitare la copia. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tipo di fine riga:</emphasis
+></term
+><listitem
+><para
+>Quando salvi un file puoi decidere il modo con cui vengono terminate le righe. La modalità preimpostata è quella abituale del sistema operativo in uso. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Usa la codifica locale:</emphasis
+></term
+><listitem
+><para
+>Per la visualizzazione di caratteri non ASCII. Puoi provare a cambiarla se alcuni caratteri della tua lingua non vengono visualizzati correttamente. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Impostazioni di verifica &amp; fusione</title>
+<para
+>Quando si comparano dei file, KDiff3 prima proverà a confrontare le righe che sono uguali in tutti i file di ingresso. Solo durante questa fase potrebbe ignorare gli spazi bianchi. La seconda fase confronta ogni riga. In tale fase gli spazi bianchi non saranno ignorati. Inoltre durante la fusione gli spazi bianchi non saranno ignorati. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Mantieni il ritorno a capo (CR):</emphasis
+></term
+><listitem
+><para
+>Alcuni editor (in alcuni sistemi) salvano il ritorno a capo '\r' e avanzamento riga '\n' mentre altri salvano solamente il ritorno a capo '\n'. Normalmente KDiff3 ignora il ritorno a capo, ma quando i file non hanno la stessa dimensione potrebbero comunque risultare uguali dopo una verifica parallela. Quando l'opzione è abilitata allora il ritorno a capo è reso visibile ma trattato come uno spazio bianco. Questa opzione deve essere disattivata durante la fusione. Normalmente disabilitata.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignora i numeri:</emphasis
+></term
+><listitem
+><para
+>Normalmente disabilitato. I caratteri numerici ('0'-'9','.','-') saranno ignorati nella prima parte dell'analisi nella quale viene fatta la verifica delle righe. Nel risultato delle differenze saranno tuttavia mostrate, ma sono trattate come spazi bianchi. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignora commenti C/C++:</emphasis
+></term
+><listitem
+><para
+>Normalmente disabilitato. Le variazioni nei commenti saranno trattati come variazioni degli spazi bianchi. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignora maiuscole:</emphasis
+></term
+><listitem
+><para
+>Normalmente disabilitato. I caratteri che differiscono solo per essere maiuscoli o minuscoli (come "A" e "a") saranno trattati come le variazioni nel numero di spazi bianchi. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comandi del preprocessore</emphasis
+></term
+><listitem
+><para
+>Vedi la <link linkend="preprocessors"
+>prossima sezione</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando del preprocessore per confrontare righe:</emphasis
+></term
+><listitem
+><para
+>Vedi la <link linkend="preprocessors"
+>prossima sezione</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ricerca approfondita:</emphasis
+></term
+><listitem
+><para
+>Ricerca approfondita per ricercare la più piccola differenza (Normalmente attiva). Questo sarà probabilmente utile per file complicati e lunghi. E lento per file molto lunghi. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Pausa nell'avanzamento automatico (ms):</emphasis
+></term
+><listitem
+><para
+>Quando l'opzione di auto avanzamento automatico è attiva si specifica quando lungo mostrare il risultato delle selezione prima di saltare al prossimo conflitto non risolto. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Trattamento predefinito degli spazi bianchi nel fondere 2 file:</emphasis
+></term
+><listitem
+><para
+>Automaticamente risolve tutti i conflitti di spazi bianchi scegliendo lo specifico file (Scelta manuale predefinita). Utile se lo spazio bianco non è importante in molti file. Se hai bisogno di questo solo occasionalmente è meglio usare "Scegli A/B/C per tutti i conflitti non risolti di spazio bianco" nel menu di fusione. Nota che se hai abilitato l'opzione "Ignora numeri" o "Ignora commenti C/C++" allora questa auto selezione verrà applicata anche per i conflitti nei numeri o nei commenti. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Fusione di directory </title>
+<para
+>Queste opzioni sono considerate con la scansione delle directory e la manipolazione della fusione: Vedi <link linkend="dirmergeoptions"
+>Directory Comparazione/Fusione Documentazione</link
+> per maggiori dettagli. </para
+><para
+>Tuttavia qui esiste una opzione che è anche rilevante per il salvataggio di singoli file: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>File di backup:</emphasis
+></term
+><listitem
+><para
+>Quando viene salvato un file ed esiste una versione meno recente, la versione originale sarà rinominata con l'estensione ".orig". Se già esiste una versione con estensione ".orig" questa verrà eliminata senza una copia di riserva. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Opzioni locali e per la lingua</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Lingua:</emphasis
+></term
+><listitem
+><para
+>Cambia la lingua usata per l'interfaccia utente. Le modifiche a questa opzione non hanno effetto immediato sul programma. Devi chiudere Kdiff3 e riavviarlo affinché la lingua venga cambiata. Questa opzione non è disponibile nella versione KDE di KDiff3 perché la lingua viene cambiata tramite le impostazioni globali di KDE. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Usa la stessa codifica per tutto:</emphasis
+></term
+><listitem
+><para
+>Le opzioni di codifica che seguono possono essere fissate separatamente per ogni voce o, se questa opzione è attivata, il primo valore vale per tutti. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codifica locale:</emphasis
+></term
+><listitem
+><para
+>Davanti al selettore di codec appare una nota che ti dice quale è la codifica locale. Non è modificabile, serve solo a ricordarti quale è la codifica locale nel caso che tu non lo sapessi già. tuttavia devi selezionarla. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codifica per i file A/B/C:</emphasis
+></term
+><listitem
+><para
+>Cambia la codifica dei file in ingresso. Ha effetto sulla visualizzazione dei caratteri speciali. Poiché puoi aggiustare separatamente le codifiche, potrai confrontare e fondere file prodotti con codifiche diverse. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codifica per i file fusione e salvataggio:</emphasis
+></term
+><listitem
+><para
+>Quando avrai modificato un file, potrai scegliere con quale codifica salvarlo sul disco fisso. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codifica per i file sottoposti al preprocessore:</emphasis
+></term
+><listitem
+><para
+>Quando definisci un preprocessore questo deve essere in grado di operare sulla codifica in uso. Ad esempio i tuoi file sono 16-bit-unicode e il tuo preprocessore può operare solo su file 8-bit-ascii. Con questa opzione puoi definire la codifica del risultato del preprocessore. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Lingue scritte da destra a sinistra:</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Varie</title>
+<para
+>(Queste opzioni ed azioni sono disponibile nei menu o nelle barre dei pulsanti).</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Mostra i numeri di riga:</emphasis
+></term
+><listitem
+><para
+>Puoi selezionare se, per il file di ingresso, il numero di riga deve essere visualizzato.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostra anche le differenze date da spazi e tabulatori:</emphasis
+></term
+><listitem
+><para
+>Alcune volte la visualizzazione degli spazi e dei tabulatori disturba. È possibile eliminarla.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostra spazio bianco:</emphasis
+></term
+><listitem
+><para
+>Disabilita questo per sopprimere ogni evidenziazione di spazi bianchi cambiati nel testo o nelle colonne di sommario (Nota che questo è anche applicato a cambiamenti nei numeri o nei commenti se sono attive le opzioni "Ignora numeri" o "Ignora commenti C/C++").</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Opzioni di impaginazione:</emphasis
+></term
+><listitem
+><para
+>Queste opzioni sono disponibili solo quando si confrontano tre file. Nella modalità normale tutte le differenze vengono mostrate in una colonna riassuntiva con colori codificati. Però, a volte, potrebbe servirti evidenziare solo le differenze tra due dei tre file. Selezionando confronto di "A con B", "A con C" o "B con C" si aprirà, a fianco di quella normale, una seconda colonna riassuntiva con le informazioni richieste. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>A capo nelle finestre delle differenze:</emphasis
+></term
+><listitem
+><para
+>Le righe più lunghe della larghezza della finestra vengono mostrate su più righe. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostra finestra A/B/C:</emphasis
+></term
+><listitem
+><para
+>Alle volte vuoi usare meglio lo spazio dello schermo per righe lunghe. Nascondere le finestre che non sono importanti (Nel menu di Finestra).</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Inverti orientamento divisione:</emphasis
+></term
+><listitem
+><para
+>Inverti tra la finestra delle differenze e le altre (A a sinistra di B a sinistra di C) o sopra le altre (A sopra B sopra C). Questo potrebbe anche aiutare in presenza di molte righe (Nel menu di Finestra). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Avviare velocemente una fusione:</emphasis
+></term
+><listitem
+><para
+>Alcune volte stai visualizzando le differenze e decidi di fondere. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Fondi il file corrente" nel menu di Directory funziona anche solo comparando due file. Un solo clic ed inizia la fusione che utilizza, come predefinito, il nome del file dell'ultimo file considerato (Quando questo è utilizzato per far ripartire la fusione, allora il nome del file di output sarà mantenuto).</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Configurazione delle scorciatoie da tastiera</title>
+<para
+>Attualmente solo la versione KDE supporta la configurazione personalizzata dei tasti scorciatoia. (Menu Impostazioni->Configurazione Scorciatoie...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Comandi per il preprocessore</title>
+<para
+>Kdiff3 prevede due opzioni per il preprocessore. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Comandi del preprocessore</emphasis
+></term
+><listitem
+><para
+>Quando un file viene letto, esso sarà inoltrato come ingresso a questo comando esterno. Il risultato del comando sarà considerato al posto del file originale. Potrai scrivere un tuo preprocessore in base alle tue esigenze. Utilizzalo per tagliare parti di file che disturbano, o per correggere automaticamente l'indentazione,  ecc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando del preprocessore per confrontare righe:</emphasis
+></term
+><listitem
+><para
+>Quando un file viene letto, esso viene trattato da questo comando esterno. Se viene specificato un comando come preprocessore (vedi sopra), allora l'uscita dal preprocessore è anche l'ingresso del preprocessore che confronta le righe. Il risultato sarà usato durante la fase di analisi delle righe coincidenti. Puoi scrivere un tuo preprocessore personalizzato che risolva le tue esigenze. Ogni riga in ingresso deve avere una riga corrispondente in uscita. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>L'idea è quella di permettere la maggior flessibilità possibile nell'impostare il risultato del confronto. Purtroppo ciò richiede l'uso di un programma esterno, e molti utenti non hanno voglia di scriversene uno. La buona notizia è che molto spesso<command
+>sed</command
+> o <command
+>perl</command
+> sono perfettamente in grado di svolgere il lavoro richiesto. </para>
+<para
+>Un semplice esempio con un file di testo: prendi il  file a.txt (6 righe): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> e il file b.txt (3 righe): <screen>
+      cg
+      dg
+      eg
+</screen
+> Senza un preprocessore appariranno le seguenti righe affiancate: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Probabilmente non era quello che desideravi, poiché la prima lettera contiene l'informazione realmente interessante. Per aiutare l'algoritmo di confronto ad ignorare la seconda lettera potremmo usare come preprocessore un comando che rimpiazzi riga per riga "g" con "a": <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Con questo comando il risultato del confronto sarà: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Internamente l'algoritmo di confronto usa i file elaborati riga per riga dal preprocessore, ma sullo schermo il file non appare modificato. Un preprocessore normale avrebbe cambiato anche i dati visualizzati. </para>
+
+<sect2 id="sedbasics"
+><title
+>Basi del <command
+>sed</command
+></title>
+<para
+>Questa sezione spiega sommariamente alcune possibilità elementari di <command
+>sed</command
+>. Per maggiori informazioni vedi <ulink url="info:/sed"
+>info:/sed</ulink
+> o <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+> http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Puoi trovare una versione di sed precompilata per Windows a <ulink url="http://unxutils.sourceforge.net"
+> http://unxutils.sourceforge.net</ulink
+>. nota che gli esempi che seguono danno per scontato che l'eseguibile di <command
+>sed</command
+> sia in una directory della variabile di ambiente PATH. Se non fosse vero, dovrai specificare il percorso completo dell'eseguibile. Nota anche che negli esempi si usano le virgolette semplici ('), che non funzionano in Windows. Sotto Windows dovrai usare al loro posto le virgolette doppie ("). </para>
+<para
+>In questo paragrafo userò solo il comando di <command
+>sed</command
+> per sostituire.: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>ESPR_REGOLARE</replaceable
+>/<replaceable
+>NUOVO_TESTO</replaceable
+>/<replaceable
+>FLAG</replaceable
+>'
+</screen
+> Prima di usare un nuovo comando in Kdiff3 sarebbe meglio provarlo in una console. Per farlo è utile il comando <command
+>echo</command
+>. Ad esempio: <screen>
+   <command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obracadabra
+</screen
+> Questo esempio mostra un semplicissimo comando sed che sostituisce la prima occorrenza di "a" con "o". Se tu volessi sostituire tutte le occorrenze, ti basterebbe aggiungere il flag "g": <screen>
+   <command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrocodobro
+</screen
+> Il simbolo "|" è il comando "pipe" che incanala l'uscita dal comando precedente nell'ingresso del comando successivo. Se vuoi fare una prova su un file più lungo, puoi usare <command
+>cat</command
+> nei sistemi di tipo Unix o <command
+>type</command
+> in sistemi di tipo Windows. <command
+>sed</command
+> opererà una sostituzione riga per riga. <screen
+><command
+>cat</command
+> <replaceable
+>nome_file</replaceable
+> | <command
+>sed</command
+> <replaceable
+>opzioni</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Esempi di utilizzi di <command
+>sed</command
+> in KDiff3</title>
+<sect3
+><title
+>Ignorare altri tipi commenti</title>
+<para
+>Attualmente KDiff3 riconosce solo i commenti di C/C++. Usando il preprocessore per il confronto delle righe in ingresso puoi fare in modo che altri tipi di commento vengano ignorati. basterà convertirli in commenti di tipo C/C++. Ad esempio, per ignorare commenti che iniziano con "#", potresti convertirli in "//". Tieni presente che dovrai anche attivare l'opzione "Ignora i commenti C/C++" affinché il trucco funzioni. Un appropriato comando per preprocessore le righe potrebbe essere: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Poiché per <command
+>sed</command
+> il carattere  "/" ha un significato speciale, è necessario porre un carattere "\" prima di ogni  "/" nella stringa del nuovo testo. Spesso il carattere "\" è richiesto per aggiungere o togliere un significato speciale a certi caratteri. La virgoletta semplice (') all'inizio e alla fine del comando di sostituzione è molto importante qui. Altrimenti la shell cercherebbe di interpretare cerci caratteri speciali (ad es.  '#', '$' or '\' ) prima di passarli a <command
+>sed</command
+>. Tieni presente che in Windows devi usare le virgolette doppie (") a questo scopo. Windows sostituisce altri caratteri come "%", quindi è meglio fare qualche prova. </para>
+</sect3>
+<sect3
+><title
+>Ignorare distinzione maiuscole/minuscole</title>
+<para
+>Usa questo comando per preprocessare le righe in modo da convertire tutto in maiuscolo: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+>  ".*" è un'espressione regolare che corrisponde con tutte le stringhe e, in questo contesto, con tutti i caratteri della riga. Il "\1" nella stringa di sostituzione rappresenta il testo trovato in corrispondenza al contenuto della prima coppia di parentesi "\(" e "\)". La "\U" converte in maiuscolo il testo inserito. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorare le keyword per il controllo della versione</title>
+<para
+>CVS ed altri sistemi per il controllo delle versioni utilizzano molte parole chiave per inserire stringhe generate automaticamente (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Esse seguono lo schema comune "$KEYWORD testo generato$". A questo punto ci serve un comando per il preprocessore che rimuova solo il testo generato: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Le "\|" separano le possibili parole chiave. Puoi modificare questa lista in base alle tue esigenze. La "\" prima del "$" è necessaria, altrimenti il "$" verrebbe interpretato come "fine della riga". </para>
+<para
+>Nel provare <command
+>sed</command
+> potrai incominciare a capire ed apprezzare queste strane "espressioni regolari". Esse sono particolarmente utili perché molti altri programmi utilizzano cose molto simili. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorare i numeri</title>
+<para
+>Attualmente c'è un'opzione interna che permette di ignorare i numeri. Però è utile vedere come lo si può fare con un comando per il preprocessore.  <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Ogni carattere compreso tra le parentesi quadre verrà riconosciuto e sostituito con nulla. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorare alcune colonne</title>
+<para
+>A volte un testo è formattato molto rigorosamente e contiene delle colonne che tu vuoi ignorare, mentre ci sono altre colonne che tu vuoi esaminare. Nel seguente esempio le prime 5 colonne (ciascuna di un carattere) verranno ignorate, poi vengono salvate 10 colonne, ignorate altre cinque e salvato il resto della riga.  <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Ogni punto "." rappresenta un carattere. "\1" e "\2" nella stringa del nuovo testo indicano il contenuto della prima e seconda coppia "\(" e "\)", ossia il testo da preservare.  </para>
+</sect3>
+
+<sect3
+><title
+>Combinare piùsostituzioni</title>
+<para
+>A volte, potresti voler applicare contemporaneamente diverse sostituzioni. In tal caso basta usare un punto e virgola ";" per separarle l'una dall'altra. Ad esempio: <screen
+><command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROCODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Utilizzare <command
+>perl</command
+> invece di <command
+>sed</command
+></title>
+<para
+>Invece di <command
+>sed</command
+> potresti voler utilizzare un altro comando, ad esempio <command
+>perl</command
+>.  <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>ESPR_REGOLAR</replaceable
+>/<replaceable
+>NUOVO_TESTO</replaceable
+>/<replaceable
+>FLAGS</replaceable
+>'
+</screen
+> Ma in <command
+>perl</command
+> alcuni particolari sono differenti. Nota, ad esempio, che mentre <command
+>sed</command
+> vuole "\(" e "\)", in <command
+>perl</command
+> serve un più semplice "(" e ")", non precedute da '\'. Esempio: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Precedenze nel preprocessare i dati</title>
+<para
+>I dati sono incanalati (piped) attraverso tutti i preprocessori interni ed esterni nel seguente ordine: </para>
+<itemizedlist>
+<listitem
+><para
+>Preprocessore normale,</para
+></listitem>
+<listitem
+><para
+>Preprocessore esterno riga per riga,</para
+></listitem>
+<listitem
+><para
+>Ignorare differenze maiuscolo/minuscolo (tutto in maiuscolo),</para
+></listitem>
+<listitem
+><para
+>Individuare commenti C/C++:</para
+></listitem>
+<listitem
+><para
+>Ignorare i numeri,</para
+></listitem>
+<listitem
+><para
+>Ignorare spazi bianchi,</para
+></listitem>
+</itemizedlist>
+<para
+>I dati, dopo essere passati dal preprocessore normale saranno utilizzati sia per essere mostrati che fusi. Le altre operazioni modificano solo i dati visti dall'algoritmo che controlla le differenze tra le righe corrispondenti. </para
+><para
+>Nei rari casi in cui si usa il preprocessore normale bisogna tener presente che il preprocessore sul contenuto delle righe utilizza l'uscita del preprocessore normale come proprio ingresso. </para>
+</sect2>
+
+<sect2
+><title
+>Attenzione</title>
+<para
+>I comandi per il preprocessore sono spesso utilissimi ma, come succede con ogni opzione che modifichi i vostri testi o che nasconda automaticamente certe differenze, potrebbero farti sfuggire differenze significative o, nel peggiore dei casi, distruggere dati importanti. </para
+><para
+>Per questa ragione, se durante una fusione è in funzione un comando del preprocessore normale, KDiff3 ti chiederà se vuoi disattivarlo. Però non ti avviserà se è attivo un comando del preprocessore sul contenuto delle righe. La fusione non sarà completata se prima non saranno risolti tutti i conflitti. Se hai disabilitato "Mostra gli spazi bianchi" anche le differenze che son state rimosse con il preprocessore sul contenuto delle righe saranno del tutto invisibili. Se il bottone "Salva" rimane disattivato durante una fusione (perché sussistono dei conflitti), assicurati di aver attivato "Mostra gli spazi bianchi". Se poi non vorrai sistemare manualmente le differenze meno importanti, potrai azionare "Scegli [A|B|C] per per risolvere tutti i conflitti di spazi bianchi" nel menu "Fondi". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Comparazione e fusione di directory con KDiff3</title>
+<sect1 id="dirmergeintro"
+><title
+>Introduzione</title>
+<para
+>Spesso i programmatori devono modificare molti file nelle directory per realizzare i loro scopi. Per questo KDiff3 permette anche di comparare e fondere intere directory ricorsivamente! </para
+><para
+>Anche se comparare e fondere le directory sembra abbastanza ovvio, ci sono molti dettagli che bisogna considerare. Il più importante è il fatto che ora molti file potrebbero essere coinvolti in ogni operazione. Se non hai creato copia di riserva dei dati originali, può essere molto difficile se non impossibile recuperare lo stato originale. Quindi prima di avviare una fusione assicurati che i tuoi dati siano sicuri e sia possibile un recupero. Se crei un archivio o usi un sistema di controllo versioni è una tua decisione, ma anche gli esperti programmatori ed integratori hanno bisogno dei vecchi sorgenti prima o poi. E nota che anche se io (autore di KDiff3) cerco di fare del mio meglio, non posso garantire che non ci siano errori. In accordo con la licenza GNU-GPL NON CI SONO GARANZIE alcuna per questo programma. Quindi attenzione e ricordate: </para>
+<blockquote
+><para>
+   <emphasis
+>Errare è umano, ma per incasinare davvero tutto è necessario un computer.</emphasis>
+</para
+></blockquote>
+<para
+>Questo è quello che questo programma può fare per te: KDiff3 ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... legge e compara due o tre directory ricorsivamente,</para
+></listitem>
+     <listitem
+><para
+>... fa particolare attenzione ai file simbolici,</para
+></listitem>
+     <listitem
+><para
+>... permette di selezionare i file con un doppio clic del mouse,</para
+></listitem>
+     <listitem
+><para
+>... per ogni elemento propone una operazione di fusione, che puoi cambiare prima di avviare la fusione delle directory,</para
+></listitem>
+     <listitem
+><para
+>... permette la simulazione della fusione e visualizza le azioni che dovrebbero essere fatte, senza eseguirle,</para
+></listitem>
+     <listitem
+><para
+>... permette di fondere, e permette l'intervento manuale quando questo è necessario,</para
+></listitem>
+     <listitem
+><para
+>... ti permette di avviare l'operazione selezionata per tutti gli elementi (tasto F7) o per l'elemento selezionato (tasto F6),</para
+></listitem>
+     <listitem
+><para
+>... permette di continuare la fusione dopo l'interazione manuale con il tasto F7,</para
+></listitem>
+     <listitem
+><para
+>... opzionalmente crea una copia di riserva, con l'estensione ".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Avviare la comparazione o la fusione di directory</title>
+<para
+>Questa operazione è molto simile alla comparazione e fusione di un file. È necessario specificare le directory nella riga di comando o nel dialogo di selezione file. </para>
+<sect2
+><title
+>Compara/Fondi due directory: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dir1 dir2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dir1 dir2</replaceable
+> -o <replaceable
+>destdir</replaceable
+>
+</screen>
+<para
+>Se nessuna directory è stata specificata, KDiff3 utilizzerà <replaceable
+>dir2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Compara/Fondi tre directory: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>dir1 dir2 dir3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>dir1 dir2 dir3</replaceable
+> -o <replaceable
+>destdir</replaceable
+>
+</screen>
+<para
+>Quando tre directory vengono fuse allora <replaceable
+>dir1</replaceable
+> verrà utilizzata come base della fusione. Se nessuna directory di destinazione è stata specificata, KDiff3 utilizzerà <replaceable
+>dir3</replaceable
+> come directory di destinazione per la fusione. </para>
+
+<para
+>Si noti che solamente la comparazione inizia automaticamente, non la fusione. Per questo tu devi prima selezionare un elemento del menu o il tasto F7 (Ulteriori dettagli di seguito). </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Mostra informazioni</title>
+<para
+>Durante la lettura delle directory un messaggio informativo appare per notificare lo stato di avanzamento. Se annulli l'operazione di scansione, solamente i file che sono stati comparati fino a quel momento saranno riportati. </para
+><para
+>Quando la scansione del directory è stata completata KDiff3 mostra una lista dei risultati della sinistra, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... ed i dettagli dell'elemento attualmente selezionato sulla destra:  </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>Colonna del nome</title>
+<para
+>Ogni file e directory trovato durante la scansione è mostrato qui in un albero. Puoi selezionare un elemento facendo clic con il mouse. </para
+><para
+>Normalmente le directory sono collassate. È possibile espanderle e collassarle con un clic su "+"/"-" o con un doppio clic sull'elemento o usando i tasti sinistra/destra. Il menu "Directory" contiene inoltre due azioni "Chiudi sottodirectory" e "Apri sottodirectory" con le quali puoi collassare o espandere tutte le directory in una sola volta. </para
+><para
+>Se fai doppio clic sopra un file allora la comparazione verrà avviata e apparirà la finestra di verifica file. </para>
+<para
+>L'immagine nella colonna riflette il tipo di file nella prima directory ("A"). Può essere una di queste: </para>
+<itemizedlist>
+     <listitem
+><para
+>File normale</para
+></listitem>
+     <listitem
+><para
+>Directory normale (Immagine della directory)</para
+></listitem>
+     <listitem
+><para
+>Collegamento ad un file (Immagine del file con una freccia di collegamento)</para
+></listitem>
+     <listitem
+><para
+>Collegamento ad una directory (Immagine della directory con una freccia di collegamento)</para
+></listitem>
+</itemizedlist>
+<para
+>Se il tipo di file è diverso nelle altre directory allora questo è visibile nelle colonne A/B/C e nella finestra che mostra i dettagli dell'elemento selezionato. Nota che in questo caso nessuna operazione di fusione potrà essere selezionata automaticamente. Quando la fusione partirà l'utente sarà informato di questo problema. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Le colonne A/B/C e lo schema dei colori</title>
+<para
+>Come si può vedere, nell'immagine sopra, i colori rosso, verde, giallo e nero sono utilizzati nelle colonne A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Nero: Questo elemento non esiste in questa directory.</para
+></listitem>
+     <listitem
+><para
+>Verde: Elemento più recente.</para
+></listitem>
+     <listitem
+><para
+>Giallo: Più vecchio del verde, più recente del rosso.</para
+></listitem>
+     <listitem
+><para
+>Rosso: Elemento più vecchio.</para
+></listitem>
+</itemizedlist>
+<para
+>Ma per gli elementi che erano identici nella comparazione il loro colore è anche identico anche se l'età non lo è. </para
+><para
+>Le directory sono considerate uguali se tutti gli elementi contenuti sono identici. Essi avranno quindi lo stesso colore. Ma l'età di una directory non è considerata per il proprio colore. </para
+><para
+>L'idea di questo schema di colorazione l'ho avuta da <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. I colori sembrano i colori di un foglio che è verde quando nuovo, diventa giallo successivamente e rosso quando è vecchio. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>La colonna dell'operazione</title>
+<para
+>Dopo la comparazione delle directory KDiff3 valuterà inoltre una proposta per l'operazione di fusione. Questo è visibile nella colonna "Operazione". È possibile modificare l'operazione facendo clic sopra l'operazione che desideri cambiare. Apparirà un piccolo menu che permetterà di selezionare una operazione per quell'elemento (Puoi anche selezionare le operazioni necessarie tramite tastiera. Ctrl+1/2/3/4/Del seleziona rispettivamente, se disponibili, A/B/C/Fondi/Cancella). Questa operazione potrà essere eseguita durante la fusione. Dipende dall'elemento e dalla modalità di fusione in cui ti trovi, quale operazione è disponibile. La modalità di fusione è una delle </para>
+<itemizedlist>
+     <listitem
+><para
+>Fusione di tre directory ("A" è considerato la base più vecchia di entrambe).</para
+></listitem>
+     <listitem
+><para
+>Fusione di due directory.</para
+></listitem>
+     <listitem
+><para
+>Modalità di sincronizzazione directory (attivabile con l'opzione "Sincronizza Directory").</para
+></listitem>
+</itemizedlist>
+<para
+>Nella fusione di tre directory l'operazione proposta sarà: Se per un elemento ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... le tre directory sono uguali: Copia da C</para
+></listitem>
+     <listitem
+><para
+>... A e C sono uguali ma B no: Copia da B (o se B non esiste, cancella, se esiste, la destinazione)</para
+></listitem>
+     <listitem
+><para
+>... A e B sono uguali ma C no: Copia da C (o se C non esiste, cancella, se esiste, la destinazione)</para
+></listitem>
+     <listitem
+><para
+>... B e C sono uguali ma A no: Copia da C (o se C non esiste, cancella, se esiste, la destinazione)</para
+></listitem>
+     <listitem
+><para
+>... esiste solo A: Eliminare la destinazione (se esiste)</para
+></listitem>
+     <listitem
+><para
+>... esiste solo B: Copia da B</para
+></listitem>
+     <listitem
+><para
+>... esiste solo C: Copia da C</para
+></listitem>
+     <listitem
+><para
+>... A,B e C non sono uguali: Fusione</para
+></listitem>
+     <listitem
+><para
+>... A, B e C non sono dello stesso tipo (es. A è una directory, B è un file): "Errore: Conflitto nel tipo di file". Fino a quando tali elementi esistono la fusione non può essere avviata.</para
+></listitem>
+</itemizedlist>
+<para
+>Nella fusione di due directory l'operazione proposta sarà: Se per un elemento ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... entrambe le directory sono uguali: Copia da B</para
+></listitem>
+     <listitem
+><para
+>... A esiste, ma non B: Copia da A</para
+></listitem>
+     <listitem
+><para
+>... B esiste, ma non A: Copia da B</para
+></listitem>
+     <listitem
+><para
+>... A e B esistono ma non sono uguali: Fusione</para
+></listitem>
+     <listitem
+><para
+>... A e B non sono dello stesso tipo (es. A è una directory, B è un file): "Errore: Conflitto nel tipo di file". Fino a quando tale elemento esiste la fusione delle directory non può essere avviata.</para
+></listitem>
+</itemizedlist>
+<para
+>La modalità di sincronizzazione è attiva se solo due directory e nessuna destinazione è stata specificata e se l'opzione "Sincronizza directory" è attiva. KDiff3 selezionerà quindi una operazione predefinita così entrambe le directory, successivamente, sono uguali. Se per un elemento ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... entrambe le directory sono uguali: Nulla da fare.</para
+></listitem>
+     <listitem
+><para
+>... A esiste, ma non B: Copia A su B</para
+></listitem>
+     <listitem
+><para
+>... B esiste, ma non A: Copia B su A</para
+></listitem>
+     <listitem
+><para
+>... A e B esistono, ma non sono uguali: Fondi e memorizza il risultato in entrambe le directory. (...)</para
+></listitem>
+     <listitem
+><para
+>... A e B non sono dello stesso tipo (es. A è una directory, B è un file): "Errore: Conflitto nel tipo di file". Fino a quando tale elemento esiste la fusione delle directory non può essere avviata.</para
+></listitem>
+</itemizedlist>
+<para
+>Se due directory vengono fuse e l'opzione "Copia il più recente invece di fondere" è selezionata, KDiff3 verificherà le date e proporrà di scegliere il file più recente. Se i file non sono uguali ma hanno data uguale, il risultato dell'operazione sarà "Errore: Le date sono uguali ma i file no." Finché esistono file in questa situazione la fusione delle directory non potrà iniziare. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>La colonna di stato</title>
+<para
+>Durante la fusione i file saranno processati uno dopo l'altro. La colonna di stato mostrerà "Fatto" per gli elementi correttamente fusi, e altri messaggi se è accaduto qualcosa di inaspettato. Quando una fusione è completa, bisognerebbe fare un'ultima verifica per vedere se gli stati di tutti gli elementi concordano. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>La colonna delle statistiche</title>
+<para
+>Quando è attiva l'opzione "Analisi completa" per il  confronto, KDiff3 mostrerà delle colonne supplementari contenenti il numero di conflitti non risolti, risolti, relativi a spazi non bianchi e relativi a spazi bianchi. La colonna dei conflitti risolti verrà mostrata solo quando si confrontano o fondono tre directory. </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Avviare una fusione</title>
+<para
+>Puoi inoltre fondere l'elemento attualmente selezionato (file o directory), o tutti gli elementi.Quando hai scelto tutte le tue operazioni (anche in tutte le sottodirectory) puoi far partire la fusione. </para
+><para
+>Attenzione che se non viene specificata una directory di destinazione esplicitamente, allora la destinazione sarà "C" nella modalità di tre directory, "B" nella modalità di due directory, e nella modalità di sincronizzazione sarà "A" e/o "B". </para
+><para
+>Se è stata specificata la directory di destinazione verificare anche che tutti gli elementi di output siano anche nell'albero. Ci sono alcune opzioni che causano l'omissione di certi elementi dalla comparazione e dalla fusione delle directory. Verifica queste opzioni per non avere delle brutte sorprese: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Sottodirectory": Se disabilitato, gli elementi nelle sottodirectory non saranno esaminati.</para
+></listitem>
+     <listitem
+><para
+>"Categorie"/"Categorie escluse": Include/Esclude elementi dalla verifica</para
+></listitem>
+     <listitem
+><para
+>"Escludi file nascosti"</para
+></listitem>
+     <listitem
+><para
+>"Elenca solo le differenze": I file verificati in tutte le directory non appaiono nell'albero, così come anche della destinazione.</para
+></listitem>
+</itemizedlist>
+<para
+>(Nell'attuale versione devi eseguire manualmente una riscansione tramite il menu "Directory"->"Riscandisci" solo dopo aver cambiato le opzioni che hanno effetto sulla directory scansionata). </para
+><para
+>Se così sei soddisfatto, il resto è facile. </para
+><para
+>Per fondere tutti gli elementi: Seleziona "Avvia/Continua la funzione directory" nel menu "Directory" o premi il tasto F7 (la scorciatoia). Per fondere solamente l'elemento attualmente selezionato: Seleziona "Avvia operazione per l'elemento corrente" o premi F6. </para
+><para
+>Se per un conflitto nel tipo di file, persiste la non validità dell'operazione scelta per alcuni file, allora apparirà un messaggio che indica elementi, in modo che tu possa selezionare un'operazione valida per essi. </para
+><para
+>Se fondi tutti gli elementi allora apparirà un dialogo, proponendoti le opzioni "Fallo", "Simula" e "Annulla". </para>
+<itemizedlist>
+     <listitem
+><para
+>Seleziona "Simula" se vuoi vedere cosa dovrebbe essere fatto senza effettivamente farlo. Una lista dettagliata di tutte le operazioni sarà mostrata.</para
+></listitem>
+     <listitem
+><para
+>Altrimenti seleziona "Esegui" per avviare l'effettiva fusione.</para
+></listitem>
+</itemizedlist>
+<para
+>Quindi KDiff3 avvierà l'operazione specifica per tutti gli elementi. Se è richiesta una interazione manuale (fusione di un singolo file), sarà aperta la finestra di fusione (<link linkend="dirmergebigscreenshot"
+>guarda la schermata grande</link
+>). </para
+><para
+>Quando hai finito con il file, seleziona nuovamente "Avvia/Continua la fusione di directory" o il tasto F7. Se non hai ancora salvato, un dialogo chiederà di farlo. KDiff3 continuerà quindi con il prossimo elemento. </para
+><para
+>Quando KDiff3 incontra un errore, avvertirà di questo e mostrerà un dettagliato stato informativo. Sul fondo di questa lista ci saranno alcuni messaggi di errore i quali dovrebbero aiutare a capire la causa del problema. Quando continui con la fusione (tasto F7) KDiff3 ti chiederà o di riprovare o di trascurare l'elemento che ha causato il problema.Ciò significa che prima di continuare puoi scegliere un'altra operazione o risolvere il problema attraverso altri mezzi. </para
+><para
+>Quando la fusione è completa, KDiff3 informerà quindi tramite un dialogo con messaggio. </para
+><para
+>Se alcuni elementi sono stati fusi individualmente allora KDiff3 ne terrà conto (mentre la corrente sessione di fusione avanza) e non li fonderà nuovamente fino a quando la fusione per tutti gli altri elementi non sarà eseguita. Anche quando la fusione viene saltata o non è stato salvato nulla questi elementi sono considerati completati. Solo quando cambi le operazioni di fusione l'elemento sarà nuovamente fuso. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Opzioni per comparare e fondere directory</title>
+<para
+>Le preferenze di KDiff3 (menu"Impostazioni"-&gt;"Configura KDiff3") ora ha una sezione chiamata "Fusione directory" con queste opzioni: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Sottodirectory:</emphasis
+></term
+><listitem
+><para
+>Seleziona se ricercare le directory ricorsivamente.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tipi di file:</emphasis
+></term
+><listitem
+><para
+>Solo i file che corrispondono al tipo saranno messi nell'albero. Più di un tipo può essere specificato utilizzando il punto e virgola ";" come separatore. Caratteri jolly possibili: '*' e '?'. (Es. "*.cpp;*.h"). Predefinito è "*". Le directory non hanno bisogni di tali tipi.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>File da escludere:</emphasis
+></term
+><listitem
+><para
+>I file e le sottodirectory che corrispondono a questo tipo saranno esclusi dall'albero. Più di uno schema potrebbe essere specificato utilizzando il punto e virgola ";" come separatore. Caratteri jolly validi: '*' e '?'. Il predefinito è "*.orig;*.o".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Utilizza CVS-Ignore:</emphasis
+></term
+><listitem
+><para
+>Ignora i file e le directory dovrebbero essere ignorate anche dal CVS. Molti file generati automaticamente sono ignorati dal CVS. Il grosso vantaggio è che questo può essere una directory specificata dal file locale ".cvsignore". (Vedi <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>).</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Esamina file e directory nascosti:</emphasis
+></term
+><listitem
+><para
+>Su alcuni file system esiste l'attributo "Nascosto". Su altri sistemi il nome del file inizia con il punto "." che significa nascosto. Questa opzione permette di decidere se includere questi file nell'albero oppure no. Normalmente attivo.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Segui i link dei file:</emphasis
+></term
+><listitem
+><para
+>Per collegamenti a file: Quando disabilitato, il collegamenti simbolici verranno comparati. Quando abilitati, quindi i file collegati saranno comparati. Normalmente disabilitato.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Segui i link delle directory:</emphasis
+></term
+><listitem
+><para
+>Per collegamenti a directory: Quando disabilitato, i collegamenti simbolici saranno comparati. Quando attivo i collegamenti saranno trattati come una directory e saranno scansionate ricorsivamente. (Notare che il programma non verifica se il collegamento è "ricorsivo". Quando per esempio una che contiene un collegamento ad una directory dovrebbe causare un ciclo infinito, e dopo un po' di tempo ciò causerebbe un riempimento dello stack o l'utilizzo di tutta la memoria, causando il blocco del programma). Normalmente disabilitato.</para
+></listitem
+></varlistentry
+>   
+   <varlistentry
+><term
+><emphasis
+>Elenca solo le differenze:</emphasis
+></term
+><listitem
+><para
+>Solo gli elementi che non sono uguali in tutte le directory di ingresso saranno elencate e solo e file cambiati sono visibili. Quindi i file che sono uguali in tutte le directory non dovrebbero essere copiati durante una fusione e se la directory di destinazione non contiene il file prima della fusione, potresti perdere alcuni file successivamente. (Questa opzione è probabilmente diversa nelle future versioni). Normalmente disattiva.</para
+></listitem
+></varlistentry>
+
+   <varlistentry
+><term
+><emphasis
+>Modalità di confronto dei file:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Confronto binario:</emphasis
+></term
+><listitem
+><para
+>Questa è la modalità di confronto predefinita. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Analisi completa:</emphasis
+></term
+><listitem
+><para
+>Opera un analisi approfondita di ogni file e mostra le colonne con le informazioni statistiche (numero di conflitti non risolti, risolti, relativi a spazi non bianchi e relativi a spazi bianchi). L'analisi completa è più lenta di una semplice analisi binaria, e ancora più lenta se applicata a file non di testo. (Indica il "file-antipatterns" appropriato). </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Basati sulla data di modifica:</emphasis
+></term
+><listitem
+><para
+>Se si comparano directory lunghe in una rete lenta, potrebbe essere più veloce comparare solamente le date di modifica e la dimensione del file. Ma questo aumento di velocità ha il prezzo di un piccola incertezza. Usare questa opzione con cura. Normalmente disattiva.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Basati sulla dimensione:</emphasis
+></term
+><listitem
+><para
+>Simile a considerare la data di modifica. Non avviene una reale comparazione. Due file sono considerati uguali se la loro dimensione risulta uguale. Questo è utile quando l'operazione di copia file non ha mantenuto la data di modifica. Usa questa opzione con cautela. Normalmente disabilitata.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Sincronizza le directory:</emphasis
+></term
+><listitem
+><para
+>Attiva la modalità "Sincronizza" quanto vengono comparate due directory e non è stata indicata la directory di destinazione. In questa modalità le operazioni proposte saranno scelte in modo che entrambe le directory sorgenti sono uguali successivamente. Anche il risultato di fusione sarà scritto in entrambe le directory. Normalmente disabilitato.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copia il più recente invece di fondere:</emphasis
+></term
+><listitem
+><para
+>Invece di fondere l'operazione proposta copierà il sorgente più recente se appena cambiato. (Considerato pericoloso, perché ciò implica la conoscenza, che gli altri file non siano stati ancora modificati. Verifica in ogni caso per essere sicuro). Normalmente disattivata.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>File di backup:</emphasis
+></term
+><listitem
+><para
+>Se un file o una intera directory è sostituita con un'altra o è cancellata la versione originale sarà rinominata con l'estensione ".orig". Se una vecchia copia con estensione ".orig" esiste già allora questa sarà eliminata senza copia. Questo inoltre interessa la normale fusione di singoli file, non solo nella fusione di directory. Normalmente attivo.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Altre funzioni</title>
+<sect2
+><title
+>Schermo intero/diviso</title>
+<para
+>Normalmente la lista di visualizzazione della fusione delle directory rimane visibile fino il file è comparato e fuso. Con il mouse puoi muovere la barra di divisione che separa la lista dei file dalla finestra di verifica. Se non vuoi questo puoi disabilitare l'opzione "Mostra lo schermo diviso" nel menu "Directory". Sarà quindi possibile usare "Inverti vista" nel menu "Directory" per invertire tra la lista di file e la visualizzazione delle differenze che quindi occuperà tutto lo schermo. </para>
+</sect2>
+<sect2
+><title
+>Comparare o fondere un singolo file</title>
+<para
+>Probabilmente preferiresti un semplice doppio clic del mouse sul file in questione per compararlo. Tuttavia esiste anche una voce nel menu "Directory". È possibile anche fondere direttamente un singolo file, senza avviare l'operazione di fusione directory tramite "Fondi singolo file" nel menu "Directory". Successivamente al salvataggio lo stato sarà impostato a fatto e il file non sarà nuovamente fuso se una fusione di directory è avviata. </para
+><para
+>Ma notare che queste informazioni di stato saranno perse quando si ritorna alla directory scandita: menu "Directory": "Riscandire" </para>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Argomenti vari</title>
+<sect1 id="networktransparency">
+<title
+>Trasparenza di rete con KIO</title>
+<sect2
+><title
+>Gli slave KIO</title>
+<para
+>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. </para
+><para
+>Esempio: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.faraway.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hacker/archive.tar.gz/dir ./dir
+</screen>
+</para>
+<para
+>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. </para
+><para
+>Altri slave KIO interessanti sono: </para>
+<itemizedlist>
+<listitem
+><para
+>File da WWW (http:),</para
+></listitem>
+<listitem
+><para
+>File da FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Trasferimento file crittografato (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Windows-resources (smb:),</para
+></listitem>
+<listitem
+><para
+>File locali (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>Altre cose che sono possibili, ma probabilmente meno utili sono: </para>
+<itemizedlist>
+<listitem
+><para
+>Man-pages (man:),</para
+></listitem>
+<listitem
+><para
+>Info-pages (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Come scrivere gli URL</title>
+<para
+>Un URL ha una sintassi diversa se comparata con un percorso per i file e le directory locali. Dovrebbe essere considerate alcune cose: </para>
+<itemizedlist>
+<listitem
+><para
+>Un percorso può essere relativo e può contenere "." o "..". Quando non è possibile con URL che sono sempre assoluti. </para
+></listitem
+><listitem
+><para
+>I caratteri speciali devono essere scritti con l'"escaping". ("#"->"%23", spazio->"%20", ecc.) Es. Un file con nome "/#pippo#" dovrebbe avere l'URL "file:/%23pippo%23". </para
+></listitem
+><listitem
+><para
+>Quando un URL non funziona come ci si aspettava, prova ad aprirlo prima con Konqueror. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Possibilità di KIO-Slaves</title>
+<para
+>La trasparenza della rete ha uno svantaggio. Non tutte le risorse hanno le stesse possibilità. </para
+><para
+>Alcune volte questo è causato dal file system del server, altre volte dal protocollo. Di seguito una breve lista delle limitazioni: </para>
+<itemizedlist>
+<listitem
+><para
+>Alcune volte i collegamenti non sono supportati. </para
+></listitem
+><listitem
+><para
+>O non c'è modo di distinguere se il collegamento punti ad un file o ad una directory; spesso si assume a file. (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Dimensione del file non sempre determinabile. </para
+></listitem
+><listitem
+><para
+>Supporto limitato per permessi. </para
+></listitem
+><listitem
+><para
+>Non è possibile cambiareare permessi o date di modifica, altrimenti i permessi e la data della copia sarebbero diversi dall'originale. (Vedere l'opzione "Basati sulla dimensione"). Queste operazioni sono permesse solo per i file locali. </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Usare &kdiff3; come un KPart</title>
+<para
+>&kdiff3; è un KPart. Attualmente esso implementa l'interfaccia KParts::ReadOnlyPart. </para
+><para
+>In KDevelop l'uso principale è come visualizzatore di differenze. KDevelop fa sempre partire prima il visualizzatore delle differenze interno. Per richiamare KDiff3 premi il tasto destro del mouse nella finestra delle differenze e seleziona "Mostra nel KDiff3Part" dal menu contestuale. </para
+><para
+>KDiff3 richiede normalmente due file completi in ingresso. Quando usato come componente KDiff3 assumerà che il file di input sia un file di patch con un formato indefinito. KDiff3 recupererà il nome del file originale dal file patch. Almeno uno dei due file deve essere disponibile. KDiff3 invocherà quindi <command
+>patch</command
+> per ricreare il secondo file. </para
+><para
+>In Konqueror puoi selezionare un file di patch e selezionare dal menu contestuale "Preview in"-"KDiff3Part". Attenzione che questo non funzionerà se nessun file originale è disponibile e non è sicuro se i file originali sono stati modificati prima della generazione del file di patch. </para
+><para
+>Quando avviato come componente KDiff3 ha due finestre di comparazione e una piccola barra degli strumenti e un piccolo menu. La fusione o la comparazione delle directory non sono quindi supportate. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Domande e risposte</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Perché il nome "KDiff3"? </para
+></question
+><answer
+><para
+>Gli strumenti "KDiff" e "KDiff2" (ora "Kompare") esistono già. Inoltre "KDiff3" dovrebbe suggerire che può fondere come il programma "diff3" presente nella collezione Diff-Tool. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Perché ho registrato sotto GPL? </para
+></question
+><answer
+><para
+>Utilizzando programmi GPL da molto tempo ed ho imparato molto guardando altri sorgenti. Così questo è il mio "Grazie" a tutti i programmatori che a loro volta hanno fatto lo stesso. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Mancano alcuni pulsanti e funzioni. Cos'è errato? </para
+></question
+><answer
+><para
+>Si sta compilando dai sorgenti, ma probabilmente non è stato correttamente specificato KDE-prefix con configure. Se non specificato configure installerà in usr/local, ma in questa maniera KDE non potrà trovare il file delle informazioni di risorse dell'interfaccia utente (es: kdiff3ui.rc).Il file README contiene molte informazioni su come correggere il prefisso. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Spesso le righe che sono simili ma non uguali appaiono dopo le altre ma alcune volte no. Perché? </para
+></question
+><answer
+><para
+>Le righe che presentano differenze per soli spazi bianchi sono trattate inizialmente come "uguali", mentre altre differenze porteranno al risultato di righe "differenti". Se righe simili appaiono dopo delle altre è una coincidenza ma questo fortunatamente è spesso il caso. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Perché tutti i conflitti devono essere risolti prima salvare il risultato della fusione? </para
+></question
+><answer
+><para
+>Per ogni sezione diversa o uguale l'editor, nella finestra del risultato di fusione, ricorda dove queste iniziano e finiscono. Questo è necessario in quanto i conflitti possono essere risolti manualmente semplicemente selezionando il pulsante del sorgente (A/B o C). Questa informazione saranno perse successivamente al salvataggio del testo in quanto è troppo oneroso creare un file specializzato al mantenimento di tutte le informazioni per il ripristino. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Perché l'editor nella finestra del risultato di fusione non presenta la funzione di annulla modifica? </para
+></question
+><answer
+><para
+>Questa funzione richiedeva troppo sforzo. È sempre possibile ripristinare la versione facendo clic il pulsante rispettivo (A/B o C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Quando rimuovo parte del testo, appare improvvisamente "&lt;No src line&gt;" e non può essere eliminato. Cosa significa e come può essere rimosso? </para
+></question
+><answer
+><para
+>Per ogni sezione diversa o uguale l'editor, nella finestra di risultato della fusione, ricorda dove inizia e dove finisce. "&lt;No src line&gt;"significa che non è rimasto nulla nella sezione, nemmeno un carattere di nuova riga. Questo può capitare sia nella fusione automatica che in quella manuale. Questo non è un problema, poiché non apparirà nel file salvato. Se vuoi tornare al file originale è sufficiente selezionare la sezione (fai un clic sulla colonna di sommario con il tasto sinistro del mouse) quindi fai clic sul pulsante del sorgente con il contenuto voluto (A/B e C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Perché KDiff3 non supporta l'evidenziazione della sintassi? </para
+></question
+><answer
+><para
+>KDiff3 già usa molti colori per le differenti evidenziazioni e molte di queste potrebbero essere confuse. Per questi scopi usa un altro editor. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Qui si possono trovare molte informazioni, ma la tua domanda non ha ancora una risposta? </para
+></question
+><answer
+><para
+>Sei pregato di inviarmi le tue domanda. Ogni commento sarà apprezzato. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Riconoscimenti e Licenza</title>
+
+<para
+>&kdiff3; - Strumento per comparare e fondere file e directory </para>
+<para
+>Copyright sul programma 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Sono ben accette nuove idee e segnalazioni di errori da colleghi e da tutte le persone della grande rete WWW. Grazie! </para>
+
+<para
+>Copyright della documentazione &copy; 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+<para
+>Traduzione 2004: Stelvio Rosset <email
+>srosset@satelgroup.net</email
+></para
+><para
+>Aggiornamento e revisione della traduzione (2005): AndreaCelli <email
+>a.celli@caltanet.it</email
+></para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installazione</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Come procurarsi &kdiff3;</title>
+
+<para
+>È possibile scaricare la versione più recente di KDiff3 da <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>KDiff3 è disponibile anche per altre piattaforme. Per maggiori dettagli consultare la homepage. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Requisiti</title>
+
+<para
+>Per sfruttare tutte le potenzialità di &kdiff3; serve &kde;3.1 o successivo. </para
+><para
+>Per informazioni riguardanti KDiff3 su altre piattaforme sprovviste di KDE si rimanda a <ulink url="http://kdiff3.sourceforge.net"
+>homepage</ulink
+>. </para
+><para
+>La lista dei cambiamenti la puoi trovare sul sito <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> oppure nel file "ChangeLog" del pacchetto dei sorgenti. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Compilazione ed installazione</title>
+
+<para
+>Al fine di compilare ed installare &kdiff3; sul tuo sistema con KDE, posizionati sulla directory base della distribuzione &kdiff3; e digita:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-dir</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-dir</replaceable
+> specifica la directory contenente KDE nel tuo sistema. Se non sei sicuro, leggi il file README per maggiori dettagli. </para>
+<para
+>Dato che &kdiff3; utilizza <command
+>autoconf</command
+> e <command
+>automake</command
+> non dovresti avere problemi nel compilarlo. Se invece pensi di aver trovato un problema sei pregato di segnalarlo alla &kde; mailing list.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/it/iteminfo.png b/doc/it/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/it/iteminfo.png
diff --git a/doc/it/letter_by_letter.png b/doc/it/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/it/letter_by_letter.png
diff --git a/doc/it/merge_current.png b/doc/it/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/it/merge_current.png
diff --git a/doc/it/new.png b/doc/it/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/it/new.png
diff --git a/doc/it/open_dialog.png b/doc/it/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/it/open_dialog.png
diff --git a/doc/it/screenshot_diff.png b/doc/it/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/it/screenshot_diff.png
diff --git a/doc/it/screenshot_merge.png b/doc/it/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/it/screenshot_merge.png
diff --git a/doc/it/triple_diff.png b/doc/it/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/it/triple_diff.png
diff --git a/doc/it/white_space.png b/doc/it/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/it/white_space.png
diff --git a/doc/nl/Makefile.am b/doc/nl/Makefile.am
new file mode 100644
index 0000000..31b67c4
--- /dev/null
+++ b/doc/nl/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = nl
+
+
diff --git a/doc/nl/dirbrowser.png b/doc/nl/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/nl/dirbrowser.png
diff --git a/doc/nl/dirmergebig.png b/doc/nl/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/nl/dirmergebig.png
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
new file mode 100644
index 0000000..8f3a294
--- /dev/null
+++ b/doc/nl/index.docbook
@@ -0,0 +1,2407 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "kdeextragear-1">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Dutch "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>Het handboek van &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+</authorgroup>
+
+&Sander.Koning; 
+
+<copyright>
+<year
+>2002-2005</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2005-01-30</date>
+<releaseinfo
+>0.9.87</releaseinfo>
+
+
+<abstract>
+<para
+></para>
+<para
+>&kdiff3; is een hulpmiddel om bestanden en mappen te vergelijken en samen te voegen dat <itemizedlist>
+<listitem
+><para
+>twee of drie tekstbestanden of mappen vergelijkt en samenvoegt,</para
+></listitem>
+<listitem
+><para
+>de verschillen regel-voor-regel en teken-voor-teken(!) aangeeft,</para
+></listitem>
+<listitem
+><para
+>een automatische samenvoegfunctie biedt,</para
+></listitem>
+<listitem
+><para
+>een editor heeft voor het comfortabel oplossen van samenvoegconflicten,</para
+></listitem>
+<listitem
+><para
+>netwerktransparantie via KIO biedt,</para
+></listitem>
+<listitem
+><para
+>opties heeft voor het accentueren of verbergen van wijzigingen in witruimte of commentaar,</para
+></listitem>
+<listitem
+><para
+>Unicode, UTF-8 en andere bestandscoderingen ondersteunt.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Dit document beschrijft KDiff3 versie 0.9.87. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>verschil</keyword>
+<keyword
+>samenvoegen</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>drievoudig verschil</keyword>
+<keyword
+>vergelijken</keyword>
+<keyword
+>bestanden</keyword>
+<keyword
+>mappen</keyword>
+<keyword
+>versiebeheer</keyword>
+<keyword
+>drievoudig samenvoegen</keyword>
+<keyword
+>verschillen in regels</keyword>
+<keyword
+>synchroniseren</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>netwerktransparant</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>witruimte</keyword>
+<keyword
+>commentaar</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Inleiding</title>
+<sect1 id="why"
+><title
+>Alweer een front-end voor diff?</title>
+<para
+>Er bestaan diverse grafische hulpmiddelen voor diff. Waarom KDiff3 gebruiken? Laat me uitleggen waarom ik het geschreven heb. </para
+><para
+>KDiff3 begon omdat ik een moeilijke samenvoegoperatie moest doen. Samenvoegen is nodig als diverse mensen aan dezelfde bestanden in een project werken. Een samenvoeging kan enigszins geautomatiseerd worden, als het samenvoeghulpmiddel daartoe niet alleen de nieuwe, gewijzigde bestanden heeft ("takken") maar ook het originele bestand ("basis"). Het samenvoeghulpmiddel kiest automatisch een verandering die alleen in één tak is gedaan. Als diverse mensen dezelfde regels veranderen, detecteert het samenvoeghulpmiddel een conflict dat handmatig opgelost moet worden. </para
+><para
+>De samenvoeging was moeilijk omdat één van de helpers veel dingen had gewijzigd en de insprong op veel plaatsen had verbeterd. Een andere helper had ook veel tekst in hetzelfde bestand veranderd, hetgeen in diverse samenvoegconflicten resulteerde. </para
+><para
+>Het hulpmiddel dat ik toen gebruikte toonde alleen de gewijzigde regels, maar niet wat er in die regels was gewijzigd. En er was geen informatie over of alleen de insprong gewijzigd was. Het samenvoegen was een kleine ramp. </para
+><para
+>Dus dat was het begin. De eerste versie kon verschillen binnen een regel en verschillen in witruimte tonen. Later werden veel andere mogelijkheden toegevoegd om het nut te vergroten. </para
+><para
+>Als u bijvoorbeeld snel wat tekst wilt vergelijken, kunt u het naar het klembord kopiëren en in een van de vergelijkingsvensters plakken. </para
+><para
+>Een optie die veel werk vereiste was het vergelijken en samenvoegen van mappen, dat het programma bijna in een bestandsverkenner veranderde. </para
+><para
+>Ik hoop dat KDiff3 ook voor u werkt. Veel plezier! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Schermafdrukken en mogelijkheden</title>
+<para
+>Deze schermafdruk toont het verschil tussen twee tekstbestanden</para>
+<para
+>(met een vroege versie van KDiff3):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>3-voudig samenvoegen wordt volledig ondersteunt. Dit is nuttig als twee mensen code onafhankelijk wijzigen. Het originele bestand (de basis) wordt gebruikt om KDiff3 te helpen bij het automatisch selecteren van de goede wijzigingen. In de samenvoeg-editor onder de verschillenvensters kunt u conflicten oplossen, terwijl u de uitvoer ziet die dat oplevert. U kunt zelfs de uitvoer wijzigen. Deze schermafdruk toont het samenvoegen van drie invoerbestanden: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>KDiff3 helpt u ook bij het vergelijken en samenvoegen van complete mappen. Deze schermafdruk toont KDiff3 gedurende het samenvoegen van een map. </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Meer mogelijkheden</title>
+<sect2
+><title
+>Verschillen regel-voor-regel en teken-voor-teken tonen</title>
+<para
+>Door de mogelijkheden van een grafisch kleurenbeeldscherm te gebruiken toont KDiff3 u precies wat het verschil is. U zult dit prettig vinden als u veel code moet doornemen. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Verschillen in witruimte in één oogopslag zien</title>
+<para
+>Spaties en tabs die verschillen worden getoond. Als regels alleen in de hoeveelheid witruimte verschillen kunt u dit in één oogopslag zien in de overzichtskolom aan de linkerkant. (Geen zorgen meer als mensen de insprong veranderen.) </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Drievoudig verschil</title>
+<para
+>Drie bestanden analyseren en zien waar ze verschillen. </para
+><para
+>De vensters links, midden en rechts heten A, B en C en zijn respectievelijk blauw, groen en magenta gekleurd. </para
+><para
+>Als één bestand hetzelfde is en één bestand verschilt op een regel geeft de kleur aan welk bestand verschilt. De rode kleur geeft aan dat beide andere bestanden verschillen. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Comfortabel samenvoegen van twee of meer invoerbestanden</title>
+<para
+>U kunt KDiff3 gebruiken om twee of drie invoerbestanden samen te voegen en het samenvoegen zo veel mogelijk automatisch te laten verlopen. Het resultaat wordt getoond in een bewerkbaar venster waarin de meeste conflicten met een enkele muisklik opgelost kunnen worden: kies de knoppen A/B/C uit de knoppenbalk om de bron te kiezen die gebruikt moet worden. U kunt hier ook meer dan één bron kiezen. Aangezien dit uitvoervenster een editor is, kunnen ook conflicten die verdere correctie vereisen hier uitgevoerd worden zonder een extra hulpmiddel. </para>
+</sect2>
+
+<sect2
+><title
+>En...</title>
+<itemizedlist>
+   <listitem
+><para
+>Snelle navigatie via knoppen.</para
+></listitem>
+   <listitem
+><para
+>Een muisklik in een samenvattingskolom synchroniseert alle vensters om dezelfde positie te laten zien.</para
+></listitem>
+   <listitem
+><para
+>Selecteer en kopieer vanuit elk venster en plak het in het samengevoegde resultaatvenster.</para
+></listitem>
+   <listitem
+><para
+>Een overzichtskolom die toont waar de wijzigingen en conflicten zijn.</para
+></listitem>
+   <listitem
+><para
+>De kleuren zijn aan te passen aan uw specifieke voorkeuren.</para
+></listitem>
+   <listitem
+><para
+>Aanpasbare tabgrootte.</para
+></listitem>
+   <listitem
+><para
+>Een optie om spaties in plaats van tabs in te voegen.</para
+></listitem>
+   <listitem
+><para
+>Bestanden comfortabel openen via een dialoogvenster of bestanden opgeven op de opdrachtregel.</para
+></listitem>
+   <listitem
+><para
+>Zoeken naar tekenreeksen in alle tekstvensters. Zoek (Ctrl-F) en Volgende zoeken (F3).</para
+></listitem>
+   <listitem
+><para
+>De regelnummers voor elke regel tonen. </para
+></listitem>
+   <listitem
+><para
+>Het klembord plakken of tekst in een verschil-invoervenster slepen.</para
+></listitem>
+   <listitem
+><para
+>Netwerktransparantie via KIO.</para
+></listitem>
+   <listitem
+><para
+>Kan gebruikt worden als verschillentoner in KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Regelafbreking voor lange regels.</para
+></listitem>
+   <listitem
+><para
+>Ondersteuning voor Unicode, UTF-8 en andere coderingen.</para
+></listitem>
+   <listitem
+><para
+>Ondersteuning voor talen die rechts-naar-links schrijven.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Documentatie voor bestandsvergelijking en -samenvoeging</title>
+
+<sect1 id="commandline"
+><title
+>Opdrachtregel-opties</title>
+
+<sect2
+><title
+>2 bestanden vergelijken: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>2 bestanden samenvoegen: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2</replaceable
+> -o <replaceable
+>uitvoerbestand</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>3 bestanden vergelijken: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2 bestand3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>3 bestanden samenvoegen: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2 bestand3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>bestand1 bestand2 bestand3</replaceable
+> -o <replaceable
+>uitvoerbestand</replaceable
+>
+</screen>
+<para
+>Merk op dat <replaceable
+>bestand1</replaceable
+> als basisbestand voor <replaceable
+>bestand2</replaceable
+> en <replaceable
+>bestand3</replaceable
+> gebruikt zal worden. </para>
+</sect2>
+
+<sect2
+><title
+>Speciaal geval: bestanden met dezelfde naam </title>
+<para
+>Als alle bestanden dezelfde naam hebben maar zich in verschillende mappen bevinden, kunt u typewerk besparen door de bestandsnaam alleen voor het eerste bestand op te geven. Bijvoorbeeld: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>map1/bestandsnaam map2 map3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Opdrachtregel voor het vergelijken of samenvoegen van mappen: </title>
+<para
+>Dit lijkt er erg op, maar gaat nu over mappen.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>map1 map2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>map1 map2</replaceable
+> -o <replaceable
+>doelmap</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>map1 map2 map3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>map1 map2 map3</replaceable
+> -o <replaceable
+>doelmap</replaceable
+>
+</screen>
+<para
+>Voor het vergelijken en samenvoegen van mappen kunt u <link linkend="dirmerge"
+>hier</link
+> verder lezen.</para>
+</sect2>
+
+<sect2
+><title
+>Voor meer informatie over opdrachtregel-opties gebruikt u: </title>
+<screen
+><command
+>kdiff3</command
+> --help
+Opties:
+  -m, --merge               De invoer samenvoegen.
+  -b, --base bestand        Expliciet basisbestand (voor compatibiliteit).
+  -o, --output bestand      Uitvoerbestand. Impliceert -m. Bijv: -o nieuw.txt
+  --out bestand             Uitvoerbestand. Voor compatibiliteit met bepaalde programma's.)
+  --auto                    Geen GUI als alle conflicten automatisch te doen zijn. (Vereist -o)
+  --qall                    Los conflicten niet automatisch op. (Voor compatibiliteit...)
+  --L1 alias1               Zichtbare naamvervanging voor invoerbestand1 (basis).
+  --L2 alias2               Zichtbare naamvervanging voor invoerbestand 2.
+  --L3 alias3               Zichtbare naamvervanging voor invoerbestand 3.
+  -L, --fname alias         Alternatieve zichtbare naamvervanging. Eenmaal voor elke invoer opgeven..
+  -u                        Geen effect. Voor compatibiliteit met bepaalde programma's.
+</screen>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Het venster "Openen"</title>
+<para
+>Aangezien veel bestanden geselecteerd moeten kunnen worden, heeft het programma een speciaal dialoogvenster hiervoor: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>In dit dialoogvenster kunt u de bestandsnamen met de hand wijzigen, een bestand via de bladeraar kiezen ("Bestand...") of recente bestanden via de afrolmenu's kiezen. Als u het dialoogvenster opnieuw opent, blijven de huidige bestandsnamen staan. Het derde invoerbestand is niet verplicht. Als het item bij "C" leeg blijft, wordt slechts een verschillenanalyse op twee bestanden uitgevoerd. </para
+><para
+>U kunt ook een map kiezen met "Map...". Als voor A een map opgegeven is wordt een vergelijking/samenvoeging op mappen gestart. Als A een bestand opgeeft maar B, C of de uitvoer een map opgeeft, gebruikt KDiff3 de bestandsnaam van A in de opgegeven mappen. </para
+><para
+>Als "Samenvoegen" geselecteerd is, kunt u de regel "Uitvoer" bewerken. Maar het is niet nodig om direct de uitvoerbestandsnaam op te geven. U kunt hiermee ook wachten tot bij het opslaan. </para
+><para
+>De knop "Instellen..." opent het optievenster, waarmee u de opties kunt instellen voordat de analyse gestart wordt. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Invoer plakken en slepen</title>
+<para
+>Soms wilt u tekstdelen die niet in een eigen bestand staan vergelijken. KDiff3 biedt u ook de mogelijkheid tekst vanaf het klembord in een vergelijkingsvenster te plakken. De vergelijkingsanalyse begint dan direct. In het venster "Openen" hoeft u dan geen bestanden op te geven, sluit dit gewoon met "Annuleren". </para
+><para
+>U kunt ook slepen en neerzetten: Sleep een bestand uit een bestandsbeheerder of geselecteerde tekst uit een editor en zet deze neer in een verschillenvenster. </para
+><para
+>Wat is het idee? Soms bevat een bestand twee gelijksoortige functies, maar bekijken hoe gelijk ze werkelijk zijn is een grote moeite als u eerst twee bestanden moet maken en deze dan moet laden. Nu kunt u eenvoudigweg de relevante secties kopiëren, plakken, en vergelijken. </para
+><para
+>Merk op: Momenteel kunt u niets uit KDiff3 slepen. Alleen slepen naar de vergelijkingsinvoer wordt ondersteund. </para
+><para
+>Waarschuwing: Sommige editors interpreteren slepen en neerzetten in een ander programma nog steeds als knippen (in plaats van kopiëren) en plakken. Uw originele gegevens kunnen daardoor verloren gaan. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>De informatie in de invoervensters interpreteren</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Bovenaan elk tekstvenster staat de "inforegel". De inforegels van de invoervensters bevatten een letter "A", "B" of "C", de bestandsnaam en het regelnummer van de eerste zichtbare regel in het venster. (Merk op dat venster "C" optioneel is.) Elke inforegel verschijnt in een aparte kleur. (Als de paden te lang zijn om te passen, kunt u de muis op de inforegel plaatsen voor een hulpballon die de complete naam toont.) </para
+><para
+>De drie invoervensters krijgen de letters "A", "B" en "C". "A" heeft de kleur blauw, "B" is groen en "C" is magenta. (Dit zijn de standaardkleuren, u kunt ze wijzigen via het menu Instellingen.) </para
+><para
+>Als er een verschil opgemerkt wordt, toont de kleur welk invoerbestand er verschilt. Als beide andere invoerbestanden verschillen is de kleur die dit aangeeft standaard rood ("Conflictkleur" in Instellingen). Dit kleurenschema is vooral handig in het geval van drie invoerbestanden, hetgeen u zult zien in de volgende sectie (<link linkend="merging"
+>Samenvoegen</link
+>). </para
+><para
+>Links van elke tekst staat een "samenvattingskolom". Als er verschillen op een regel opgetreden zijn geeft deze kolom de respectievelijke kleur aan. Voor een verschil alleen in witruimte is de samenvatting geblokt. Voor programmeertalen waar witruimte niet zo belangrijk is, is dit nuttig om te zien of er iets belangrijks veranderd is. (In C/C++ is witruimte alleen interessant binnen tekenreeksen, commentaar, voor de preprocessor, en sommige zeer uitzonderlijke situaties.) </para
+><para
+>De verticale lijn die de overzichtskolom en de tekst scheidt wordt onderbroken als het invoerbestand daar geen regels heeft. Als regelafbreking ingeschakeld is, wordt deze lijn gestippeld voor afgebroken regels. </para
+><para
+>Aan de rechterkant is een "overzichts"-kolom zichtbaar links van de verticale schuifbalk. Deze toont gecomprimeerd de samenvattingskolom van invoer "A". Alle verschillen en conflicten zijn in één oogopslag zichtbaar. Als er slechts twee invoervensters gebruikt worden, verschijnen alle verschillen in rood omdat elk verschil dan een conflict is. Een zwarte rechtoek omrandt het zichbare deel van de invoer. Voor zeer lange invoerbestanden, waarbij het aantal regels groter is dan de hoogte van de overzichtskolom in pixesl, delen diverse invoerregels één overzichtsregel. Een conflict heeft dan topprioriteit boven eenvoudige verschillen, die prioriteit hebben boven geen wijziging, zodat geen verschil of conflict verloren gaat. Door in deze overzichtskolom te klikken wordt de bijbehorende tekst getoond. </para>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Samenvoegen en het editorvenster voor samenvoegingsuitvoer</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Het editorvenster voor de samenvoegingsuitvoer (onder de verschil-invoervensters) heeft ook een inforegel bovenaan met "Uitvoer:", de bestandsnaam en "[gewijzigd]" als u iets bewerkt hebt. Meestal bevat dit wat tekst door de automatische samenvoegingsfunctie, maar vaak ook conflicten. </para
+><para
+>!!! Opslaan is niet mogelijk todat alle conflicten opgelost zijn !!! (Gebruik de knoppen "Ga naar vorig/volgend onopgelost conflict" om de overgebleven conflicten te vinden.) </para
+><para
+>Met maar twee invoerbestanden is elk verschil ook een conflict dat handmatig opgelost moet worden. </para
+><para
+>Met drie invoerbestanden wordt het eerste bestand als basis gebruikt, en het tweede en derde bestand bevatten wijzigingen. Als op een bepaalde regel alleen invoer B of C gewijzigd is, maar niet beide, wordt de veranderde bron gekozen. Alleen als B en C op dezelfde regel veranderd zijn, detecteert het hulpmiddel een conflict dat handmatig opgelost moet worden. Als B en C hetzelfde zijn, maar niet hetzelfde als A, wordt C gekozen. </para
+><para
+>Het editorvenster voor samenvoegingsuitvoer heeft ook links een samenvattingskolom. Deze toont de letter van de invoer waaruit een regel geselecteerd is of niets als alledrie de bronnen gelijk waren op die regel. Bij conflicten wordt een vraagteken "?" getoond en de regel toont dan "&lt;Samenvoegconflict&gt;", het geheel in rood. Omdat conflicten regel voor regel oplossen erg lang duurt, worden de regels gegroepeerd in groepen die dezelfde verschil- en conflictkenmerken hebben, Alleen-witruimte-conflicten worden gescheiden van niet-witruimte-conflicten om het samenvoegen van bestanden waarin de insprong gewijzigd is, gemakkelijker te maken. </para
+><para
+>Als u met de linkermuisknop in een samenvattingskolom klikt, wordt de groep die bij die regel hoort geselelecteerd in alle vensters en wordt het begin van de groep getoond. (Dit kan een plaatsveranderind in de vensters veroorzaken als het begin van de groep niet zichtbaar is.) Deze groep wordt dan de "huidige groep", en wordt geaccentueerd met de achtergrond voor "Huidig bereik". Verder verschijnt een zwarte balk links van de tekst. </para
+><para
+>Merk op dat de invoerselector de letters "A", "B" en "C" in de knoppenbalk bevat. Als u op een knop in de invoerselector klikt, worden de regels van die invoer toegevoegd aan het eind van de geselecteerde groep als de groep die bron nog niet bevatte. Anders worden de regels uit die invoer verwijderd. </para
+><para
+>Daarnaast kunt u direct elke regel bewerken. De samenvattingskolom toont een "m" voor elke regel die gewijzigd is. </para
+><para
+>Soms verschijnt de tekst "&lt;Geen regel in de bron&gt;" in een regel als die ofwel door automatisch samenvoegen ofwel door bewerken verwijderd is, en er geen andere regels in die groep overblijven. Dit is een plaatshouder voor de groep voor als u zich bedenkt en weer een bron aangeeft. De tekst verschijnt niet in het opgeslagen bestand of in gekopieerde of geplakte selecties. </para
+><para
+>De tekst "    Samenvoegconflict&lt;" verschijnt in het klembord als u tekst met zo'n regel kopieert en plakt. Maar wees alsnog voorzichtig.            &lt; </para
+><para
+>Het normale samenvoegen begint door het automatisch oplossen van eenvoudige conflicten. Maar het menu "Samenvoegen" biedt wat acties voor andere veelvoorkomende zaken. Als u dezelfde bron voor de meeste conflicten wilt gebruiken, kunt u "A", "B" of "C" overal kiezen, of alleen voor de overgebleven niet-opgeloste conflicten, of voor de niet-opgeloste witruimteconflicten. Als u elk apart onderscheid zelf wilt bepalen, kunt u "Elk onderscheid maken bij conflicten" instellen. Of als u terug wilt gaan naar de automatische keuzes van KDiff3 kiest u "Eenvoudige conflicten automatisch oplossen". KDiff3 herstart het samenvoegen dan. Voor acties die uw vorige wijzigingen aanpassen vraagt KDiff3 om uw instemming alvorens door te gaan. </para
+><para
+>Merk op: als u één van de bronnen voor onopgeloste witruimte-conflicten kiest, en de optie "Getallen negeren" of "C/C++ commentaar negeren" is gekozen, dan worden wijzigingen in getallen respectievelijk commentaar ook als witruimte behandeld. </para>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigatie en bewerken</title>
+<para
+>Veel navigatie doet u met de schuifbalken en de muis maar u kunt ook met de toetsen navigeren. Als u in een venster klikt, kunt u de pijltoesen links, rechts, omhoog en omlaag en Page Up, Page Down, Home, End, Ctrl-Home en Ctrl-End gebruiken als in andere programma's. De overzichtskolom naast de verticale schuifbalk van de invoerbestanden kan ook voor navigatie gebruikt worden door erin te klikken. </para
+><para
+>U kunt ook een wielmuis gebruiken om omhoog en omlaag te bladeren. </para
+><para
+>In de uitvoereditor kunt u ook de andere toetsen gebruiken om de tekst te bewerken. U kunt tussen invoeg- en overschrijfmodus wisselen met de toets Insert. (Standaard is invoegmodus.) </para
+><para
+>Een klik met de linker muisknop in een samenvattingskolom synchroniseert alle vensters zodat ze het begin van dezelfde groep regels tonen (zoals uitgelegd in de sectie <link linkend="merging"
+>Samenvoegen</link
+>). </para
+><para
+>De knoppenbalk heeft ook zeven navigatieknoppen waarmee u naar het huidige/eerste/laatste verschil kunt springen, naar het volgende/vorige verschil (Ctrl-omlaag/Ctrl-omhoog), naar het volgende/vorige conflict (Ctrl-PageDown/Ctrl-PageUp), of naar het volgende/vorige onopgeloste conflict. Merk op dat voor KDiff3 een "conflict" dat niet automatisch werd opgelost bij het begin van het samenvoegen een "conflict" blijft, zelfs als het wordt opgelost. Vandaar de noodzaak om "onopgeloste conflicten" te onderscheiden. </para
+><para
+>Er is ook een knop "Automatisch naar het volgende onopgeloste conflict gaan" (Automatisch doorgaan). Als u dit inschakelt, springt KDiff3 automatisch naar het volgende onopgeloste conflict, zodra u een bron hebt geselecteerd. Dit kan helpen als u altijd slechts één bron wilt kiezen. Als u beide bronnen nodig hebt, of als u na het kiezen nog wilt wijzigen, wilt u deze optie waarschijnlijk uitschakelen. Voordat u naar het volgende onopgeloste conflict gaat, toont KDiff3 u korte tijd het effect van uw keuze. Deze tijd is instelbaar in de Verschil- en samenvoeginstellingen: de tijd voor "Automatisch doorgaan" is instelbaar in milliseconden tussen 0 en 2000. Tip: Niet te veel klikken? Kies een korte tijdsduur voor Automatisch doorgaan en de sneltoetsen Ctrl-1/2/3 om A/B/C voor conflicten te selecteren. </para>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Selecteren, kopiëren en plakken</title>
+<para
+>De invoervensters tonen geen cursor, dus selecteren moet gedaan worden met de muis door met de linkermuisknop aan het begin te klikken, de muisknop ingedrukt te houden en naar het eind te bewegen, waar u de muisknop weer loslaat. U kunt ook een woord selecteren door erop te dubbelklikken. In de samenvoegeditor kunt u ook met het toetsenbord selecteren met Shift en de pijltoetsen. </para
+><para
+>Om naar het klembord te kopiëren moet u de knop "Kopiëren" kiezen (Ctrl-C of Ctrl-Insert). Maar er bestaat een optie "Selectie automatisch kopiëren". Als deze is ingeschakeld, wordt geselecteerde tekst direct naar het klembord gekopieerd. Let er hierbij wel op dat bestaande inhoud van uw klembord niet per ongeluk ongewenst verwijderd wordt. </para
+><para
+>"Knippen" (Ctrl-X of Shift-Delete) kopieert de geselecteerde tekst naar het klembord en verwijdert deze; "Plakken" (Ctrl-V of Shift-Insert) voegt de tekst op het klembord in op de cursorpositie of over de huidige selectie. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Opslaan</title>
+<para
+>Opslaan is alleen toegestaan als alle conflicten opgelost zijn. Als het bestand al bestaat en de optie "Reservekopie" ingeschakeld is, wordt het bestaande bestand hernoemd met een extensie ".orig", een bestaande reservekopie wordt hierbij overschreven. Als u afsluit of een andere verschillenanalyse start en de gegevens nog niet zijn opgeslagen, vraagt KDiff3 u of u wilt opslaan, annuleren of doorgaan zonder opslaan. (KDiff3 vangt geen signalen. Dus als u KDiff3 "kill"t gaan uw gegevens verloren.) </para
+><para
+>Regeleindes worden opgeslagen volgens de normale methode op het onderliggende besturingssysteem. Voor Unix-systemen eindigt elke regel met een 'linefeed' "\n", terwijl op Win32-systemen elke regel met een 'carriage return' en een 'linefeed' eindigt "\r\n". KDiff3 bewaart de regeleindes van de invoerbestanden niet, hetgeen ook betekent dat u KDiff3 niet met binaire bestanden moet gebruiken. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Tekenreeksen zoeken</title>
+<para
+>U kunt naar tekenreeksen zoeken in elk tekstvenster van KDiff3. De opdracht "Zoeken..." (Ctrl-F) in het menu Bewerken opent een venster waarin u de te zoeken tekenreeks kunt opgeven. U kunt ook de vensters opgeven waarin gezocht moet worden. Zoeken begint altijd bovenaan. Gebruik de opdracht "Volgende zoeken" (F3) om naar het volgende voorkomen door te gaan. Als u meerdere vensters opgeeft om in te zoeken wordt het eerste venster van boven naar beneden doorzocht, voordat het volgende venster weer van bovenaf wordt doorzocht, enzovoort. </para>
+</sect1>
+
+
+<sect1 id="options"
+><title
+>Opties</title>
+<para
+>Opties en de recente-bestandenlijst worden opgeslagen als u het programma afsluit, en opnieuw ingelezen als u het start. (Instellingen -> KDiff3 instellen...) </para>
+<sect2
+><title
+>Lettertype</title>
+<para
+>Kies een lettertype met vaste breedte. (Op sommige systemen toont dit dialoogvenster ook lettertypes met variabele breedte, maar die dient u liever niet te gebruiken.) </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Cursief lettertype voor onderscheiden:</emphasis
+></term
+><listitem
+><para
+>Als u dit kiest, worden tekstverschillen getoond met de cursieve versie van het geselecteerde lettertype. Als het lettertype geen cursief ondersteunt, doet dit niets.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Kleuren</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Voorgrondkleur:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk zwart. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Achtergrondkleur:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk wit. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Achtergrondkleur bij verschillen:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk lichtgrijs. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kleur voor A:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk donkerblauw. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kleur voor B:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk donkergroen. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kleur voor C:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk donkermagenta. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kleur voor conflicten:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk rood.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Achtergrondkleur voor huidig bereik:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk lichtgeel.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Achtergrondkleur voor verschillen in huidig bereik:</emphasis
+></term
+><listitem
+><para
+>Gewoonlijk donkergeel.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Op systemen met slechts 16 of 256 kleuren zijn sommige kleuren niet beschikbaar in pure vorm. Op zulke systemen zorgt de knop "Standaard" voor een pure kleur. </para>
+</sect2>
+
+<sect2
+><title
+>Editor-instellingen</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Tab voegt spaties in:</emphasis
+></term
+><listitem
+><para
+>Als dit uitgeschakeld is en u de toets Tab indrukt, wordt een tab-teken ingevoegd, anders het aangegeven aantal spaties.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tabgrootte:</emphasis
+></term
+><listitem
+><para
+>Kan ingesteld worden voor uw specifieke wensen. Standaard is 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatisch inspringen:</emphasis
+></term
+><listitem
+><para
+>Als u Enter drukt wordt de insprong van de vorige regel gebruikt voor de nieuwe. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatische kopieerselectie:</emphasis
+></term
+><listitem
+><para
+>Elke selectie wordt automatisch naar het klembord gekopieerd, u hoeft niet expliciet te kopiëren. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Regeleinde:</emphasis
+></term
+><listitem
+><para
+>Bij het opslaan kunt u opgeven welk regeleinde u verkiest. De standaardinstelling is de gebruikelijke keuze voor het gebruikte besturingssysteem. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Locale-codering gebruiken:</emphasis
+></term
+><listitem
+><para
+>Voor het weergeven van buitenlandse lettertekens. Probeer dit te wijzigen als sommige lettertekens in uw taal niet goed getoond worden. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Instellingen voor vergelijking &amp; samenvoeging</title>
+<para
+>Bij het vergelijken van bestanden, probeert KDiff3 eerst regels te vinden die gelijk zijn in alle invoerbestanden. Alleen gedurende deze stap wordt witruimte mogelijk genegeerd. De tweede stap vergelijkt elke regel. In deze stap wordt witruimte niet genegeerd. Ook gedurende het samenvoegen wordt witruimte niet genegeerd. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>'Carriage return' behouden:</emphasis
+></term
+><listitem
+><para
+>Sommige editors (op sommige systemen) slaan 'carriage returns' ('\r') en 'linefeeds' ('\n') op aan het einde van een regel, terwijl andere alleen de 'linefeed' ('\n') opslaan. Normaal gesproken negeert KDiff3 de 'carriage return', maar dan kunnen bestanden niet dezelfde grootte hebben maar wel gelijk lijken. Als deze optie ingeschakeld is, worden de 'carriage returns' zichtbaar gemaakt en behandeld als witruimte. Bij samenvoegen moet deze optie uit staan. Standaard staat deze optie uit.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Getallen negeren:</emphasis
+></term
+><listitem
+><para
+>Standaard uit. Getaltekens ('0'-'9', '.', '-') worden genegeerd in het eerste deel van de analyse waarin regels worden vergeleken. In het resultaat worden de verschillen wel getoond, maar behandeld als witruimte. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>C/C++ commentaar negeren:</emphasis
+></term
+><listitem
+><para
+>Standaard uit. Wijzigingen in commentaar worden behandeld als wijzigingen in witruimte. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Geen onderscheid hoofd-/kleine letters:</emphasis
+></term
+><listitem
+><para
+>Standaard uit. Verschillen in hoofd-/kleine letters ('A' en 'a') worden behandeld als verschillen in witruimte. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Preprocessorcommando:</emphasis
+></term
+><listitem
+><para
+>Zie <link linkend="preprocessors"
+>de volgende sectie</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Preprocessor-commando alleen voor regelcontroles:</emphasis
+></term
+><listitem
+><para
+>Zie <link linkend="preprocessors"
+>de volgende sectie</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Grondig zoeken:</emphasis
+></term
+><listitem
+><para
+>Doe veel moeite om kleinere onderscheiden te vinden (standaard aan). Dit is waarschijnlijk effectief voor gecompliceerde, grote bestanden. En langzaam voor erg grote bestanden. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Vertraging voor automatisch doorgaan (ms):</emphasis
+></term
+><listitem
+><para
+>Bij het automatisch doorgaan bepaalt deze instelling hoe lang het resultaat van de selectie getoond wordt voordat er naar het volgende onopgeloste conflict gesprongen wordt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Standaardsamenvoeging van witruimtes bij 2/3 bestanden:</emphasis
+></term
+><listitem
+><para
+>Automatisch alle witruimteconflicten oplossen door een gespecificeerd bestand te kiezen. (Standaard is handmatige keuze.) Nuttig als witruimte in veel bestanden niet belangrijk is. Als u dit alleen af en toe nodig hebt kunt u beter "A/B/C voor alle onopgeloste conflicten kiezen" in het menu Samenvoegen kiezen. Merk op dat als u "Getallen negeren" of "C/C++ commentaar negeren" hebt ingeschakeld, deze automatische keuze ook voor conflicten in getallen of commentaar geldt. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Mapsamenvoeging</title>
+<para
+>Deze opties gaan over het doorzoeken van de map en de afhandeling van het samenvoegen: zie <link linkend="dirmergeoptions"
+>Mapvergelijking/samenvoeging</link
+> voor details. </para
+><para
+>Er is hier echter één optie die ook relevant is voor het opslaan van enkele bestanden: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Reservekopiebestanden:</emphasis
+></term
+><listitem
+><para
+>Als een bestand wordt opgeslagen en er al een oudere versie bestaat, wordt het oude bestand hernoemd met een extensie ".orig". Als een oud reservekopiebestand met de extensie ".orig" al bestaat, wordt deze zonder reservekopie verwijderd. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Regio- en taalinstellingen</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Taal:</emphasis
+></term
+><listitem
+><para
+>Past de taal van de gebruikersinterface aan. Het wijzigen van deze optie heeft geen invloed op het huidige programma. U dient KDiff3 af te sluiten en te herstarten om de taal te veranderen. (Deze optie is niet beschikbaar in de KDE-versie van KDiff3 omdat de taal in te stellen is in de globale instellingen van KDE.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Dezelfde codering gebruiken voor alles:</emphasis
+></term
+><listitem
+><para
+>De volgende coderingsopties kunnen apart aangepast worden voor elk item. Als deze optie is ingeschakeld nemen alle waarden deze over. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Lokale codering:</emphasis
+></term
+><listitem
+><para
+>Boven de coderings-selectors komt een opmerking die u vertelt wat de lokale codering is. (Dit is niet aan te passen, maar wordt aangegeven als u uw lokale codering niet weet, maar wel wilt kiezen.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Bestandscodering voor A/B/C:</emphasis
+></term
+><listitem
+><para
+>Pas de bestandscodering voor invoerbestanden aan. Dit heeft effect op hoe speciale tekens geïnterpreteerd worden. Aangezien u elke codering apart kunt instellen, kunt u zelfs bestanden vergelijken en samenvoegen die met verschillende coderingen zijn opgeslagen. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Bestandscodering voor samenvoeguitvoer en opslag:</emphasis
+></term
+><listitem
+><para
+>Als u een bestand hebt bewerkt, kunt op aanpassen met welke codering het weer op schijf wordt opgeslagen. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Bestandscodering voor preprocessorbestanden:</emphasis
+></term
+><listitem
+><para
+>Als u preprocessors opgeeft kunnen deze misschien niet met uw codering werken (bijvoorbeeld: uw bestanden zijn 16-bits unicode en uw preprocessor kan alleen met 8-bits ascii overweg). Met deze optie kunt u de codering van preprocessor-uitvoer opgeven. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Rechts-naar-links-taal</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Diverse</title>
+<para
+>(Deze opties en acties zijn in menu's of in de knoppenbalk beschikbaar.)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Regelnummering tonen:</emphasis
+></term
+><listitem
+><para
+>U kunt kiezen of regelnummers voor de invoerbestanden getoond moeten worden.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Spaties &amp; tabulator-tekens in verschillen tonen:</emphasis
+></term
+><listitem
+><para
+>Soms zijn de zichtbare spaties en tabs storend. U kunt dit uitschakelen.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Witruimte tonen:</emphasis
+></term
+><listitem
+><para
+>Schakel dit uit om accentuering van alleen-witruimte-veranderingen in de tekst of overzichtskolommen uit te schakelen. (Merk op dat dit ook van toepassing is op wijzigingen in getallen of commentaar als de opties "Getallen negeren" of "C/C++ commentaar negeren" actief zijn.) </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Overzichtsopties:</emphasis
+></term
+><listitem
+><para
+>Deze keuzes zijn alleen beschikbaar als u drie bestanden vergelijkt. In normale modus worden alle verschillen getoond in één kleurgecodeerde overzichtskolom. Maar soms bent u speciaal geïnteresseerd in de verschillen tussen slechts twee van deze drie bestanden. Door "A vs B", "A vs C" of "B vs C" te kiezen wordt er een tweede overzichtskolom met de vereiste informatie getoond naast het normale overzicht. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Regels afbreken in vensters met verschillen:</emphasis
+></term
+><listitem
+><para
+>Regels afbreken als hun lengte de breedte van een venster zou overschrijden. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Venster A/B/C tonen:</emphasis
+></term
+><listitem
+><para
+>Soms wilt u de ruimte op het scherm beter gebruiken voor lange regels. Verberg dan de vensters die niet belangrijk zijn. (In het menu Venster.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Splitsen van vensters omschakelen:</emphasis
+></term
+><listitem
+><para
+>Wisselen tussen weergave van verschilvensters naast elkaar (A links van B links van C) of boven elkaar (A boven B boven C). Dit moet ook voor lange regels helpen. (In het menu Venster). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Samenvoegen snel starten:</emphasis
+></term
+><listitem
+><para
+>Soms bekijkt u de onderscheiden en besluit u te willen samenvoegen. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Huidig bestand samenvoegen" in het menu Map werkt ook als u slechts twee bestanden vergelijkt. Een enkele klik start het samenvoegen en gebruikt de bestandsnaam van het laatste invoerbestand als het standaard uitvoerbestand. (Als dit gebruikt wordt om een samenvoeging te herstarten, wordt de uitvoerbestandsnaam behouden.)</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Sneltoetsen instellen</title>
+<para
+>Momenteel ondersteunt alleen de KDE-versie gebruikergedefinieerde sneltoetsen (Menu Instellingen -> Sneltoetsen instellen...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Preprocessor-opdrachten</title>
+<para
+>KDiff3 ondersteunt twee preprocessor-opties. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Preprocessorcommando:</emphasis
+></term
+><listitem
+><para
+>Als een bestand gelezen is, wordt het door deze externe opdracht gesluisd. De uitvoer van deze opdracht is dan zichtbaar in plaats van het originele bestand. U kunt uw eigen preprocessor schrijven om uw specifieke wensen te vervullen. Gebruik dit om storende delen van het bestand weg te halen, of automatisch de insprong te verbeteren, enzovoort. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Preprocessor-commando alleen voor regelcontroles:</emphasis
+></term
+><listitem
+><para
+>Als een bestand gelezen is, wordt het door deze externe opdracht gesluisd. Als een preprocessor-opdracht (zie boven) ook opgegeven wordt, wordt de uitvoer van de preprocessor de invoer van de preprocessor voor regelovereenkomsten. De uitvoer wordt dan alleen gebruikt bij de regelvergelijkingsfase van de analyse. U kunt uw eigen preprocessor schrijven om uw specifieke wensen te vervullen. Elke invoerregel moet een overeenkomende uitvoerregel hebben. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>Het idee is om de gebruiker grotere flexibiliteit te geven bij het instellen van het resultaat. Maar dit vereist een extern programma, en veel gebruikers willen dat niet zelf schrijven. Het goede nieuws is dat <command
+>sed</command
+> of <command
+>perl</command
+> vaak voldoende is. </para>
+<para
+>Voorbeeld: een eenvoudig testgeval: Beschouw het bestand a.txt (6 regels): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> en het bestand b.txt (3 regels): <screen>
+      cg
+      dg
+      eg
+</screen
+> Zonder preprocessor zouden de volgende regels naast elkaar geplaatst worden: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Dit is waarschijnlijk niet gewenst omdat de eerste letter de feitelijk interessante informatie bevat. Om het zoekalgoritme te helpen bij het negeren van de tweede letter kunnen we een preprocessor-opdracht voor regelovereenkomsten gebruiken, die 'g' door 'a' vervangt: <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Met deze opdracht wordt het resultaat van de vergelijking: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Intern wordt het zoeken van bij elkaar passende regels na het uitvoeren van de preprocessor voor regelovereenkomsten gedaan, maar op het scherm is het bestand ongewijzigd. (De normale preprocessor verandert de gegevens ook op het scherm.) </para>
+
+<sect2 id="sedbasics"
+><title
+>De basis van <command
+>sed</command
+></title>
+<para
+>Deze sectie geeft alleen een inleiding op een paar basismogelijkheden van <command
+>sed</command
+>. Zie voor meer informatie <ulink url="info:/sed"
+>info:/sed</ulink
+> of <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Een voorgecompileerde versie voor Windows kunt u vinden op <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Merk op dat de volgende voorbeelden ervan uitgaan dat de opdracht <command
+>sed</command
+> in een map in uw omgevingsvariabele PATH staat. Als dit niet het geval is, dient u het volledige absolute pad voor de opdracht te gebruiken. Merk ook op dat de volgende voorbeelden het enkelvoudige aanhalingsteken (') gebruiken dat niet in Windows werkt. Op Windows dient u in plaats daarvan dubbele aanhalingstekens (") te gebruiken. </para>
+<para
+>In deze context wordt alleen de vervangingsopdracht van <command
+>sed</command
+> gebruikt: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>VERVANGING</replaceable
+>/<replaceable
+>VLAGGEN</replaceable
+>'
+</screen
+> Voordat u een nieuwe opdracht in KDiff3 gebruikt, zou u deze eerst in een console moeten testen. Hiervoor is de opdracht <command
+>echo</command
+> nuttig. Voorbeeld: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Dit voorbeeld toont een zeer eenvoudige sed-opdracht die het eerste voorkomen van "a" door "o" vervangt. Als u alle voorkomens wilt vervangen, hebt u de vlag "g" nodig: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Het symbool "|" is de doorsluisopdracht die de uitvoer van de vorige opdracht naar de invoer van de volgende opdracht doorgeeft. Als u dit wilt uitproberen met een langer bestand kunt u op Unix-systemen<command
+>cat</command
+> gebruiken en <command
+>type</command
+> op Windows-systemen. <command
+>sed</command
+> voert de vervanging op elke regel uit. <screen
+><command
+>cat</command
+> <replaceable
+>bestand</replaceable
+> | <command
+>sed</command
+> <replaceable
+>opties</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Voorbeelden voor het gebruik van <command
+>sed</command
+> in KDiff3</title>
+<sect3
+><title
+>Andere soorten commentaar negeren</title>
+<para
+>Momenteel begrijpt KDiff3 alleen C/C++ commentaar. Met de preprocessoropdracht voor regelovereenkomsten kunt u ook andere soorten commentaar negeren, door ze in C/C++ commentaar om te zetten. Voorbeeld: om commentaar dat met "#" begint te negeren, wilt u deze omzetten naar "//". Merk op dat u hiervoor ook de optie "C/C++ commentaar negeren" moet inschakelen om effect te krijgen. Een goede preprocessoropdracht voor regelovereenkomsten zou dan zijn: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Omdat in <command
+>sed</command
+> het teken "/" een aparte betekenis heeft, is het nodig om het teken "\" voor elke "/" in de vervangende tekenreeks te plaatsen. Soms is de "\" ook nodig om een teken een speciale betekenis te geven of deze juist weg te halen. De enkele aanhalingstekens (') voor en na de vervangingsopdracht zijn nu belangrijk, omdat de shell anders zal proberen sommige speciale tekens als '#', '$' of '\' te interpreteren voordat deze aan <command
+>sed</command
+> worden doorgegeven. Merk op dat u op Windows hier de dubbele aanhalingstekens (") nodig hebt. Windows vervangt andere tekens als '%', dus u moet hier misschien wat experimenteren. </para>
+</sect3>
+<sect3
+><title
+>Niet-hoofdlettergevoelige verschillen</title>
+<para
+>Gebruik de volgende preprocessoropdracht voor regelovereenkomsten om alle invoer naar hoofdletters om te zetten: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Hier is de ".*" een reguliere expressie die met elke tekenreeks overeenkomt en in deze context met alle lettertekens op de regel overeenkomt. De "\1" in de vervangende tekenreeks verwijst naar de overeenkomende tekst binnen het eerste paar "\(" en "\)". De "\U" zet de ingevoegde tekst om in hoofdletters. </para>
+</sect3>
+
+<sect3
+><title
+>Versiebeheer-trefwoorden negeren</title>
+<para
+>CVS en andere versiebeheersystemen gebruiken diverse trefwoorden om automatisch gegenereerde tekenreeksen in te voegen (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Trefwoordvervanging</ulink
+>. Deze volgen allemaal het patroon "$TREFWOORD gegenereerde tekst$". We hebben nu een preprocessoropdracht voor regelovereenkomsten nodig die alleen de gegenereerde tekst verwijdert: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> De "\|" scheidt de mogelijke trefwoorden. U wilt deze lijst misschien aan uw eigen wensen aanpassen. De "\" voor de "$" is nodig omdat anders de "$" met het einde van de regel overeenkomt. </para>
+<para
+>Terwijl u experimenteert met <command
+>sed</command
+> gaat u wellicht deze reguliere expressies begrijpen en op prijs stellen. Ze zijn nuttig omdat er veel andere programma's zijn die soortgelijke dingen ondersteunen.  </para>
+</sect3>
+
+<sect3
+><title
+>Getallen negeren</title>
+<para
+>Getallen negeren is in feite een ingebouwde optie. Maar als een ander voorbeeld is dit de preprocessoropdracht voor regelovereenkomsten: <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Elk teken tussen '[' en ']' komt overeen en wordt vervangen door niets. </para>
+</sect3>
+
+<sect3
+><title
+>Bepaalde kolommen negeren</title>
+<para
+>Soms is een tekst erg strict opgebouwd, en bevat deze kolommen die u altijd wilt negeren, terwijl er andere kolommen zijn die u voor analyse wilt bewaren. In het volgende voorbeeld worden de eerste vijf kolommen (lettertekens) genegeerd, de volgende tien worden bewaard, dan worden er weer vijf genegeerd en de rest van de regel wordt bewaard. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Elke punt '.' komt overeen met een willekeurig teken. De "\1" en "\2" in de vervangende tekenreeks verwijzen naar de overeenkomende tekst in het eerste en tweede paar "\(" en "\)" die de tekst aangeven die bewaard moet worden. </para>
+</sect3>
+
+<sect3
+><title
+>Diverse vervangingen combineren</title>
+<para
+>Soms wilt u diverse vervangingen tegelijk uitvoeren. U kunt dan de puntkomma ';' gebruiken om deze van elkaar te scheiden. Voorbeeld: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+><command
+>perl</command
+> in plaats van <command
+>sed</command
+> gebruiken</title>
+<para
+>In plaats van <command
+>sed</command
+> wilt u wellicht iets anders gebruiken zoals <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGEXP</replaceable
+>/<replaceable
+>VERVANGING</replaceable
+>/<replaceable
+>VLAGGEN</replaceable
+>'
+</screen
+> Maar sommige details zijn anders in <command
+>perl</command
+>. Merk op waar <command
+>sed</command
+> "\(" en "\)" vereist, <command
+>perl</command
+> de eenvoudigere "(" en ")" zonder voorafgaande '\' vereist. Voorbeeld: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Uitvoervolgorde van preprocessors</title>
+<para
+>De data wordt doorgesluisd door alle interne en externe preprocessors, in deze volgorde: </para>
+<itemizedlist>
+<listitem
+><para
+>Normale preprocessor.</para
+></listitem>
+<listitem
+><para
+>Preprocessor voor regelovereenkomsten.</para
+></listitem>
+<listitem
+><para
+>Hoofdletterongevoelig (conversie naar hoofdletters).</para
+></listitem>
+<listitem
+><para
+>Opsporen van C/C++ commentaar.</para
+></listitem>
+<listitem
+><para
+>Getallen negeren.</para
+></listitem>
+<listitem
+><para
+>Witruimte negeren.</para
+></listitem>
+</itemizedlist>
+<para
+>De gegevens zoals die na de normale preprocessor zijn worden bewaard voor weergave en samenvoeging. De andere handelingen wijzigen alleen de gegevens die het verschillenalgoritme voor regelovereenkomsten ziet. </para
+><para
+>Merk op dat, in de zeldzame gevallen waar u een normale preprocessor gebruikt, de preprocessor voor regelovereenkomsten de uitvoer van de normale preprocessor als invoer ziet. </para>
+</sect2>
+
+<sect2
+><title
+>Waarschuwing</title>
+<para
+>De preprocessor-opdrachten zijn vaak erg nuttig, maar net zoals elke andere optie die automatisch uw teksten wijzigt of bepaalde verschillen verbergt, kunt u per ongeluk bepaalde verschillen over het hoofd zien en in het ergste geval belangrijke gegevens vernietigen. </para
+><para
+>Om deze reden vertelt KDiff3 u het als er een normale preprocessor-opdracht wordt gebruikt bij het samenvoegen, en wordt u gevraagd of deze uitgeschakeld moet worden of niet. Maar u wordt niet gewaarschuwd als er een preprocessoropdracht voor regelovereenkomsten actief is. Het samenvoegen is niet voltooid totdat alle conflicten opgelost zijn. Als u "Witruimte tonen" uitgeschakeld hebt, zijn de verschillen die met de preprocessoropdracht voor regelovereenkomsten verwijderd zijn, ook onzichtbaar. Als de knop "Opslaan" inactief blijft tijdens het samenvoegen (door overblijvende conflicten), schakel dan "Witruimte tonen" in. Als u deze minder belangrijke verschillen niet handmatig wilt samenvoegen kunt u "[A|B|C] voor alle onopgeloste witruimteconflicten gebruiken" kiezen uit het menu "Samenvoegen". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Mappen vergelijken en samenvoegen met KDiff3</title>
+<sect1 id="dirmergeintro"
+><title
+>Inleiding</title>
+<para
+>Programmeurs moeten vaak veel bestanden in een map veranderen om hun doel te bereiken. Hierom laat KDiff3 u ook hele mappen recursief vergelijken en samenvoegen! </para
+><para
+>Hoewel het vergelijken en samenvoegen van mappen nogal duidelijk lijkt, zijn er aan paar details die u moet kennen. Het belangrijkste is natuurlijk het feit dat nu door elke handeling veel bestanden gewijzigd kunnen worden. Als u geen reservekopieën van uw originele gegevens hebt, kan het erg moeilijk of zelfs onmogelijk zijn om naar de originele staat terug te keren. Dus voordat u een samenvoeging start, zorg ervoor dat uw gegevens veilig zijn en dat u terug kunt keren. Of u een archief maakt of een versiebeheersysteem gebruikt is uw keuze, maar zelfs ervaren programmeurs en integrators hebben zo nu en dan de oude broncodes nodig. En merk op dat ik (de auteur van KDiff3) mijn best doe, kan ik niet garanderen dat er geen bugs zijn. Volgens de GNU-GPL is er GEEN WAARBORG op welke manier dan ook voor dit programma. Dus wees bescheiden en onthoud: </para>
+<blockquote
+><para>
+   <emphasis
+>Vergissen is menselijk, maar om dingen echt te verknoeien hebt u een computer nodig.</emphasis>
+</para
+></blockquote>
+<para
+>Dus dit kan dit programma voor u doen: KDiff3 ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... leest en vergelijkt twee of drie mappen recursief,</para
+></listitem>
+     <listitem
+><para
+>... houdt speciaal rekening met symbolische koppelingen,</para
+></listitem>
+     <listitem
+><para
+>... laat u door bestanden bladeren door te dubbelklikken,</para
+></listitem>
+     <listitem
+><para
+>... stelt voor elk item een samenvoegingsoperatie voor, die u kunt wijzigen voordat het samenvoegen van de mappen begint,</para
+></listitem>
+     <listitem
+><para
+>... laat u het samenvoegen simuleren en geeft de acties aan die plaats zouden vinden, zonder ze uit te voeren,</para
+></listitem>
+     <listitem
+><para
+>... laat u het samenvoegen doen, en geeft u de mogelijkheid in te springen als er menselijke interactie nodig is,</para
+></listitem>
+     <listitem
+><para
+>... laat u de geselecteerde handling op alle items (F7) of alleen het geselecteerde item (F6) uitvoeren,</para
+></listitem>
+     <listitem
+><para
+>... laat u het samenvoegen voortzetten na handmatige interactie met F7,</para
+></listitem>
+     <listitem
+><para
+>... maakt optioneel reservekopieën met de extensie ".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Mappen vergelijken of samenvoegen</title>
+<para
+>Dit lijkt erg op het vergelijken en samenvoegen van een enkel bestand. U hoeft slechts mappen op de opdrachtregel of in het venster "Openen" te kiezen. </para>
+<sect2
+><title
+>Twee mappen vergelijken/samenvoegen: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>map1 map2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>map1 map2</replaceable
+> -o <replaceable
+>doelmap</replaceable
+>
+</screen>
+<para
+>Als er geen doelmap wordt opgegeven, gebruikt KDiff3 <replaceable
+>map2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Drie mappen vergelijken/samenvoegen </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>map1 map2 map3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>map1 map2 map3</replaceable
+> -o <replaceable
+>doelmap</replaceable
+>
+</screen>
+<para
+>Bij het samenvoegen van drie mappen wordt <replaceable
+>map1</replaceable
+> als basis voor het samenvoegen gebruikt. Als er geen doelmap wordt opgegeven, gebruikt KDiff3 <replaceable
+>map3</replaceable
+> als doelmap voor het samenvoegen.doelmpa  </para>
+
+<para
+>Merk op dat alleen het vergelijken automatisch start, niet het samenvoegen. Hiervoor dient u eerst een menu-item of de toets F7 te gebruiken. (Meer details later.) </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Zichtbare informatie</title>
+<para
+>Terwijl de mappen worden gelezen verschijnt een melding die u over de voortgang informeert.  Als u het inlezen van de mappen annuleert, worden alleen bestanden getoond die tot dan toe zijn vergeleken. </para
+><para
+>Als het inlezen van de mappen klaar is, toont KDiff3 een lijst met de resultaten links ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... en details over het geselecteerde item rechts. </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>De kolom "Naam"</title>
+<para
+>Elk bestand en elke map die tijdens het inlezen gevonden is, wordt hier in een boomstructuur getoond. U kunt een item selecteren door er éénmaal met de muis op te klikken. </para
+><para
+>Standaard zijn de mappen ingeklapt. U kunt ze uitklappen en weer inklappen door op de "+"/"-" te klikken of door op het item te dubbelklikken, of door de linker en rechter pijltoetsen te gebruiken. Het menu "Map" bevat ook twee acties "Alle submappen invouwen" en "Alle submappen uitvouwen" waarmee u alle mappen in één keer kunt inklappen of uitklappen. </para
+><para
+>Als u op een bestand dubbelklikt wordt de bestandsvergelijking gestart en verschijnt het verschillenvenster. </para>
+<para
+>De afbeelding in de naamkolom geeft het bestandstype in de eerste map ("A") aan. Dit kan zijn: </para>
+<itemizedlist>
+     <listitem
+><para
+>Normaal bestand</para
+></listitem>
+     <listitem
+><para
+>Normale map (map-afbeelding)</para
+></listitem>
+     <listitem
+><para
+>Koppeling naar een bestand (bestandsafbeelding met pijl)</para
+></listitem>
+     <listitem
+><para
+>Koppeling naar een map (mapafbeelding met pijl)</para
+></listitem>
+</itemizedlist>
+<para
+>Als het bestandstype anders is in de andere mappen, is dit zichtbaar in de kolommen A/B/C en in het venster dat de details over het geselecteerde item toont. Merk op dat het samenvoegen in zo'n geval niet automatisch gedaan kan worden. Als u het samenvoegen start, wordt u geïnformeerd over zulke problemen. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>De kolommen A/B/C en het kleurenschema</title>
+<para
+>Zoals in de afbeelding te zien is, worden de kleuren rood, groen, geel en zwart gebruikt in de kolommen A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Zwart: Dit item bestaat niet in deze map</para
+></listitem>
+     <listitem
+><para
+>Groen: Nieuwste item.</para
+></listitem>
+     <listitem
+><para
+>Geel: Ouder dan groen, nieuwer dan rood.</para
+></listitem>
+     <listitem
+><para
+>Rood: Oudste item.</para
+></listitem>
+</itemizedlist>
+<para
+>Maar voor items die hetzelfde waren in de vergelijking, is ook de kleur hetzelfde, ook al zijn ze niet even oud. </para
+><para
+>Mappen worden als gelijk beschouwd als alle items die ze bevatten hetzelfde zijn. Dan hebben ze ook dezelfde kleur. De leeftijd van een map wordt niet gebruikt bij het bepalen van de kleur. </para
+><para
+>Het idee voor dit kleurenschema kreeg ik bij <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. De kleuren stellen een blad voor dat groen is als het nieuw is, later geel wordt, en rood wordt als het oud is. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>De kolom "Operatie"</title>
+<para
+>Na het vergelijken van mappen maakt KDiff3 ook een voorstel voor een samenvoegingsoperatie. Dit wordt getoond in de kolom "Operatie". U kunt een operatie wijzigen door erop te klikken. Er verschijnt dan een klein menu waarmee u de operatie voor dat item kunt kiezen. (U kunt ook de meestgebruikte operaties met het toetsenbord kiezen. Ctrl+1/2/3/4/Del kiest respectievelijkg A/B/C/Samenvoegen/Verwijderen.) Deze operatie wordt dan bij het samenvoegen  uitgevoerd. Afhankelijk van de item en de samenvoegmodus zijn er andere operaties beschikbaar. De samenvoegmodus kan zijn: </para>
+<itemizedlist>
+     <listitem
+><para
+>Samenvoegen van drie mappen ("A" wordt als oudere basis van beide beschouwd)</para
+></listitem>
+     <listitem
+><para
+>Samenvoegen van twee mappen</para
+></listitem>
+     <listitem
+><para
+>Synchroniseren van twee mappen (via de optie "Mappen synchroniseren")</para
+></listitem>
+</itemizedlist>
+<para
+>Bij het samenvoegen van drie mappen is het voorstel voor de operatie: Als voor een item ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... alledrie de mappen gelijk zijn: kopiëren vanuit C</para
+></listitem>
+     <listitem
+><para
+>... A en C gelijk zijn maar B niet: Kopiëren vanuit B (of als B niet bestaat, de bestemming verwijderen als deze bestaat)</para
+></listitem>
+     <listitem
+><para
+>... A en B gelijk zijn maar C niet: Kopiëren vanuit C (of als C niet bestaat, de bestemming verwijderen als deze bestaat)</para
+></listitem>
+     <listitem
+><para
+>... B en C gelijk zijn maar A niet: Kopiëren vanuit C (of als C niet bestaat, de bestemming verwijderen als deze bestaat)</para
+></listitem>
+     <listitem
+><para
+>... alleen A bestaat: De bestemming verwijderen (als deze bestaat)</para
+></listitem>
+     <listitem
+><para
+>... alleen B bestaat: Vanuit B kopiëren</para
+></listitem>
+     <listitem
+><para
+>... alleen C bestaat: Vanuit C kopiëren</para
+></listitem>
+     <listitem
+><para
+>... A, B en C niet gelijk zijn: Samenvoegen</para
+></listitem>
+     <listitem
+><para
+>... A, B en C niet hetzelfde bestandstype hebben (bijvoorbeeld, A is een map en B een bestand): "Fout: Conflicterende bestandstypen". Zolang zulke items bestaan kan het samenvoegen van de mappen niet beginnen.</para
+></listitem>
+</itemizedlist>
+<para
+>Bij het samenvoegen van twee mappen is het voorstel voor de operatie: Als voor een item... </para>
+<itemizedlist>
+     <listitem
+><para
+>... beide mappen gelijk zijn: Kopiëren vanaf B</para
+></listitem>
+     <listitem
+><para
+>... A bestaat, maar B niet: Kopiëren vanaf A</para
+></listitem>
+     <listitem
+><para
+>... B bestaat, maar A niet: Kopiëren vanaf B</para
+></listitem>
+     <listitem
+><para
+>... A en B bestaan maar niet gelijk zijn: Samenvoegen</para
+></listitem>
+     <listitem
+><para
+>... A en B niet hetzelfde bestandstype hebben (bijvoorbeeld, A is een map en B een bestand): "Fout: Conflicterende bestandstypen". Zolang zulke items bestaan kan het samenvoegen van de mappen niet beginnen.</para
+></listitem>
+</itemizedlist>
+<para
+>Synchronisatiemodus is actief als er slechts twee mappen en geen expliciet doel zijn opgegeven, en als de optie "Mappen synchroniseren" actief is. KDiff3 kiest dan een standaard operatie zodanig dat beide mappen naderhand hetzelfde zijn. Als voor een item ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... beide mappen gelijk zijn: Niets.</para
+></listitem>
+     <listitem
+><para
+>... A bestaat, maar B niet: A naar B kopiëren</para
+></listitem>
+     <listitem
+><para
+>... B bestaat, maar A niet: B naar A kopiëren</para
+></listitem>
+     <listitem
+><para
+>... A en B bestaan, maar niet gelijk zijn: samenvoegen en het resultaat in beide mappen opslaan. (Voor de gebruiker is de zichtbare naam B, maar KDiff3 kopieert dan B naar A.)</para
+></listitem>
+     <listitem
+><para
+>... A en B niet hetzelfde bestandstype hebben (bijvoorbeeld, A is een map en B een bestand): "Fout: Conflicterende bestandstypen". Zolang zulke items bestaan kan het samenvoegen van de mappen niet beginnen.</para
+></listitem>
+</itemizedlist>
+<para
+>Als twee mappen samengevoegd worden en de optie "Nieuwere kopiëren in plaats van samenvoegen" geselecteerd is, kijkt KDiff3 naar de datums en stelt dan voor om het nieuwere bestand te kiezen. Als de bestanden niet gelijk zijn maar wel gelijke datums hebben, bevat de operatie "Fout: Datums zijn gelijk maar bestanden niet." Zolang zulke items bestaan kan het samenvoegen niet beginnen. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>De statuskolom</title>
+<para
+>Gedurende het samenvoegen wordt het ene bestand na het andere verwerkt. De statuskolom toont "Gereed" bij items waar het samenvoegen is afgerond, en andere teksten als er iets onverwachts gebeurd is. Als het samenvoegen klaar is, dient u een laatste controle te doen om te zien of de status van alle items goed is. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Statistiekkolommen</title>
+<para
+>Als de bestandsvergelijkingsmodus "Volledige analyse" ingeschakeld is in de opties, toont KDiff3 extra kolommen met het aantal onopgeloste en opgeloste conflicten en het aantal (niet-)witruimteconflicten. (De kolom met het aantal apgeloste conflicten wordt alleen getoond bij het vergelijken of samenvoegen van drie mappen.) </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Een samenvoeging doen</title>
+<para
+>U kunt het geselecteerde item (bestand of map) samenvoegen, of alle items. Als u alle keuzes voor de operaties hebt gemaakt (ook in alle submappen) kunt u het samenvoegen starten. </para
+><para
+>Wees erop bedacht dat, als u niet expliciet een doelmap heeft opgegeven, de doelmap "C" is bij het behandelen van drie mappen, "B" bij het samenvoegen van twee mappen, en "A" en/of "B" in sychronisatiemodus. </para
+><para
+>Controleer ook als u een doelmap hebt opgegeven of alle items die zich in de uitvoer zouden moeten bevinden, daadwerkelijk in de boomstructuur staan. Er zijn enkele opties die ervoor zorgen dat bepaalde items uit het vergelijken en samenvoegen van mappen worden weggelaten. Controleer deze opties om onplezierige verrassingen te voorkomen: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Recursieve mappen": Als dit uitgeschakeld is, worden items in submappen niet gevonden.</para
+></listitem>
+     <listitem
+><para
+>"Patroon"/"Anti-patroon": Overeenkomende items al dan niet invoegen</para
+></listitem>
+     <listitem
+><para
+>"Verborgen bestanden uitsluiten"</para
+></listitem>
+     <listitem
+><para
+>"Alleen onderscheid tonen": Bestanden die in alle mappn overeenkomen, verschijnen niet in de boomstructuur, en dus ook niet in de bestemming.</para
+></listitem>
+</itemizedlist>
+<para
+>(In de huidige versie dient u de map handmatig opnieuw in te laten lezen door "Map"->"Opnieuw inlezen" te kiezen, nadat u opties hebt gewijzigd die van invloed zijn op het inlezen van mappen.) </para
+><para
+>Als u tot hier tevreden bent, is de rest eenvoudig. </para
+><para
+>Om alle items samen te voegen: kies "Mapsamenvoeging starten/voortzetten" in het menu "Map" of druk op F7 (sneltoets). Om alleen het huidige item samen te voegen: kies "Operatie uitvoeren voor huidig item" of druk op F6. </para
+><para
+>Als er door conflicterende bestandstypes nog bestanden zijn met ongeldige operaties, verschijnt er een melding, worden die items aangewezen en kunt u een geldige operatie voor die items kiezen. </para
+><para
+>Als u alle items samenvoegt, verschijnt er een dialoogvenster met de opties "Starten", "Simuleren" en "Annuleren". </para>
+<itemizedlist>
+     <listitem
+><para
+>Kies "Simuleren" als u wilt zien wat er gedaan zou worden, zonder dit werkelijk te doen. Er wordt een uitgebreide lijst van alle operaties getoond.</para
+></listitem>
+     <listitem
+><para
+>Kies anders "Doorgaan" om het samenvoegen echt te starten.</para
+></listitem>
+</itemizedlist>
+<para
+>KDiff3 voert dan de gekozen operatie uit op alle items. Als u handmatige actie moet ondernemen (samenvoegen van een enkel bestand) verschijnt er een samenvoegvenster (<link linkend="dirmergebigscreenshot"
+>zie de grote schermafdruk</link
+>). </para
+><para
+>Als u klaar bent met een bestand, kiest u opnieuw "Samenvoegen starten/voortzetten" of drukt u op F7. Als u nog niet hebt opgeslagen, wordt er een dialoogvenster getoond dat u vraagt om dat te doen. KDiff3 gaat dan verder met het volgende item. </para
+><para
+>Als KDiff3 een fout tegenkomt, meldt het dit en wordt de uitgebreide stautsinformatie getoond. Ondaraan deze lijst zullen er wat foutmeldingen staan die u zouden moeten helpen bij het begrijpen van de oorzaak van het probleem. Als u doorgaat met samenvoegen (F7) geeft KDiff3 u de keuze tussen opnieuw proberen of het item overslaan dat het probleem veroorzaakte. Dit betekent dat u, voordat u doorgaat, een andere operatie kunt kiezen of het probleem door andere middelen kunt oplossen. </para
+><para
+>Als het samenvoegen voltooid is, niformeert KDiff3 u hierover via een berichtvenster. </para
+><para
+>Als sommige items afzonderlijk samengevoegd zijn, onthoudt KDiff3 dit (tijdens de samenvoegsessie) en worden deze niet opnieuw samengevoegd als later het samenvoegen voor alle items gestart wordt. Zelfs als het samenvoegen overgeslagen is of er niets is opgeslagen, tellen deze items als voltooid. Alleen als u de samenvoegoperatie wijzigt, wordt het item opnieuw samengevoegd. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Opties voor het vergelijken en samenvoegen van mappen</title>
+<para
+>De voorkeuren van KDiff3 (menu "Instellingen"-&gt;"KDiff3 instellen") bevatten nu een sectie "Mappen samenvoegen" met deze opties: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Recursieve mappen:</emphasis
+></term
+><listitem
+><para
+>Kies of mappen recursief doorzocht moeten worden.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bestandspatroon(en):</emphasis
+></term
+><listitem
+><para
+>Alleen bestanden die hier met een patroon overeenkomen worden in de boom geplaatst. U kunt hier meer dan één patroon opgeven door een puntkomma ";" als scheidingsteken te gebruiken. Geldige jokertekens: '*' en '?' (bijvoorbeeld "*.cpp;*.h"). Standaard is "*". Mappen hoeven niet aan dit patroon te voldoen.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-patroon(en):</emphasis
+></term
+><listitem
+><para
+>Bestanden en mappen die hier met een patroon overeenkomen worden niet in de boom geplaatst. U kunt hier meer dan één patroon opgeven door een puntkomma ";" als scheidingsteken te gebruiken. Geldige jokertekens: '*' en '?'. Standaard is "*.orig;*.o".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>CVS-ignore gebruiken:</emphasis
+></term
+><listitem
+><para
+>Negeer bestanden en mappen die ook door CVS genegeerd zouden worden. Veel automatisch gegenereerde bestanden worden genegeerd door CVS. Het grote voordeel hiervan is dat dit mapspecifiek opgegeven kan worden via een bestand ".cvsignore". (Zie <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Verborgen bestanden en mappen zoeken:</emphasis
+></term
+><listitem
+><para
+>Op sommige bestandssystemen hebben bestanden een attribuut "verborgen". Op andere systemen zorgt een punt "." aan het begin van ene bestandnaam ervoor dat het bestand verborgen is. Met deze optie kunt u deze bestanden al dan niet in de boom laten opnemen. Standaard is aan.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bestandskoppelingen volgen:</emphasis
+></term
+><listitem
+><para
+>Voor koppelingen naar bestanden: Als dit uitgeschakeld is, worden de koppelingen vergeleken. Als dit ingeschakeld is, worden de bestanden achter de koppelingen vergeleken. Standaard is uit.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Mapkoppelingen volgen:</emphasis
+></term
+><listitem
+><para
+>Voor koppelingen naar mappen: Als dit uitgeschakeld is, worden de symbolische koppelingen vergeleken. Als dit ingeschakeld is, worden de koppelingen beschouwd als mappen en recursief ingelezen. (Merk op dat het programmme niet controleert of de koppeling "recursief" is. Dus bijvoorbeeld een map die een koppeling naar zichzelf bevat, zorgt voor een oneindige lus, en na enige tijd, als de "stack" overloopt of al het geheugen op is, voor ene crash van het programma.) Standaard is uit.</para
+></listitem
+></varlistentry
+>   
+   <varlistentry
+><term
+><emphasis
+>Alleen onderscheid tonen:</emphasis
+></term
+><listitem
+><para
+>Alleen de items die niet in alle invoermappen gelijk zijn worden getoond en alleen de gewijzigde bestanden zijn zichtbaar. Bestanden die in alle mappen gelijk zijn werden dus niet gekopieerd tijdens het samenvoegen en als de doelmap de bestanden vóór het samenvoegen niet bevat, mist u wellicht later bestanden. (Deze optie wordt in een volgende versie waarschijnlijk gewijzigd.) Standaard is uit.</para
+></listitem
+></varlistentry>
+
+   <varlistentry
+><term
+><emphasis
+>Bestandsvergelijkingsmodus:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Binaire vergelijking:</emphasis
+></term
+><listitem
+><para
+>Dit is de standaard vergelijkingsmodus. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Volledige analyse:</emphasis
+></term
+><listitem
+><para
+>Doe een volledige analyse van elk bestand en toon de kolommen met statistische informatie. (Aantal opgeloste en onopgeloste, niet-witruimte- en witruimteconflicten.) De volledige analyse is langzamer dan een eenvoudige binaire analyse, en veel langzamer bij bestanden die geen tekst bevatten. (Geef de van toepassing zijnde bestandsantipatronen op.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Wijzigingsdatum vertrouwen:</emphasis
+></term
+><listitem
+><para
+>Als u grote mappen over een langzaam netwerk vergelijkt, kan het sneller om alleen de wijzigingsdatums en bestandsgroottes te vergelijken. Deze snelheidsverbetering brengt echter wat onzekerheid met zich mee. Wees voorzichtig bij het gebruiken van deze optie. Standaard is uit.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Grootte vertrouwen:</emphasis
+></term
+><listitem
+><para
+>Vergelijkbaar met het vertrouwen van de wijzigingsdatum. Er vindt geen echte vergelijking plaats. Twee bestanden worden als gelijk beschouwd als ze dezelfde grootte hebben. Dit is nuttig als de kopieeroperatie de wijzigingsdatum niet intact heeft gehouden. Wees voorzichtig bij het gebruiken van deze optie. Standaard is uit.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Mappen synchroniseren:</emphasis
+></term
+><listitem
+><para
+>Activeert de "synchronisatiemodus" als twee mappen vergeleken worden en er geen expliciete doelmap is opgegeven. In deze modus worden de voorgestelde operaties dusdanig gekezen dat beide bronmappen na de synchronisatie gelijk zijn. Het resultaat van het samenvoegen wordt ook naar beide mappen geschreven. Standaard is uit.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Nieuwere bestanden kopiëren in plaats van samenvoegen:</emphasis
+></term
+><listitem
+><para
+>In plaats van het uitvoeren van de voorlgestelde operatie wordt het nieuwere bestand gekopieerd als er wijzigingen zijn opgetreden. (Dit wordt als onveilig beschouwd, want het veronderstelt dat u weet dat het andere bestand niet ook gewijzigd is. Controleer dit in elk geval.) Standaard is uit.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Reservekopiebestanden:</emphasis
+></term
+><listitem
+><para
+>Als een bestand of gehele map door een andere wordt vervangen of verwijderd vordt, wordt de originele versie hernoemd met de extensie ".orig". Als een oud reservekopiebestand met de extensie ".orig" al bestaat, wordt dit zonder reservekopie verwijderd. Dit beïnvloedt ook het normale samenvoegen van enkele bestanden, niet alleen bij het samenvoegen van mappen. Standaard is aan.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Andere functies</title>
+<sect2
+><title
+>Splitsen / Volledig-scherm-modus</title>
+<para
+>Normaal gesproken blijft de lijstweergave voor het samenvoegen van mappen zichtbaar als er een enkel bestand wordt vergeleken of samengevoegd. Met de muis kunt u de splitsbalk verplaatsen die de bestandenlijst van de verschillenvensters scheidt. Als u dat niet wilt, kunt u "Vensters splitsen" in het menu "Map" uitschakelen. U kunt dan "Weergave omschakelen" in het menu "Map" kiezen om tussen de bestandenlijst en de verschillenweergave over te schakelen, die dan het volledige scherm in beslag nemen. </para>
+</sect2>
+<sect2
+><title
+>Een enkel bestand vergelijken of samenvoegen</title>
+<para
+>U dubbelklikt waarschijnlijk het liefst op een bestand om het te vergelijken. Desalniettemin is er hiervoor ook een item in het menu "Map". U kunt ook direct een enkel bestand samenvoegen, zonder de mapsamenvoeging te starten, met "Enkel bestand samenvoegen" in het menu "Map". Als u het resultaat opslaat, wordt de status op "voltooid" gezet, en wordt het bestand niet opnieuw samengevoegd als er een mapsamenvoeging wordt gestart. </para
+><para
+>Merk op dat deze statusinformatie verloren gaat als u de map opnieum inleest (menu "Map", item "Opnieuw inlezen") </para>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Diverse onderwerpen</title>
+<sect1 id="networktransparency">
+<title
+>Netwerktransparantie via KIO</title>
+<sect2
+><title
+>KIO-slaves</title>
+<para
+>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. </para
+><para
+>Voorbeeld: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.verweg.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hacker/archief.tar.gz/map ./map
+</screen>
+</para>
+<para
+>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. </para
+><para
+>Andere interessante KIO-slaves zijn: </para>
+<itemizedlist>
+<listitem
+><para
+>Bestanden op het www (http:),</para
+></listitem>
+<listitem
+><para
+>Bestanden op ftp (ftp:),</para
+></listitem>
+<listitem
+><para
+>Versleutelde bestandsoverdracht (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Windows-bronnen (smb:),</para
+></listitem>
+<listitem
+><para
+>Lokale bestanden (file:).</para
+></listitem>
+</itemizedlist>
+<para
+>Andere (waarschijnlijk minder nuttige) mogelijkheden zijn: </para>
+<itemizedlist>
+<listitem
+><para
+>Man-pagina's (man:),</para
+></listitem>
+<listitem
+><para
+>info-pagina's (info:).</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Hoe URL-adressen te schrijven</title>
+<para
+>Een URL heeft een andere syntaxis vergeleken met paden naar lokale bestanden en mappen. U dient met een aantal zaken rekening te houden: </para>
+<itemizedlist>
+<listitem
+><para
+>Een pad kan relatief zijn en "." of ".." bevatten. Dit kan niet met URL-adressen, die altijd absoluut zijn. </para
+></listitem
+><listitem
+><para
+>Speciale tekens dienen omgezet te worden. ("#"->"%23", spatie->"%20", enz.) Een bestand met de naam "/#foo#" wordt bijvoorbeeldhet URL-adres "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>Als URL-adressen niet werken zoals u verwacht, probeer ze dan eerst in Konqueror te openen. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Mogelijkheden van KIO-slaves</title>
+<para
+>Netwerktransparantie heeft één nadeel: niet alle bronnen hebben dezelfde mogelijkheden. </para
+><para
+>Soms ligt dit aan het bestandssysteem van de server, soms aan het protocol. Een korte lijst van beperkingen: </para>
+<itemizedlist>
+<listitem
+><para
+>Er is soms geen ondersteuning voor koppelingen. </para
+></listitem
+><listitem
+><para
+>Of er is geen manier om te onderscheiden of een koppeling naar een map of een bestand verwijst, er wordt dan altijd van bestanden uitgegaan (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>De bestandsgrootte kan niet altijd bepaald worden. </para
+></listitem
+><listitem
+><para
+>Beperkte ondersteuning voor permissies. </para
+></listitem
+><listitem
+><para
+>Geen mogelijkheden om permissies of wijzigingsdatums te veranderen, zodat de permissies of tijd van een kopie verschillen van het origineel. (Zie de optie "Grootte vertrouwen"). (Permissies of wijzigingsdatum veranderen is alleen mogelijk bij lokale bestanden.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>&kdiff3; als een KPart gebruiken</title>
+<para
+>&kdiff3; is een KPart. Het implementeert momenteel de interface KParts::ReadOnlyPart. </para
+><para
+>Het belangrijkste gebruik is als een verschillentoner in KDevelop. KDevelop start altijd eerst de interne verschillentoner. Om KDiff3 op te starten klikt u met de rechtermuisknop op het verschilvenster en kiest u "In KDiff3Part tonen" uit het contextmenu. </para
+><para
+>Kdiff3 vereist normaal gesproken twee complete bestanden als invoer. Als het als een KPart gebruikt wordt, neemt KDiff3 aan dat het invoerbestand een patch-bestand in het standaard formaat is. KDiff3 haalt dan de twee bestandsnamen op uit het patch-bestand. Minstens één van de twee bestanden moet beschikbaar zijn. KDiff3 roept dan <command
+>patch</command
+> aan om het andere bestand opnieuw te maken. </para
+><para
+>In Konqueror kunt u een patch-bestand selecteren en "Tonen in"-"KDiff3Part" uit het contextmenu kiezen. Merk op dat dit niet werkt als geen van de originele bestanden beschikbaar is, en dat het niet betrouwbaar is als een origineel bestand gewijzigd is sinds het patch-bestand gegenereerd is. </para
+><para
+>Als het als een KPart gestart wordt, biedt KDiff3 alleen een verschillenmodus voor twee bestanden, een kleine werkbalk en een menu. Samenvoegen of mappen vergelijken worden dan niet ondersteund. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Vraag en antwoord</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Waarom heet het "KDiff3"? </para
+></question
+><answer
+><para
+>Hulpmiddelen met de naam "KDiff" en "KDiff2" (nu "Kompare") bestaan al. "KDiff3" moet ook suggereren dat het kan samenvoegen, net als het programma "diff3". </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Waarom heb ik het onder GPL uitgegeven? </para
+></question
+><answer
+><para
+>Ik gebruik al heel lang GPL-programma's en heb veel geleerd door de vele broncodes te bekijken. Dit is daarom mijn dankbetuiging aan alle programmeurs die hetzelfde hebben gedaan of zullen doen. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Sommige knoppen en functies ontbreken. Wat is er mis? </para
+></question
+><answer
+><para
+>U hebt waarschijnlijk vanuit de broncode gecompileerd zonder het juiste KDE-prefix in "configure" op te geven. Standaard wil "configure" in de map /usr/local installeren, maar KDE kan het bronbestand voor de gebruikersinterface dan niet vinden (kdiff3ui.rc). Het bestand README bevat meer informatie over de goede prefix. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Regels die op elkaar lijken maar niet hetzelfde zijn, verschijnen vaak naast elkaar, maar soms niet. Waarom? </para
+></question
+><answer
+><para
+>Regels waar alleen de hoeveelheid witruimte verschillend is worden in eerste instantie als "gelijk" beschouwd, terwijl slechts één verschillend niet-witruimte-teken ervoor zorgt dat de regels "verschillend" zijn. Als op elkaar lijkende regels naast elkaar verschijnen is dit slechts toeval, maar dit is gelukkig vaak het geval. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Waarom moeten alle conflicten opgelost worden voordat het resultaat opgeslagen kan worden? </para
+></question
+><answer
+><para
+>Voor elke gelijke of verschillende sectie onthoudt de editor in het resultaatvenster waar deze begint en eindigt. Dit is nodig omdat dan conflicten handmatig opgelost kunnen worden door op de knop van de broncode (A, B of C) te drukken. Deze informatie is opgelost bij het opslaan als tekst en het is te veel werk om een speciaal bestandsformaat te maken waarmee alle benodigde informatie opgeslagen en ingelezen kan worden. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Waarom heeft de editor in het resultaatvenster geen functie "ongedaan maken"? </para
+></question
+><answer
+><para
+>Dit was tot nu toe te veel werk. U kunt altijd een versie vanuit ene bron (A, B of C) herstellen daar op de overeenkomstige knop te klikken. Voor grote wijzigingen wordt het gebruik van een andere editor sowieso aanbevolen. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Toen ik wat tekst verwijderde, verscheen plotseling "&lt;Geen regel in de bron&gt;" en ik kon dit niet verwijderen. Wat betekent dit en hoe kan ik dit verwijderen? </para
+></question
+><answer
+><para
+>Voor elke gelijke of verschillende sectie onthoudt de editor in het resultaatvenster waar deze begint en eindigt. "&lt;Geen regel in de bron&gt;" betekent dat er niets over is in de sectie (zelfs geen regeleinde). Dit kan tijdens automatisch samenvoegen of tijdens bewerken gebeuren. Dit is geen probleem, want de aanwijzing verschijnt niet in het opgeslagen bestand. Als u de originele bron terug wilt, selecteert u de sectie (klik op de linker overzichtkolom) en klikt u op de knop van de bron met de gewenste inhoud (A, B of C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Waarom ondersteunt KDiff3 geen syntaxis-accentuering? </para
+></question
+><answer
+><para
+>KDiff3 gebruikt al veel kleuren voor het accentueren van verschillen. Meer accentuering zou verwarrend worden, gebruik daar een andere editor voor. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Er staat hier zo veel informatie, maar uw vraag is nog niet beantwoord? </para
+></question
+><answer
+><para
+>Stuur me uw vraag. Ik stel alle opmerkingen op prijs. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Dankbetuigingen en licentie</title>
+
+<para
+>&kdiff3; - Hulpmiddel voor vergelijken en samenvoegen van bestanden en mappen </para>
+<para
+>Programma copyright 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Diverse gave ideeën en bugrapporten van collega's en veel mensen op het Wilde Wilde Web. Bedankt! </para>
+
+<para
+>Documentatie copyright &copy; 2002-2005 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+&meld.fouten;&vertaling.sander; 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installatie</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>&kdiff3; verkrijgen</title>
+
+<para
+>U kunt de laatste versie van KDiff3 downloaden vanaf de webpagina <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>KDiff3 is ook beschikbaar vaar andere platformen. Zie de website voor details. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Vereisten</title>
+
+<para
+>Om alle mogelijkheden van &kdiff3; goed te gebruiken, hebt u &kde; 
+>3.1 nodig. </para
+><para
+>Voor informatie over het draaien van KDiff3 op andere platformen zonder KDE, kijkt u op de <ulink url="http://kdiff3.sourceforge.net"
+>homepage</ulink
+>. </para
+><para
+>Een lijst met wijzigingen kunt u vinden op <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+> http://kdiff3.sourceforge.net/ChangeLog</ulink
+>of in het bestand "ChangeLog" uit het bronpakket. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Compileren en installeren</title>
+
+<para
+>Om &kdiff3; op een systeem met KDE te installeren, typt u het volgende in de basismap van de &kdiff3;-distributie:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-map</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-map</replaceable
+>geeft de map op uw systeem aan waarin KDE zich bevindt. Als u niet zeker bent, kijk dan in het bestand README. </para>
+<para
+>Omdat &kdiff3; <command
+>autoconf</command
+> en<command
+>automake</command
+> gebruikt, zou u geen problemen mogen hebben met compileren. Als u problemen hebt, meld die dan op de mailinglijsten van &kde;.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/nl/iteminfo.png b/doc/nl/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/nl/iteminfo.png
diff --git a/doc/nl/letter_by_letter.png b/doc/nl/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/nl/letter_by_letter.png
diff --git a/doc/nl/merge_current.png b/doc/nl/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/nl/merge_current.png
diff --git a/doc/nl/new.png b/doc/nl/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/nl/new.png
diff --git a/doc/nl/open_dialog.png b/doc/nl/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/nl/open_dialog.png
diff --git a/doc/nl/screenshot_diff.png b/doc/nl/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/nl/screenshot_diff.png
diff --git a/doc/nl/screenshot_merge.png b/doc/nl/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/nl/screenshot_merge.png
diff --git a/doc/nl/triple_diff.png b/doc/nl/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/nl/triple_diff.png
diff --git a/doc/nl/white_space.png b/doc/nl/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/nl/white_space.png
diff --git a/doc/pt/Makefile.am b/doc/pt/Makefile.am
new file mode 100644
index 0000000..141629f
--- /dev/null
+++ b/doc/pt/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = pt
+
+
diff --git a/doc/pt/dirbrowser.png b/doc/pt/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/pt/dirbrowser.png
diff --git a/doc/pt/dirmergebig.png b/doc/pt/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/pt/dirmergebig.png
diff --git a/doc/pt/index.docbook b/doc/pt/index.docbook
new file mode 100644
index 0000000..db2c21f
--- /dev/null
+++ b/doc/pt/index.docbook
@@ -0,0 +1,2975 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "extragear-utils">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Portuguese "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>O Manual do &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl at gmx.de</email>
+</address
+></affiliation>
+</author>
+<othercredit role="translator"
+><firstname
+>Pedro</firstname
+><surname
+>Morais</surname
+><affiliation
+><address
+><email
+>morais@kde.org</email
+></address
+></affiliation
+><contrib
+>Tradução</contrib
+></othercredit
+> 
+</authorgroup>
+
+<copyright>
+<year
+>2002-2006</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2006-05-14</date>
+<releaseinfo
+>0.9.90</releaseinfo>
+
+
+<abstract>
+<para
+>O &kdiff3; é uma ferramenta de diferenças e junção das mesmas para ficheiros e pasta que <itemizedlist>
+<listitem
+><para
+>compara e junta dois ou três ficheiros de texto ou pastas de entrada,</para
+></listitem>
+<listitem
+><para
+>mostra as diferenças linha-a-linha e carácter-a-carácter(!),</para
+></listitem>
+<listitem
+><para
+>oferece uma funcionalidade de junção automática,</para
+></listitem>
+<listitem
+><para
+>tem um editor para resolver confortavelmente os conflitos de junção,</para
+></listitem>
+<listitem
+><para
+>oferece a transparência de rede através do KIO,</para
+></listitem>
+<listitem
+><para
+>tem opções para realçar ou esconder as alterações nos espaços em branco ou comentários,</para
+></listitem>
+<listitem
+><para
+>suporta o Unicode, o UTF-8 e outras codificações de ficheiros,</para
+></listitem>
+<listitem
+><para
+>imprime as diferenças,</para
+></listitem>
+<listitem
+><para
+>suporta as palavras-chave de controlo de versões e de junção do histórico.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Este documento descreve o &kdiff3; versão 0.9.89. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>juntar</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>'diff' triplo</keyword>
+<keyword
+>comparar</keyword>
+<keyword
+>ficheiros</keyword>
+<keyword
+>pastas</keyword>
+<keyword
+>controlo de versões</keyword>
+<keyword
+>junção-por-três-vias</keyword>
+<keyword
+>diferenças-nas-linhas</keyword>
+<keyword
+>sincronizar</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>transparente na rede</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>espaços em branco</keyword>
+<keyword
+>comentários</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Introdução</title>
+<sect1 id="why"
+><title
+>Outra Interface para o Diff?</title>
+<para
+>Existem várias ferramentas de detecção de diferenças. Porquê escolher o &kdiff3;? Deixe que o autor diga porque o escreveu. </para
+><para
+>O &kdiff3; começou porque eu tinha de fazer uma junção difícil. A junção é necessária quando várias pessoas trabalham nos mesmos ficheiros de um projecto. Uma junção poderá de alguma forma ser automatizada, quando a ferramenta de junção não só tem os novos ficheiros modificados (chamados de 'ramificações' ou 'branches'), mas também o ficheiro original (chamado de 'base'). A ferramenta de junção irá escolher automaticamente as modificações que só foram feitas numa das ramificações. Quando vários contribuintes alteram as mesmas linhas, então a  ferramenta de junção detecta um conflito que terá de ser resolvido manualmente. </para
+><para
+>"A junção foi então difícil porque um dos colaboradores alterou várias coisas e corrigiu a indentação em vários sítios. Outro também alterou bastante texto, o que resultou em vários conflitos de junção". </para
+><para
+>"A ferramenta que usei então só mostrava as linhas modificadas, mas não o que tinha sido alterado dentro dessas linhas. E não havia nenhuma informação sobre os locais em que só a indentação tinha sido alterada. A junção foi um pequeno pesadelo por isso". </para
+><para
+>"Daí, foi este o início. A primeira versão podia mostrar as diferenças dentro de uma linha e mostrava as diferenças de espaços em branco. Depois, muitas outras funcionalidades foram adicionada para aumentar a utilidade". </para
+><para
+>"Por exemplo, se você quiser comparar algum texto rapidamente, então poderá copiá-lo para a área de transferência e colá-lo noutra janela de diferenças". </para
+><para
+>"Uma funcionalidade que necessitou de um grande esforço foi a comparação de pastas e a funcionalidade de junção, o que transformou o programa quase num navegador de ficheiros completo". </para
+><para
+>Espero que o &kdiff3; funcione para si também. Divirta-se! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Imagens e Funcionalidades</title>
+<para
+>Esta imagem mostra a diferença entre dois ficheiros de texto</para>
+<para
+>(A usar uma versão anterior do &kdiff3;):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>A junção por 3-vias é suportada por completo. Isto é útil se duas pessoas alterarem o código independentemente. O ficheiro original (a base) é usado para ajudar o &kdiff3; a seleccionar automaticamente as alterações correctas. O editor de junções por baixo das janelas de diferenças permite-lhe resolver os conflitos, enquanto lhe mostra o resultado que você irá obter. Até poderá editar o resultado. Esta imagem mostra três ficheiros de entrada a serem reunidos: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>O &kdiff3; também o ajuda a comparar e a juntar pastas completas. Esta imagem mostra o &kdiff3; durante a junção de pastas: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Mais Funcionalidades</title>
+<sect2
+><title
+>Visualizador de Diferenças Linha-a-Linha e Carácter-a-Carácter</title>
+<para
+>Usando as possibilidades de um ambiente gráfico a cores, o &kdiff3; mostra exactamente o que é a diferença. Quando tiver de fazer várias revisões de código, irá gostar disto. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Ver as Diferenças de Espaços em Branco de uma Vez</title>
+<para
+>Os espaços e as tabulações que são diferentes aparecem visivelmente. Quando as linhas diferem apenas pelo número de espaços em branco, isto poderá ser visto num instante se olhar para a coluna do resumo do lado esquerdo. (Não há mais problemas quando as pessoas mudam a indentação). </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Diferenças Triplas</title>
+<para
+>Analise três ficheiros e veja no que eles diferem. </para
+><para
+>As janelas da esquerda/meio/direita são intituladas A/B/C e têm as cores azul/verde/magenta, respectivamente. </para
+><para
+>Se um dos ficheiros for igual e o outro for diferente numa linha, então a cor mostra qual o ficheiro que é diferente. A cor vermelha indica que ambos os ficheiros são diferentes. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Junção Confortável de Dois ou Três Ficheiros de Entrada</title>
+<para
+>O &kdiff3; pode ser usado para juntar dois ou três ficheiros de entrada e junta automaticamente o máximo possível. O resultado é apresentado numa janela editável em que a maioria dos conflitos poderá ser resolvida com um simples 'click' do rato: Seleccione os botões A/B/C na barra de botões para seleccionar a origem que deverá ser usada. Dado que esta janela de resultado é um editor, até mesmo os conflitos que necessitem de mais correcções poderão ser resolvidos aqui sem necessitarem de outra ferramenta. </para>
+</sect2>
+
+<sect2
+><title
+>E ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Navegação rápida através de botões.</para
+></listitem>
+   <listitem
+><para
+>Um 'click' do rato numa coluna de resumo sincroniza todas as janelas para mostrarem a mesma posição.</para
+></listitem>
+   <listitem
+><para
+>Seleccionar e copiar de qualquer janela para colar na janela do resultado da junção.</para
+></listitem>
+   <listitem
+><para
+>Uma coluna de visão geral que mostra onde estão as alterações e os conflitos.</para
+></listitem>
+   <listitem
+><para
+>As cores são ajustáveis de acordo com as suas preferências específicas.</para
+></listitem>
+   <listitem
+><para
+>Um tamanho de tabulação ajustável.</para
+></listitem>
+   <listitem
+><para
+>Uma opção para inserir espaço em vez de tabulações.</para
+></listitem>
+   <listitem
+><para
+>Abertura confortável dos ficheiros através de uma janela ou da linha de comandos.</para
+></listitem>
+   <listitem
+><para
+>Procurar por sequências de texto em todas as janelas de texto. Procurar (Ctrl-F) e Procurar o Seguinte (F3).</para
+></listitem>
+   <listitem
+><para
+>Mostrar os números de linha para cada linha. </para
+></listitem>
+   <listitem
+><para
+>Colar o conteúdo da área de transferência e arrastar o texto para uma janela de introdução de diferenças.</para
+></listitem>
+   <listitem
+><para
+>Transparência na rede através do KIO.</para
+></listitem>
+   <listitem
+><para
+>Pode ser usado como visualizador de diferenças no KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Mudança de linha para as linhas compridas para as repartir.</para
+></listitem>
+   <listitem
+><para
+>Suporte para o Unicode, UTF-8 e outras codificações.</para
+></listitem>
+   <listitem
+><para
+>Suporte para as línguas escritas da direita-para-esquerda.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Comparação e Junção de Ficheiros</title>
+
+<sect1 id="commandline"
+><title
+>Opções da Linha de Comandos</title>
+
+<sect2
+><title
+>Comparar 2 ficheiros: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Juntar 2 ficheiros: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2</replaceable
+> <option
+>-m</option>
+<command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2</replaceable
+> <option
+>-o</option
+> <replaceable
+>resultado</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Comparar 3 ficheiros: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2 ficheiro3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Juntar 3 ficheiros: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2 ficheiro3</replaceable
+> <option
+>-m</option>
+<command
+>kdiff3</command
+> <replaceable
+>ficheiro1 ficheiro2 ficheiro3</replaceable
+> <option
+>-o</option
+> <replaceable
+>resultado</replaceable
+>
+</screen>
+<para
+>Repare que o <replaceable
+>ficheiro1</replaceable
+> será tratado como base para o <replaceable
+>ficheiro2</replaceable
+> e o <replaceable
+>ficheiro3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Caso especial: Ficheiros com o mesmo nome </title>
+<para
+>Se todos os ficheiros tiverem o mesmo nome mas estiverem em pastas diferentes, poderá reduzir o trabalho de escrita se indicar apenas o nome do ficheiro para o primeiro parâmetro. P.ex.: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>pasta1/ficheiro pasta2 pasta3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Linha de comandos para iniciar uma comparação ou junção de pastas: </title>
+<para
+>É bastante semelhante, mas diz respeito agora apenas às pastas.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2</replaceable
+> <option
+>-o</option
+> <replaceable
+>destino</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2 pasta3</replaceable>
+<command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2 pasta3</replaceable
+> <option
+>-o</option
+> <replaceable
+>destino</replaceable
+>
+</screen>
+<para
+>Para a comparação e junção de pastas, poderá continuar a ler <link linkend="dirmerge"
+>aqui</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Outras opções da linha de comandos</title>
+<para
+>Para mais informações sobre as opções da linha de comandos use</para>
+<screen
+><command
+>kdiff3</command
+> --help
+</screen>
+<para
+>Exemplo do resultado:</para>
+<screen
+><command
+>kdiff3</command
+> --help
+Opções:
+  -m, --merge               Junta o resultado.
+  -b, --base ficheiro       Ficheiro de base explícito. Para compatibilidade com certas ferramentas.
+  -o, --output ficheiro     Ficheiro de resultado. O -m é implícito. P.ex.: -o novo_ficheiro.txt
+  --out ficheiro            O ficheiro de resultado, mais uma vez. (Para compatibilidade com certas ferramentas.)
+  --auto                    Sem interface gráfica se todos os conflitos são resolúveis. (Necessita do -o)
+  --qall                    Não resolve os conflitos automaticamente. (Para compatibilidade...)
+  --L1 nome1                Substituto visível do nome do ficheiro 1 (base).
+  --L2 nome2                Substituto visível do nome do ficheiro 2.
+  --L3 nome3                Substituto visível do nome do ficheiro 3.
+  -L, --fname nome          Um substituto visível alternativo para o nome. Use este uma vez para cada ficheiro de entrada.
+  --cs texto               Substitui uma opção de configuração. Use uma vez para cada opção. P.ex. --cs "AutoAdvance=1"
+  --confighelp              Mostra uma lista com as opções de configuração e os valores actuais.
+  --config ficheiro         Usa um ficheiro de configuração diferente.
+</screen>
+<para
+>A opção <option
+>--cs</option
+> permite-lhe ajustar um valor de configuração que, de outro modo, só é ajustável através das janelas de configuração. Mas tenha em mente que, quando o &kdiff3; então terminar, o valor alterado será gravado com as outras opções. Com o <option
+>--confighelp</option
+>, poderá descobrir os nomes dos itens disponíveis e dos valores actuais.</para>
+<para
+>Através do <option
+>--config</option
+>, poderá indicar um ficheiro de configuração diferente. Quando usar frequentemente o &kdiff3; com opções completamente diferentes, isto permitir-lhe-á mudar rapidamente entre elas.</para>
+</sect2>
+<sect2
+><title
+>Ignorar as opções da linha de comandos</title>
+<para
+>Muitas pessoas querem usar o &kdiff3; com alguns sistemas de controlos de versões. Mas quando esse sistema de controlo de versões chama o &kdiff3;, usando os parâmetros da linha de comandos que o &kdiff3; não reconhece, então o &kdiff3; termina com um erro. A configuração da integração permite indicar parâmetros da linha de comandos que deverão ser ignorados pelo &kdiff3;. Eles irão aparecer na ajuda de utilização, como neste exemplo:</para>
+<screen
+>--<replaceable
+>xpto</replaceable
+>                     Ignorado. (Definido pelo utilizador.)
+</screen>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Opções da linha de comandos a ignorar:</emphasis
+></term
+><listitem
+><para
+>Uma lista de opções, separadas pelo ponto-e-vírgula ';'. Quando alguma destas opções aparecer na linha de comandos, então o &kdiff3; ignorá-la-á e irá executar sem indicar qualquer erro. (Por omissão é "u;query;html;abort").</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Quando isto não for suficiente, então recomenda-se que crie um programa que faça a tradução das opções.</para>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Janela de Abertura</title>
+<para
+>Dado que é necessário seleccionar vários ficheiros, o programa tem uma janela de abertura especial: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>A janela de abertura permite editar os nomes dos ficheiros à mão, seleccionando um ficheiro através do navegador dos ficheiros ("Ficheiro...") ou permite escolher os ficheiros recentes a partir das listas respectivas. Se abrir a janela de novo, então os nomes actuais irão nela permanecer. O terceiro ficheiro de entrada não é obrigatório. Se o item do "C" continuar em branco, então só será efectuada uma análise de diferenças com dois ficheiros. </para
+><para
+>Poderá também seleccionar uma pasta com o "Dir...". Se for indicado como A uma pasta, então será iniciada uma comparação/junção de pastas. Se o A se referir a um ficheiro, mas o B, o C ou o destino corresponderem a pastas, então o &kdiff3; usa o nome do ficheiro em A nas pastas indicadas. </para
+><para
+>Se a "Junção" estiver seleccionada, então o campo "Resultado" fica editável. Mas não é obrigatório indicar o nome do ficheiro do resultado imediatamente. Você poderá também adiar isto até à gravação. </para
+><para
+>O botão "Configurar..." abre a janela de opções, para que possa definir as opções antes de executar a análise. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Colar e Arrastar Dados</title>
+<para
+>Em algumas ocasiões, você poderá querer comparar partes de um texto que não está em nenhum ficheiro próprio. O &kdiff3; também lhe permite colar texto da área de transferência para a janela de introdução de diferenças que esteja em primeiro plano. A análise de diferenças irá ocorrer então. Na janela de abertura, você não irá necessitar de indicar ficheiros, fechando-a então com o "Cancelar". </para
+><para
+>O utilizador também poderá usar o 'drag and drop': Arraste um ficheiro de um gestor de ficheiros ou o texto seleccionado de um editor e arrastá-lo para uma janela de introdução de diferenças. </para
+><para
+>Qual é a ideia? Algumas vezes um ficheiro contém duas funções semelhantes, mas a verificação sobre as semelhanças entre elas é um grande esforço, se você precisar de criar primeiro dois ficheiros e depois carregá-los. Assim, poderá simplesmente copiar, colar e comparar as secções relevantes. </para
+><para
+>Nota: De momento, você não poderá arrastar nada a partir do &kdiff3;. Só é permitido largar dados nas janelas de introdução de diferenças. </para
+><para
+>Atenção: Alguns editores ainda interpretam à mesma o 'drag and drop' noutro programa como o Cortar (em vez do Copiar) e Colar. Os seus dados originais poderão deste modo perder-se. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Comparar os Ficheiros e Interpretar a Informação nas Janelas de Entrada</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<sect2
+><title
+>Linha de Informação</title
+><para
+>No cimo de cada janela de texto existe a sua "linha de informação". As linhas de informação das janelas de introdução de diferenças contêm uma letra "A", "B" ou "C", o nome do ficheiro e o número da primeira linha visível da janela. (Lembre-se que a janela "C" é opcional). Cada linha de informação aparece com uma cor diferente. (Se as localizações forem demasiado extensas para caberem, poderá mover o cursor do rato para cima da linha de informação, de modo a que apareça uma dica com o nome completo). </para
+><para
+>Quando tiver seleccionado outro ficheiro através de navegação ou acabar de editar o nome do ficheiro aqui, carregando para tal em Enter, o novo ficheiro será carregado e comparado com os ficheiros já carregados previamente. </para
+></sect2
+><sect2
+><title
+>Coloração</title
+><para
+>As três janelas de entrada têm atribuídas as letras "A", "B" e "C". O "A" tem uma cor azul, o "B" tem uma verde e o "C" magenta. (Estas são as cores por omissão, mas podem ser alteradas no menu de configuração). </para
+><para
+>Quando é detectada uma diferença, então a cor mostra qual o ficheiro de entrada que é diferente. Quando os outros ficheiros de entrada diferem todos, então a cor usada para exprimir isto é a vermelha por omissão ("Cor do conflito" na Configuração). Este esquema de cores é particularmente útil no caso de três ficheiros de entrada, os quais serão vistos na próxima secção (<link linkend="merging"
+>Juntar</link
+>). </para
+></sect2
+><sect2
+><title
+>Coluna de Resumo</title
+><para
+>À esquerda de cada texto está a "coluna de resumo". Se ocorrerem diferenças numa linha, então a coluna do resumo mostra a cor respectiva. Para uma diferença por espaços em branco, o resumo fica axadrezado. Para as linguagens de programação em que os espaços em branco não são muito importantes, isto é útil para ver de um modo geral se existe algo de importante modificado. (No C/C++, os espaços em branco só são importantes dentro de cadeias de caracteres, comentários, pré-processador e em algumas outras situações esotéricas. </para
+><para
+>A linha vertical que separa a coluna do resumo e o texto é interrompida (tracejada), se o ficheiro de entrada não tiver aí nenhuma linha. Quando a mudança de linha estiver activa, então esta linha vertical aparece ponteada para as linhas repartidas. </para
+></sect2
+><sect2
+><title
+>Coluna de Resumo</title
+><para
+>Do lado direito, aparece uma coluna de "resumo" à esquerda da barra de posicionamento vertical. Ela mostra a coluna de resumo comprimida dos dados de "A". Todas as diferenças e conflitos ficam visíveis numa vista rápida. Quando só são usadas duas janelas de entrada, então todas as diferenças aparecem a vermelho, dado que cada diferença é também um conflito. Um rectângulo preto delimita a parte visível dos dados de entrada. Para as linhas de dados bastante compridas, quando o número de linhas de dados é maior do que a altura da coluna de resumo em pixels, então várias linhas de dados de entrada irão partilhar uma linha de resumo. Um conflito, neste caso, terá então uma prioridade elevada sobre as diferenças simples, que por sua vez têm prioridade sobre a ausência de alterações, como tal não se perde nenhuma diferença ou conflito neste caso. Se carregar nesta coluna de resumo, será mostrado o texto correspondente. </para
+></sect2
+><sect2 id="manualdiffhelp"
+><title
+>Alinhar Manualmente as Linhas</title
+><para
+>Em alguns casos, o algoritmo coloca as linhas erradas a seguir umas às outras. Ou se deseja comparar um pedaço de texto com outro que se encontra numa posição completamente diferente no outro ficheiro. Para esses casos, poderá indicar manualmente ao &kdiff3; para alinhar certas linhas. Marque o texto, com o qual deseja melhorar o alinhamento, com o rato como faria na cópia e colagem na primeira janela de diferenças e escolhe então o "Adicionar o Alinhamento Manual das Diferenças" na janela de "Diferenças" (atalho de teclado "Ctrl-Y") . Irá aparecer uma barra laranja na coluna do resumo, a seguir ao texto escolhido. Repita isto para a segunda e (se disponível) a terceira janela de diferenças. O &kdiff3; irá calcular imediatamente de novo as diferenças sempre que fizer isto, alinhando as linhas escolhidas. Obviamente, algumas das linhas anteriormente correspondentes poderão não corresponder mais de novo. </para
+><para
+>De momento, a junção não suporta a utilização da ajuda de diferenças manual. </para
+></sect2>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Juntar e a Janela do Editor do Resultado da Junção</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>A janela do editor do resultado da junção (por baixo das janelas de introdução de diferenças) também tem uma linha de informação no topo que mostra "Resultado:", o nome do ficheiro e "[Modificado]" se você tiver alterado alguma coisa. Normalmente irá conter algum texto resultante das funcionalidades de junção automática, mas frequentemente irá conter também conflitos. </para
+><para
+>A gravação está desactivada até que todos os conflitos estejam resolvidos. (Use os botões para "Ir para o Conflito por Resolver Anterior/Seguinte" para descobrir os conflitos que faltam.) </para
+><para
+>Com apenas dois ficheiros de entrada, todas as diferenças são também conflitos que necessitam de ser resolvidos manualmente. </para
+><para
+>Com três ficheiros de entrada, o primeiro ficheiro é tratado como a base, enquanto que o segundo e o terceiro contêm as modificações. Quando, em qualquer linha, só o ficheiro B ou o C tiverem sido alterados mas não ambos, então será seleccionada a origem alterada. Só quando o B e o C alteraram as mesmas linhas é que a ferramenta detecta um conflito que deverá ser resolvido manualmente. Quando o B e o C são iguais mas não são o mesmo que o A, é seleccionado o C. </para
+><sect2
+><title
+>A Coluna de Resumo</title
+><para
+>A janela do editor do resultado da junção também tem uma coluna de resumo à esquerda. Mostra a letra do ficheiro de entrada para o qual foi seleccionada a linha ou nada, se todas as três origens são iguais nessa linha. Para os conflitos, ela mostra um ponto de interrogação "?" e a linha mostra "&lt;Conflito na Junção&gt;", tudo a vermelho. Dado que a resolução de conflitos linha a linha poderá levar bastante tempo, as linhas são reunidas em grupos com as mesmas características de diferenças e conflitos. Mas os conflitos só com espaços em branco são separados dos outros conflitos para facilitar a junção dos ficheiros em que a indentação foi alterada em várias linhas. </para
+></sect2
+><sect2 id="synchronise_views"
+><title
+>Configurar o Grupo Actual e Sincronizar a Posição de Visualização da Junção e Diferenças</title
+><para
+>Ao carregar na coluna do resumo com o &LMB; em ambas as janelas, o grupo que pertença a essa linha será seleccionado em todas as janelas e o início desse grupo será mostrado. (Isto poderá envolver um salto de posição automático para a janelas se o início do grupo não estiver visível). Este grupo fica então o "grupo actual". Fica realçado com a "Cor de fundo do intervalo actual" e aparece uma barra preta do lado esquerdo do texto. </para
+></sect2
+><sect2
+><title
+>Escolher as Entras A, B ou C para os Conflitos e Edições Actuais</title
+><para
+>A barra de botões por baixo do menu contém três botões de selecção que contêm as letras "A", "B" e "C". Carregue no selector de entrada para inserir (ou remover se já estiver inserido) as linhas da origem respectiva. Para escolher as linhas de várias entradas, carregue nos botões respectivos pela ordem necessária. Por exemplo, se quiser que as linhas de "B" apareçam antes das linhas de "A" no resultado, carregue primeiro em "B" e depois em "A". </para
+><para
+>Se usar a opção de avanço automático (<link linkend="autoadvance"
+>"Ir automaticamente para o próximo conflito não resolvido após a selecção da fonte"</link
+>), deverá desactivar isto antes de escolher as linhas de várias entradas ou se quiser editar as linhas após a sua escolha. Caso contrário, o &kdiff3; irá saltar para o próximo conflito após a selecção da primeira entrada. </para
+><para
+>Normalmente é útil editar directamente o resultado da junção. A coluna de resumo irá mostrar "m" por cada linha modificada manualmente. Quando, por exemplo, as diferenças estão alinhadas de forma que não seja satisfatório escolher simplesmente as entradas, então poderá marcar o texto necessário e usar a <link linkend="selections"
+>cópia e colagem</link
+> normais para colocar no resultado da junção. </para
+><para
+>Algumas das vezes, quando uma linha é removida tanto por junção automática como por edição e não ficam mais nenhumas linhas nesse grupo, então o texto "&lt;Sem linha de origem&gt;" irá aparecer nessa linha. Isto é apenas um substituto para o grupo, quando decidir mudar de ideias e seleccionar algum texto de origem de novo. Este texto não irá aparecer no ficheiro gravado ou em qualquer selecção que deseje copiar e colar. </para
+><para
+>O texto "&lt;Conflito na Junção&gt;" irá aparecer na área de transferência se copiar e colar algum texto que tenha uma dessas linhas. Mas tenha à mesma cuidado ao fazê-lo. </para
+></sect2
+><sect2
+><title
+>Escolher a Entrada A, B ou C para Todos os Conflitos</title
+><para
+>A junção normal irá começar por resolver os conflitos simples automaticamente. Mas o menu "Juntar" oferece algumas acções para outros usos comuns. Se você tiver de seleccionar a mesma origem para a maioria dos conflitos, então poderá escolher "A", "B" ou "C" em qualquer lado ou apenas para os conflitos que continuem ainda por resolver ou então para os conflitos de espaços em branco por resolver. Se quiser decidir cada um dos deltas por si próprio, poderá "Passar os deltas para conflitos". Ou, se preferir voltar às escolhas automáticas do &kdiff3;, seleccione então a opção "Resolver automaticamente os conflitos simples". Nesse caso, o &kdiff3; irá reiniciar a junção. Para as acções que alteram as suas modificações anteriores, o &kdiff3; pedir-lhe-á uma confirmação antes de prosseguir. </para
+><para
+>Nota: Ao escolher uma das origens para os conflitos que não sejam de espaços em branco e as opções "Ignorar os Números" ou "Ignorar os Comentários de C/C++" forem usadas, então as alterações nos números ou comentários serão tratadas como espaços em branco também. </para
+></sect2
+><sect2 id="vcskeywordsmergesupport"
+><title
+>Junção Automática das Palavras-Chave e do Histórico do Controlo de Versões (Registo)</title
+><para
+>Muitos sistemas de controlo de versões suportam palavras-chave especiais no ficheiro. (p.ex. "&#36;Date: 2006-03-31 15:21:46 +0100 (Sex, 31 Mar 2006) &#36;", "&#36;Header&#36;", "&#36;Author: scripty &#36;", "&#36;Log&#36;" etc.) Durante o envio de novas versões, o sistema de controlo de versões (SCV) muda essas linhas. Por exemplo, o "&#36;Date: 2006-03-31 15:21:46 +0100 (Sex, 31 Mar 2006) &#36;" passará a "&#36;Date: 2006-03-30 17:52:41 +0200 (Thu, 30 Mar 2006) &#36;". Dado que esta linha será diferente em cada versão do ficheiro, iria necessitar de intervenção manual durante a junção. </para
+><para
+>O &kdiff3; oferece a junção automática destes itens. Para as linhas simples que correspondam à opção da "Expressão regular da junção automática" para todos os ficheiros de entrada, o &kdiff3; irá escolher a linha do B ou - se disponível - do C. (Para além disso, é necessário que as linhas em questão se alinhem na comparação e a linha anterior não contenha conflitos). Esta junção automática pode tanto correr automaticamente após o início de uma junção (active a opção "Executar a junção automática da expressão regular no início da junção") como posteriormente, através do menu de junção "Executar a Junção Automática da Expressão Regular". </para
+><para
+>A junção automática para o histórico do controlo de versões (também chamado de "registo") é também suportada. A junção automática do histórico tanto poderá correr automaticamente quando iniciar a junção, activando para tal a opção "Juntar o histórico do controlo de versões no início da junção" ou mais tarde através do menu de junção "Resolver Automaticamente os Conflitos do Histórico". </para
+><para
+>Normalmente, o histórico do controlo de versões começa por uma linha que contém a palavra-chave "&#36;Log&#36;". Isto deverá corresponder à opção "Expressão regular do início do histórico". O &kdiff3; detecta quais as linhas subsequentes no histórico, analisando os caracteres iniciais que aparecem antes da palavra-chave "&#36;Log&#36;". Se também aparecer o mesmo "comentário inicial" nas linhas seguintes, então estas também serão incluídas no histórico. </para
+><para
+>Durante o envio de cada nova versão, o SCV grava uma linha única que indica a versão, a data e a hora, seguida de linhas com os comentários dos utilizadores. Essas linhas formam um item de histórico. Esta secção do histórico vai crescendo com o envio de versões novas e os itens mais recentes aparecem no topo (a seguir à linha inicial do histórico). </para
+><para
+>Quando, em desenvolvimentos paralelos, dois ou mais programadores enviam versões em ramificações diferentes, o histórico da junção irá conter vários itens que aparecem como conflitos na junção das ramificações. Dado que a junção destes se poderá tornar demasiado aborrecidas, o &kdiff3; oferece o suporte com duas estratégias possíveis: basta introduzir a informação de histórico de ambas as contribuições no topo ou ordenar a informação de histórico do utilizador, usando uma chave definida pelo mesmo. </para
+><para
+>O método basta-inserir-todos-os-itens é mais fácil de configurar. O &kdiff3; só precisa de um método para detectar as linhas que pertencem a um item de histórico. A maioria dos SCV inserem uma linha em branco, após cada item do histórico. Se não existirem mais linhas em branco, então este será um critério suficiente para o &kdiff3;. Basta introduzir uma "Expressão regular do início do item de histórico" em branco. Se o critério da linha vazia não for suficiente, poderá indicar uma expressão regular para detectar o início do item do histórico. </para
+><para
+>Lembre-se que o &kdiff3; irá remover os itens de histórico duplicados. Se um item de histórico aparecia várias vezes no histórico de um ficheiro de entra, só um irá aparecer no resultado. </para
+><para
+>Se quiser ordenar o histórico, então terá de indicar como deverá ser gerada a chave de ordenação. Use parêntesis na "Expressão regular do início do item de histórico" para agrupar as partes da expressão regular que deverão mais tarde ser usadas na chave de ordenação. Indique depois a "Ordem da chave de ordenação do início do item de histórico", indicando para tal uma lista de números separados por ",", referentes à posição do grupo na expressão regular. </para
+><para
+>Dado que isto não é tão simples de pôr a funcionar logo, poderá testar e melhorar as expressões regulares e gerar as chaves, numa janela dedicada, se carregar no botão "Testar as suas expressões regulares". </para
+><para
+>Exemplo: Assuma um histórico que se pareça ao seguinte: <screen>
+/**************************************************************************
+** HISTORY:    &#36;Log: \janela_do_ze\Aplicacao\src\algoritmo-complexo.cpp &#36;
+**
+**     \principal\ramo_integracao_12   2 Abr 2001 10:45:41   ze
+**  Juntou-se a ramificação manel_versao_15.
+**
+**     \principal\ramo_correccao_erros_7\1   30 Mar 2001 19:22:05   pedro
+**  Melhorias na velocidade da sub-rotina convertToMesh().
+**  Correcção do estoiro.
+**************************************************************************/
+</screen
+> A linha inicial do histórico corresponde à expressão regular ".*\&#36;Log.*\&#36;.*". Depois, seguem-se os itens de histórico. </para
+><para
+>A linha com a palavra-chave "&#36;Log&#36;" começa com dois "*", após os quais se segue um espaço. O &kdiff3; usa o primeiro texto não-branco como "comentários iniciais" e assume que o histórico termina na primeira linha sem esse comentário inicial. Neste exemplo, a última linha termina com um texto que também começa por dois "*" mas, em vez de um espaço, seguem-se mais "*". Como tal, esta linha termina o histórico. </para
+><para
+>Se a ordenação do histórico não for necessária, então a expressão regular do início de linha do item de histórico poderá ser algo como se segue. (Esta linha está dividida em dois, por não caber de outra forma.) <screen>
+\s*\\principal\\\S+\s+[0-9]+ (Jan|Fev|Mar|Abr|Mai|Jun|Jul|Ago|Set|Out|Nov|Dez)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</screen
+> Para mais detalhes sobre as expressões regulares, veja por favor a <ulink url="http://doc.trolltech.com/3.3/qregexp.html#details"
+>documentação da Trolltech sobre expressões regulares</ulink
+>. Repare que o "\s" (com o "s" minúsculo) corresponde a qualquer espaço em branco e o "\S" (com o "S" maiúsculo) corresponde a qualquer carácter não-branco. No nosso exemplo, o início do item de histórico, contém primeiro a informação da versão com a expressão regular "\\principal\\\S+", a data consiste no dia "[0-9]+", mês "(Jan|Fev|Mar|Abr|Mai|Jun|Jul|Ago|Set|Out|Nov|Dez)" e no ano "[0-9][0-9][0-9][0-9]", a hora "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" e, finalmente, o nomes do programador ".*". Lembre-se que o comentário inicial (no exemplo "**") já será removido pelo &kdiff3; antes de tentar a correspondência, logo a expressão regular começa com uma correspondência para zero ou mais caracteres em branco "\s*". </para
+><para
+>Se precisar de um histórico ordenado, então deverá ser calculada a chave de ordenação. Para tal, as partes relevantes da expressão regular deverão ser agrupadas entre parêntesis. (os parêntesis extra poderão ficar à mesma, mesmo que a ordenação do histórico esteja desactivada.) <screen>
+\s*\\principal\\(\S+)\s+([0-9]+) (Jan|Fev|Mar|Abr|Mai|Jun|Jul|Ago|Set|Out|Nov|Dez)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</screen
+> Os parêntesis contêm agora 1. a informação de versão, 2. dia, 3. mês, 4. ano, 5. hora, 6. nome. Mas, se pretender ordenar por data e hora, é necessário construir uma chave com os elementos por uma ordem de aparência diferente: Primeiro o ano, seguido do mês, dia, hora, informação de versão e nome. Daí, a ordem da chave de ordenação será "4,3,2,5,1,6". </para
+><para
+>Dado que os nomes dos meses não são bons para ordenar (o "Abr" viria em primeiro lugar), o &kdiff3; detecta em que ordem os nomes dos meses foram dados e usa esse número em alternativa ("Abr"->"04"). E, se for encontrado um número puro, será transformado num valor de 4 algarismos com zeros iniciais para ordenar. Finalmente, a chave de ordenação resultante da linha inicial do primeiro item de histórico será: <screen
+>2001 04 0002 10:45:41 ramo_integracao_12   ze 
+</screen>
+</para
+><para
+>Para mais informações, veja também a <link linkend="diffmergeoptions"
+>Configuração de Diferenças e Junção</link
+>. </para>
+</sect2>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navegação e Edição</title>
+<para
+>Muita da navegação será feita com as barras de posicionamento e com o rato, mas você poderá também navegar com as teclas. Se carregar numa das janelas, então poderá usar as teclas de cursores, o Page Up, o Page Down, o Home, o End, o Ctrl-Home ou o Ctrl-End como iria usar noutros programas. A coluna de resumo ao lado da barra de posicionamento vertical dos ficheiros de entrada poderá também ser usada para navegar se carregar nela. </para
+><para
+>Poderá também usar a roda do rato para subir ou descer. </para
+><para
+>No editor do resultado da junção, poderá também usar as outras teclas para editar. Poderá alternar entre o modo de inserção ou sobreposição com a tecla Insert. (Por omissão, está no modo de inserção). </para
+><para
+>Um 'click' com o botão esquerdo do rato em qualquer coluna de resumo irá sincronizar todas as janelas para mostrar o início do mesmo grupo de linhas (tal como é explicado em <link linkend="synchronise_views"
+>Configurar o Grupo Actual e Sincronizar a Posição da Janela de Junção e Diferença</link
+>). </para
+><para
+>A barra de botões também contém sete botões de navegação com os quais poderá saltar para a primeira/última/actual diferença, para a diferença seguinte/anterior  (Ctrl-Baixo/Ctrl-Cima), para o conflito seguinte/anterior (Ctrl-Pg Down/Ctrl-Pg Up) ou para o conflito seguinte/anterior por resolver. Repare que, para o &kdiff3;, um "conflito" que não foi resolvido automaticamente no início da junção irá permanecer como "conflito", mesmo que resolvido. Daí a necessidade de distinguir os "conflitos por resolver". </para>
+<sect2 id="autoadvance"
+><title
+>Avanço Automático</title>
+<para
+>Existe também um botão "Ir automaticamente para o próximo conflito por resolver após a selecção do código" (Avanço Automático). Se activar esta opção, então sempre que seleccionar uma origem, o &kdiff3; irá saltar para o próximo conflito por resolver automaticamente. Isto poderá ajudar quando quiser sempre escolher apenas uma origem. Quando precisar de ambas as origens, ou se quiser editar depois de seleccionar, então provavelmente irá querer desligar esta opção. Antes de prosseguir para o próximo conflito por resolver, o &kdiff3; mostra-lhe o efeito da sua escolha durante algum tempo. Este atraso é ajustável na Configuração da Diferença &amp; Junção: Poderá indicar o "Atraso no avanço automático" num valor entre 0 e 2 000 milisegundos. Sugestão: Cansado de muitos 'clicks'? - Use um atraso de avanço automático reduzido e os atalhos Ctrl-1/2/3 para seleccionar o A/B/C em muitos conflitos. </para>
+</sect2>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Seleccionar, Copiar e Colar</title>
+<para
+>As janelas de entrada não mostram nenhum cursor, como tal as selecções necessitam de ser feitas com o rato, ao carregar com o botão esquerdo do rato no início, mantendo o botão do rato carregado e indo até ao fim, momento em que larga o botão do rato de novo. Poderá também seleccionar uma palavra se fizer duplo-click nela. No editor do resultado da junção poderá também seleccionar com o teclado se mantiver a tecla Shift carregada enquanto navega com as teclas de cursores. </para
+><para
+>Se a selecção ultrapassar o intervalo visível, você poderá passar o rato por cima dos extremos da janela, o que fará com que o &kdiff3; se desloque nessa direcção. </para
+><para
+>Para as selecções muito grandes, poderá também usar as teclas de navegação, enquanto mantém pressionado o rato. P. ex., use o Page Up e o Page Down para ir rapidamente para uma dada posição. Na posição final, largue o botão do rato. </para
+><para
+>Para seleccionar tudo na janela actual, use a opção do menu "Editar"->"Seleccionar Tudo" (Ctrl-A). </para
+><para
+>Para copiar para a área de transferência, precisa de carregar no botão "Copiar" (Ctrl-C ou Ctrl-Insert). Porém, existe uma opção para "Copiar Automaticamente a Selecção". Se esta estiver activa, então tudo o que seleccionar será copiado imediatamente, sem que você tenha de copiar explicitamente. Todavia, preste atenção ao usar isto, dado que o conteúdo da área de transferência poderá ficar assim destruído por acidente. </para
+><para
+>O "Cortar" (Ctrl-X ou Shift-Delete) copia para a área de transferência e apaga o texto seleccionado. </para
+><para
+>O "Colar" (Ctrl-V ou Shift-Insert) insere o texto da área de transferência na posição do cursor ou na selecção actual. Se colar numa das janelas de entrada de diferenças, o conteúdo da área de transferência será mostrado nessa janela e a comparação irá reiniciar imediatamente. Isto é útil se quiser pegar rapidamente num pedaço de texto de qualquer local e compará-lo com outra coisa, sem ter de criar ficheiros primeiro. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Gravar</title>
+<para
+>A gravação só será permitida quando todos os conflitos tiverem sido resolvidos. Se o ficheiro já existir e a opção de "Salvaguarda dos ficheiros" estiver activa, então o ficheiro existente verá o seu nome mudado de modo a ter uma extensão ".orig", mas se existir um destes ficheiros será removido. Quando você sair ou iniciar outra análise de diferenças e os dados não tiverem sido gravados ainda, então o &kdiff3; irá perguntar se você deseja gravar, cancelar ou prosseguir sem gravar. (O &kdiff3; não lida com nenhuns sinais ('signals') do sistema. Por isso, se fizer um "kill" ao &kdiff3;, então os seus dados serão perdidos.) </para
+><para
+>Os fins de linha são gravados de acordo com o método normal do sistema operativo subjacente. Para os UNIXes, cada linha terminada com um carácter de 'linefeed' "\n", enquanto que nos sistemas baseados em Win32, cada linha termina com um 'carriage-return' + um 'linefeed' "\r\n". O &kdiff3; não preserva os fins de linha dos ficheiros de entrada, o que também significa que você não deverá usar o &kdiff3; com ficheiros binários. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Procurar Sequências de Texto</title>
+<para
+>Você poderá procurar por uma sequência de texto em qualquer janela de texto do &kdiff3;. O comando "Procurar ..." (Ctrl-F) no menu "Editar" abre uma janela que lhe permite indicar o texto a procurar. Poderá também seleccionar as janelas que deverão ser pesquisadas. A procura irá ter início sempre no topo do ficheiro. Use o comando "Procurar o Seguinte" (F3) para prosseguir com a próxima ocorrência. Se optar por procurar em várias janelas, então a primeira janela será percorrida de alto a baixo antes de a procura começar na próxima janela a partir do topo de novo, etc. </para>
+</sect1>
+
+<sect1 id="printing"
+><title
+>Impressão</title>
+<para
+>O &kdiff3; suporta a impressão das diferenças do ficheiro de texto. O comando "Imprimir..." (Ctrl-P) no menu Ficheiro abre uma janela que lhe permite seleccionar a impressora e ajustar as outras opções. </para
+><para
+>Existem várias possibilidades para ajustar o intervalo. Devido às diferentes janelas de impressão nos diferentes sistemas operativos, o método para obter certas selecções de intervalos varia. </para>
+<variablelist>
+   <varlistentry
+><term
+>Tudo:</term
+><listitem
+><para
+>Imprime tudo.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Actual:</term
+><listitem
+><para
+>Imprime uma página que começa na primeira linha visível da janela. (Nos sistemas sem esta opção, isto poderá ser obtido se indicar o número de página 10000 na impressão.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Selecção:</term
+><listitem
+><para
+>Antes de optar por imprimir, seleccione o texto com o rato (como acontece na cópia e colagem) numa das janelas de entrada das diferenças, para definir a linha inicial e final. Se não foi seleccionado nenhum texto numa das janelas de entrada, então esta opção não estará disponível. (Nos sistemas sem esta opção, isto poderá ser conseguido se indicar para imprimir a página 9999.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Intervalo:</term
+><listitem
+><para
+>Indica a primeira e última página. </para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>As outras opções importantes serão retiradas das opções normais: </para
+><itemizedlist>
+   <listitem
+><para
+>Tamanho e tipo de letra</para
+></listitem>
+   <listitem
+><para
+>Mostrar os números de linha</para
+></listitem>
+   <listitem
+><para
+>Mudança de linha</para
+></listitem>
+   <listitem
+><para
+>Cores</para
+></listitem>
+   <listitem
+><para
+>etc.</para
+></listitem>
+</itemizedlist>
+<para
+>A formatação em paisagem (na horizontal) também é recomendada na impressão. </para>
+</sect1>
+
+<sect1 id="options"
+><title
+>Opções</title>
+<para
+>As opções e a lista de ficheiros recentes serão gravadas quando você sair do programa e serão carregadas de novo quando o iniciar. (Menu Configuração->Configurar o &kdiff3;...) </para>
+<sect2
+><title
+>Tipo de Letra</title>
+<para
+>Seleccione um tipo de letra monoespaçado. (Em alguns sistemas, esta janela irá também apresentar os tipos de letra de tamanho variável, mas você não os deverá usar.) </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Texto Itálico para os Deltas:</emphasis
+></term
+><listitem
+><para
+>Se seleccionar isto, então as diferenças no texto serão escritas com a versão itálica do tipo de letra seleccionado. Se o tipo de letra não suportar caracteres itálicos, isto não fará nada.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Cores</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Cor principal:</emphasis
+></term
+><listitem
+><para
+>Normalmente preto. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor de fundo:</emphasis
+></term
+><listitem
+><para
+>Normalmente branco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor de Fundo das Diferenças:</emphasis
+></term
+><listitem
+><para
+>Normalmente a cinzento claro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor A:</emphasis
+></term
+><listitem
+><para
+>Normalmente a azul escuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor B:</emphasis
+></term
+><listitem
+><para
+>Normalmente a verde escuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor C:</emphasis
+></term
+><listitem
+><para
+>Normalmente a magenta escuro. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor do Conflito:</emphasis
+></term
+><listitem
+><para
+>Normalmente a vermelho.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor de fundo do intervalo actual:</emphasis
+></term
+><listitem
+><para
+>Normalmente a amarelo claro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor de fundo da diferença do intervalo actual:</emphasis
+></term
+><listitem
+><para
+>Normalmente a amarelo escuro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor para os intervalos de diferenças seleccionados manualmente:</emphasis
+></term
+><listitem
+><para
+>Normalmente a laranja.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor dos ficheiros mais recentes na comparação de pastas:</emphasis
+></term
+><listitem
+><para
+>Normalmente a verde.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor dos ficheiros mais antigos na comparação de pastas:</emphasis
+></term
+><listitem
+><para
+>Normalmente a vermelho.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor dos ficheiros intermédios na comparação de pastas:</emphasis
+></term
+><listitem
+><para
+>Normalmente a amarelo escuro.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Cor dos ficheiros em falta na comparação de pastas:</emphasis
+></term
+><listitem
+><para
+>Normalmente preto.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>A mudança das cores na comparação das pastas só fará efeito quando iniciar a próxima comparação de pastas. </para>
+<para
+>Nos sistemas com apenas 16 ou 256 cores, alguns dos tons acima descritos não estão disponíveis de forma pura. Nesses sistemas, o botão "Predefinições" irá escolher uma cor pura. </para>
+</sect2>
+
+<sect2
+><title
+>Configuração do Editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>O Tab insere espaços:</emphasis
+></term
+><listitem
+><para
+>Se isto estiver desactivado e você carregar na tecla do tabulador, será inserido um carácter de tabulação, caso contrário serão inseridos os espaços com a quantidade apropriada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tamanho das tabulações:</emphasis
+></term
+><listitem
+><para
+>Poderá ser ajustado de acordo com as suas necessidades específicas. Por omissão é igual a 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Indentação automática:</emphasis
+></term
+><listitem
+><para
+>Ao carregar em Enter ou Return, a indentação da linha anterior é usada para uma nova linha. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copiar automaticamente a selecção:</emphasis
+></term
+><listitem
+><para
+>Quando activo, qualquer selecção é posta automaticamente na área de transferência e não precisa de a copiar explicitamente. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Estilo de fim de linha:</emphasis
+></term
+><listitem
+><para
+>Ao gravar, o utilizador poderá seleccionar o estilo do fim de linha que prefere.O valor por omissão é a escolha comum para o sistema operativo usado. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="diffmergeoptions"
+><title
+>Configuração da Diferença e Junção</title>
+<para
+>Ao comparar os ficheiros, o &kdiff3; tenta primeiro corresponder as linhas iguais em todos os ficheiros de entrada. Só durante este passo é que poderá ignorar os espaços em branco. O segundo passo compara cada uma das linhas. Neste passo, os espaços em branco não serão ignorados. Também durante a junção os espaços em branco não serão ignorados. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Manter o 'Carriage Return':</emphasis
+></term
+><listitem
+><para
+>Alguns editores (em alguns sistemas) gravam os caracteres de 'carriage return' "\r" e 'linefeed' "\n" no fim da linha, enquanto que outros só irão gravar o 'linefeed' "\n". Normalmente o &kdiff3; ignora o 'carriage return', mas aí os ficheiros que não tenham tamanhos iguais pareçam de facto iguais numa comparação lado-a-lado. Quando esta opção estiver activa, então os caracteres de 'carriage return' ficarão visíveis mas serão tratados como espaços em branco. Ela necessita estar desligada durante uma junção. Por omissão, está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar os números:</emphasis
+></term
+><listitem
+><para
+>Por omissão está desligado. Os caracteres dos números ("0-9", ".", "-") serão ignorados na primeira parte da análise, na qual é feita a correspondência de linhas. No resultado, as diferenças serão mostradas de qualquer forma, mas serão tratadas como espaços em branco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar comentários de C/C++:</emphasis
+></term
+><listitem
+><para
+>Por omissão está desligado. As alterações nos comentários serão tratadas como as alterações nos espaços em branco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorar a capitalização:</emphasis
+></term
+><listitem
+><para
+>Por omissão está desligado. As diferenças de capitalização dos caracteres (como o 'A' vs. 'a') serão tratadas como alterações de espaços em branco. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando do pré-processador:</emphasis
+></term
+><listitem
+><para
+>Veja a <link linkend="preprocessors"
+>próxima secção</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando do Pré-processador para a Correspondência de Linhas:</emphasis
+></term
+><listitem
+><para
+>Veja a <link linkend="preprocessors"
+>próxima secção</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tentar com Persistência:</emphasis
+></term
+><listitem
+><para
+>Tenta com mais afinco encontrar um delta ainda menor. (Por omissão está ligado). Isto irá ser efectivo provavelmente para os ficheiros grandes e complicados. Será também lento para os ficheiros muito grandes. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Atraso no Avanço Automático (ms):</emphasis
+></term
+><listitem
+><para
+>Quando estiver no modo de avanço automático esta opção indica o intervalo de tempo durante o qual mostrar o resultado da selecção antes de saltar para o próximo conflito não resolvido. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Predefinição da junção de espaço em branco com 2/3 ficheiros:</emphasis
+></term
+><listitem
+><para
+>Resolve automaticamente todos os conflitos de espaços em branco, seleccionando o ficheiro indicado. (Por omissão, é com uma escolha manual). É útil se os espaços em branco não serão importantes em muitos dos ficheiros. Se precisar disto apenas ocasionalmente, é melhor usar o "Escolher A/B/C nos Conflitos de Espaços em Branco Por Resolver" no menu "Junção". Lembre-se que, se activar o "Ignorar os Números" ou o "Ignorar os Comentários de C/C++", então esta escolha automática também se aplica para os conflitos nos números ou nos comentários. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expressão regular de junção automática:</emphasis
+></term
+><listitem
+><para
+>A expressão regular para as linhas onde o &kdiff3; deverá escolher automaticamente uma origem. Veja também a <link linkend="vcskeywordsmergesupport"
+>Junção Automática ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Executar a junção automática da expressão regular no início da junção:</emphasis
+></term
+><listitem
+><para
+>Se for activado, o &kdiff3; executa a junção automática com a "Expressão regular da junção automática", quando for iniciada uma junção. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expressão regular do início do histórico:</emphasis
+></term
+><listitem
+><para
+>A expressão regular do início do item de histórico. Normalmente, esta linha contém a palavra-chave "&#36;Log&#36;". Valor por omissão: ".*\&#36;Log.*\&#36;.*" </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Expressão regular do início do item de histórico:</emphasis
+></term
+><listitem
+><para
+>Um item de junção do histórico consiste em várias linhas. Indique a expressão regular que detecta a primeira linha (sem o comentário inicial). Use os parêntesis para agrupar as chaves que deseja usar na ordenação. Se for deixado em branco, o &kdiff3; assume que as linhas em branco separam os itens de histórico. Veja também a <link linkend="vcskeywordsmergesupport"
+>Junção Automática ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ordenação da junção do histórico:</emphasis
+></term
+><listitem
+><para
+>Activa a ordenação do histórico do controlo de versões. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ordem da chave de ordenação do início do item de histórico:</emphasis
+></term
+><listitem
+><para
+>Cada grupo de parêntesis usado na expressão regular do item de início de histórico agrupa uma chave que poderá ser usada na ordenação. Indique a lista de chaves (que são numeradas por ordem de ocorrência, a começar em 1), usando o ',' como separador (p.ex., "4,5,6,1,2,3,7"). Se for deixado em branco, então não será feita nenhuma ordenação. Veja também a <link linkend="vcskeywordsmergesupport"
+>Junção Automática ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Juntar o histórico do controlo de versões no início da junção:</emphasis
+></term
+><listitem
+><para
+>Se estiver activado, o &kdiff3; executa a junção automática do histórico, usando as opções acima mencionadas, quando for iniciada uma junção. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Testar as suas expressões regulares</emphasis
+></term
+><listitem
+><para
+>Este botão mostra uma janela que lhe permite melhorar e testar as expressões regulares acima. Basta copiar os dados respectivos dos seus ficheiros para as linhas de exemplo. O "Resultados da correspondência" irá mostrar imediatamente se a correspondência é bem sucedida ou não. O "Resultado da chave de ordenação" irá mostrar a chave usada no histórico da junção do histórico. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando de junção irrelevante:</emphasis
+></term
+><listitem
+><para
+>Indique um comando próprio, que deverá ser chamado quando o &kdiff3; detectar que, numa junção de três ficheiros, o ficheiro de B não contribui com dados relevantes que não estivessem já contidos no ficheiro em C. O comando é chamado com os três nomes de ficheiros como parâmetros. Os dados correspondentes à "Expressão regular da junção automática" ou no histórico não são considerados relevantes. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Junção de Pastas</title>
+<para
+>Estas opções dizem respeito à análise da pasta e ao tratamento da junção: Veja em <link linkend="dirmergeoptions"
+>Comparação de Pastas/Juntar</link
+> para mais detalhes. </para
+><para
+>Existe aqui ainda uma opção que também é relevante para gravar os ficheiros únicos: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Ficheiros de segurança:</emphasis
+></term
+><listitem
+><para
+>Quando um ficheiro é gravado e já existe uma versão anterior, então a versão original irá mudar para um nome com uma extensão ".orig". Se já existir um ficheiro de cópia de segurança antigo com uma extensão ".orig", então este será removido sem ficar nenhuma cópia de segurança. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Opções Regionais e da Língua</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Língua:</emphasis
+></term
+><listitem
+><para
+>Ajusta a língua da interface do utilizador. Se mudar esta opção não afectará o programa em execução. Terá de sair e reiniciar o &kdiff3; para que a língua seja alterada. (Esta opção não está disponível na versão para KDE do &kdiff3;, porque a língua é ajustável na configuração global do KDE). </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Utilizar a mesma codificação para tudo:</emphasis
+></term
+><listitem
+><para
+>As seguintes opções de codificação poderão ser ajustadas em separado para cada item ou, se esta opção for verdadeira, todos os valores irão usar o primeiro valor. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificação Local:</emphasis
+></term
+><listitem
+><para
+>Por cima dos selectores de codificação, aparece uma nota que lhe indica a sua codificação local. (Esta não é ajustável, mas está aqui apenas para o informar, no caso de não saber qual é a sua codificação local e tiver de a seleccionar). </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificação do Ficheiro para o A/B/C:</emphasis
+></term
+><listitem
+><para
+>Ajuste a codificação do ficheiro para os ficheiros de entrada. Isto provoca algum efeito na forma como os caracteres especiais são interpretados. Dado que poderá ajustar cada codificação em separado, poderá até comparar e juntar ficheiros que foram gravados com codificações diferentes. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificação do Ficheiro para Junção de Resultado e Gravação:</emphasis
+></term
+><listitem
+><para
+>Quando tiver editado um ficheiro, poderá então ajustar a codificação que será usada ao gravar para o disco. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Codificação do Ficheiro dos Ficheiros de Pré-processador:</emphasis
+></term
+><listitem
+><para
+>Quando definir pré-processadores, este poderão não ser capazes de lidar com a sua codificação. (p.ex.: Os seus ficheiros estão em Unicode de 16 bits e o seu pré-processador só consegue lidar com ASCII de 8 bits). Com esta opção, poderá definir a codificação do resultado do pré-processador. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Língua da Esquerda-para-a-Direita:</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Diversos</title>
+<para
+>(Estas opções e acções estão disponíveis nos menus ou na barra de botões.)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Mostrar os números de linha:</emphasis
+></term
+><listitem
+><para
+>O utilizador pode seleccionar se os números de linhas são mostrados para os ficheiros de entrada.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar as diferenças de espaços e tabulações:</emphasis
+></term
+><listitem
+><para
+>Algumas das vezes os espaços e tabulações visíveis são incómodos. Poderá com isto desactivar esta funcionalidade.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar os espaços em branco:</emphasis
+></term
+><listitem
+><para
+>Desligue isto para suprimir o realce das alterações apenas nos espaços em branco no texto ou nas colunas de vista geral. (Lembre-se que isto também se aplica às alterações nos números ou comentários se as opções "Ignorar os números" ou "Ignorar os Comentários de C/C++" estiverem activas.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Opções da vista geral:</emphasis
+></term
+><listitem
+><para
+>Estas opções só estão disponíveis quando você compara três ficheiros. No modo normal, todas as diferenças são mostradas na coluna de resumo codificada a cores. Mas, em alguns casos, você está especialmente interessado nas diferenças entre apenas dois desses três ficheiros. Se seleccionar "A vs. B", "A vs. C" ou "B vs. C" na coluna de resumo irá aparecer uma segunda coluna com a informação necessária ao lado do resumo normal. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Quebrar linha nas janelas de diferenças:</emphasis
+></term
+><listitem
+><para
+>Reparte as linhas quando o seu tamanho exceder a largura de uma janela. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Mostrar a Janela A/B/C:</emphasis
+></term
+><listitem
+><para
+>Em algumas vezes, você poderá usar melhor o espaço no ecrã para as linhas compridas. Esconda as janelas que não são importantes. (No menu "Janelas".)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Comutar a Orientação da Repartição:</emphasis
+></term
+><listitem
+><para
+>Define se as janelas de diferenças são mostradas uma ao lado da outra (a A à esquerda da B, que está à esquerda da C) ou uma por cima da outra (a A sobre a B, que está sobre a C). Isto também deverá ajudar para as linhas compridas (No menu "Janelas"). </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Iniciar uma junção rapidamente:</emphasis
+></term
+><listitem
+><para
+>Às vezes, você está a ver os deltas e decide juntá-los. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> O "Juntar o ficheiro actual" no menu "Directoria" também resulta se só comparar dois ficheiros. Um único 'click' começa a junção e usa o nome do último ficheiro de entrada como nome do ficheiro do resultado por omissão. (Quando isto for usado para reiniciar uma junção, então o nome do ficheiro do resultado será mantido.)</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Configurar os Atalhos de Teclado</title>
+<para
+>De momento, só a versão para KDE suporta os atalhos de teclado configuráveis pelo utilizador. (No menu Configuração->Configurar os Atalhos...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Comandos do Pré-processador</title>
+<para
+>O &kdiff3; suporta duas opções do pré-processador. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Comando do pré-processador:</emphasis
+></term
+><listitem
+><para
+>Quando for lido qualquer ficheiro, ele será encaminhado através deste comando externo. O resultado deste comando será visível em vez do ficheiro original. O utilizador poderá criar o seu próprio pré-processador que corresponda às suas necessidades específicas. Use isto para cortar partes desnecessárias do ficheiro ou para corrigir automaticamente a indentação, etc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comando do Pré-processador para a Correspondência de Linhas:</emphasis
+></term
+><listitem
+><para
+>Quando for lido qualquer ficheiro, ele será encaminhado através deste comando externo. Se um comando de pré-processador (ver acima) for também indicado, então o resultado do pré-processador é a entrada para o pré-processador de correspondência de linhas. O resultado só será usado durante a fase de correspondência de linhas da análise. O utilizador poderá escrever o seu próprio pré-processador que corresponda às suas necessidades específicas. Cada linha de entrada terá de ter uma linha de resultado correspondente. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>A ideia é permitir ao utilizador uma maior flexibilidade ao configurar o resultado das diferenças. Mas isto necessita de um programa externo e muitos dos utilizadores não querem escrever um. As boas notícias é que, muitas das vezes, o <command
+>sed</command
+> ou o <command
+>perl</command
+> encarregar-se-ão disso. </para>
+<para
+>Exemplo: Caso de teste simples. Considere o ficheiro a.txt (6 linhas): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> E o ficheiro b.txt (3 linhas): <screen>
+      cg
+      dg
+      eg
+</screen
+> Sem um pré-processador as seguintes linhas teriam sido colocadas lado a lado: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Isto provavelmente não será o desejado, dado que a primeira letra contém a informação realmente interessante. Para ajudar o algoritmo de correspondência a ignorar aa segunda letra, poder-se-ia usar um comando de pré-processamento de correspondências de linhas que substituísse o 'g' pelo 'a': <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Com este comando, o resultado da comparação seria: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Internamente, o algoritmo de correspondência vê os ficheiros depois de correr o pré-processador de correspondência de linhas, mas no ecrã o ficheiro fica inalterado. (O pré-processador normal iria alterar também os dados no ecrã.) </para>
+
+<sect2 id="sedbasics"
+><title
+>Bases do <command
+>sed</command
+></title>
+<para
+>Esta secção só introduz algumas funcionalidades muito básicas do <command
+>sed</command
+>. Para mais informações veja as páginas <ulink url="info:/sed"
+>info:/sed</ulink
+> ou <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+> http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. Existe uma versão pré-compilada para o Windows em <ulink url="http://unxutils.sourceforge.net"
+> http://unxutils.sourceforge.net</ulink
+>. Repare no facto de que os exemplos seguintes assumem que o comando <command
+>sed</command
+> está numa pasta referida pela sua variável de ambiente PATH. Se não for este o caso, você terá de indicar a localização absoluta completa para o comando. </para>
+<note
+><para
+>Lembre-se também que os exemplos seguintes usam a plica simples (') que não irá funcionar no Windows. No Windows, deverá usar as aspas (") em alternativa.</para
+></note>
+<para
+>Neste contexto apenas o comando de substituição do <command
+>sed</command
+> será usado: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>EXPREG</replaceable
+>/<replaceable
+>SUBSTITUTO</replaceable
+>/<replaceable
+>OPÇÕES</replaceable
+>'
+</screen
+> Antes de você usar um comando novo no &kdiff3;, deverá primeiro testá-lo numa consola. Aqui, o comando <command
+>echo</command
+> é útil. Exemplo: <screen>
+   <command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obracadabra
+</screen
+> Este exemplo mostra um comando 'sed' muito simples que substitui a primeira ocorrência do "a" por um "o". Se quiser substituir todas as ocorrências, então irá necessitar da opção "g": <screen>
+   <command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrocodobro
+</screen
+> O símbolo "|" é o 'pipe' ou canal que transfere o resultado do comando anterior para os dados de entrada do comando seguinte. Se quiser testar com um ficheiro maior, então poderá usar o <command
+>cat</command
+> no sistemas do tipo do Unix ou o <command
+>type</command
+> nos sistemas do tipo Windows. O <command
+>sed</command
+> irá fazer a substituição para cada linha. <screen
+><command
+>cat</command
+> <replaceable
+>ficheiro</replaceable
+> | <command
+>sed</command
+> <replaceable
+>opções</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Exemplos para a Utilização do <command
+>sed</command
+> no &kdiff3;</title>
+<sect3
+><title
+>Ignorar Outros Tipos de Comentários</title>
+<para
+>De momento, o &kdiff3; só compreende comentários de C/C++. Se usar o comando "Pré-Processador de Correspondência de Linhas", poderá também ignorar outros tipos de comentários, convertendo-os em comentários de C/C++. Exemplo: Para ignorar comentários que comecem por "#", poderá convertê-los para "//". Lembre-se que terá também de activar a opção "Ignorar os Comentários de C/C++" para obter efeito. Um comando "Pré-Processador de Correspondência de Linhas" seria: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Dado que para o <command
+>sed</command
+> o carácter <literal
+>/</literal
+> tem um significado especial, é necessário colocar o carácter <literal
+>\</literal
+> antes de cada <literal
+>/</literal
+> no texto de substituição. Algumas das vezes o <literal
+>\</literal
+> é necessário para adicionar ou remover um significado especial para certos caracteres. As plicas simples (<literal
+>'</literal
+>) antes e depois do comando de substituição são importantes, caso contrário a linha de comandos iria tentar interpretar alguns caracteres especiais como o <literal
+>#</literal
+>, o <literal
+>$</literal
+> ou o <literal
+>\</literal
+> antes de os passar para o <command
+>sed</command
+>. Lembre-se que no &Windows; irá necessitar aqui das aspas (<literal
+>"</literal
+>). O &Windows; substitui os outros caracteres como o <literal
+>%</literal
+>, por isso você terá de fazer algumas experiências. </para>
+</sect3>
+<sect3
+><title
+>Diff sem Distinguir Capitalização</title>
+<para
+>Use o comando "Pré-Processador de Correspondência de Linhas" para converter todo o texto para maiúsculas: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Aqui o <literal
+>.*</literal
+> é uma expressão regular que corresponde a qualquer texto e, no seu contexto, irá corresponder a todos os caracteres da linha. O <literal
+>\1</literal
+> no texto de substituição refere-se ao texto correspondente ao primeiro par de <literal
+>\(</literal
+> e <literal
+>\)</literal
+>. O <literal
+>\U</literal
+> converte o texto inserido para maiúsculas. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar as Palavras-Chave do Controlo de Versões</title>
+<para
+>O CVS e outros sistemas de controlo de versões usam várias palavras-chave para inserir texto gerado automaticamente (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Todas elas seguem o padrão "$PALAVRACHAVE texto gerado$". É preciso agora um comando Pré-Processador de Correspondência de Linhas que remova apenas o texto gerado: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> O "\|" separa as palavras-chave possíveis. Poderá querer modificar esta lista de acordo com as suas necessidades. O "\" antes do "$" é necessário, caso contrário o "$" irá corresponder ao fim da linha. </para>
+<para
+>Ao experimentar com o <command
+>sed</command
+>, você poderá vir a compreender e até a gostar destas expressões regulares. Elas são úteis porque existem muitos outros programas que suportam algumas coisas desse género. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar os Números</title>
+<para
+>A indiferença em relação aos números é de facto uma opção incorporada. Mas, como outro exemplo, seria assim como iria ficar como um comando do Pré-Processador da Correspondência de Linhas. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Todos os caracteres dentro de '[' e ']' são uma correspondência e será substituído por nada. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorar Certas Colunas</title>
+<para
+>Em algumas ocasiões um determinado texto tem uma formatação demasiado restrita e contém colunas que deseja sempre ignorar, enquanto que existem outras colunas que deseje preservar para análise. No exemplo seguinte, as primeiras cinco colunas (caracteres) são ignoradas, as próximas dez são preservadas, depois as próximas cinco colunas serão ignoradas de novo e o resto da linha é preservada. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Cada ponto '.' corresponde a um único carácter. O "\1" e o "\2" no texto de substituição refere-se ao texto correspondente dentro do primeiro e segundo par de "\(" e "\)", demarcando o texto a ser preservado. </para>
+</sect3>
+
+<sect3
+><title
+>Combinar Várias Substituições</title>
+<para
+>Em algumas situações você deseja aplicar várias substituições de uma vez. Poderá então usar o ponto-e-vírgula ";" para separar uma da outra. Exemplo: <screen
+><command
+>echo</command
+> abracadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROCODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Usar o <command
+>perl</command
+> em vez do <command
+>sed</command
+></title>
+<para
+>Em vez do <command
+>sed</command
+>, você poderá querer usar algo diferente como o  <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>EXPREG</replaceable
+>/<replaceable
+>SUBSTITUTO</replaceable
+>/<replaceable
+>OPÇÕES</replaceable
+>'
+</screen
+> Porém, alguns detalhes são diferentes no <command
+>perl</command
+>. Repare que, onde o <command
+>sed</command
+> necessitava do "\(" e do "\)", o <command
+>perl</command
+> necessita dos "(" e ")" mais simples e sem o '\' precedente. Exemplo: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Order de Execução de Pré-processadores</title>
+<para
+>Os dados são encaminhados através de todos os pré-processadores internos e externos pela seguinte ordem: </para>
+<itemizedlist>
+<listitem
+><para
+>Pré-processador normal,</para
+></listitem>
+<listitem
+><para
+>Pré-processador de Correspondência de Linhas,</para
+></listitem>
+<listitem
+><para
+>Ignorar capitalização (conversão para maiúsculas),</para
+></listitem>
+<listitem
+><para
+>Detecção de Comentários de C/C++,</para
+></listitem>
+<listitem
+><para
+>Ignorar os números,</para
+></listitem>
+<listitem
+><para
+>Ignorar os espaços em branco</para
+></listitem>
+</itemizedlist>
+<para
+>Os dados após o pré-processador normal serão preservados para a apresentação e para a junção. As outras operações só modificam os dados que o algoritmo para a correspondência de linhas nas diferenças vê. </para
+><para
+>Nos casos raros em que você usa um pré-processador normal, repare que o pré-processador da correspondência de linhas vê o resultado no pré-processador normal como dados de entrada. </para>
+</sect2>
+
+<sect2
+><title
+>Aviso</title>
+<para
+>Os comandos do pré-processador são normalmente muito úteis, mas como acontece com qualquer opção que modifica os seus textos ou esconde algumas diferenças automaticamente, você poderá saltar por cima de certas diferenças e, no pior dos casos, destruir dados importantes. </para
+><para
+>Por esta razão, durante uma junção, se for usado um comando pré-processador normal, o &kdiff3; dizer-lhe-á isso e perguntar-lhe-á se deverá ser desactivado ou não. Mas não o irá avisar se estiver um Pré-Processador de Correspondência de Linhas activo. A junção não irá ficar completa até que todos os conflitos tenham sido resolvidos. Se tiver desactivado o "Mostrar os Espaços em Branco", então as diferenças que foram removidas com o Pré-Processador de Correspondência de Linhas ficarão também invisíveis. Se o botão para Gravar continuar inactivo durante uma junção (devido a conflitos por resolver), verifique se activa o "Mostrar os Espaços em Branco". Se não quiser juntar essas diferenças menos importantes poderá escolher a opção "Escolher [A|B|C] nos Conflitos de Espaço em Branco por Resolver" no menu "Juntar". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Comparação e Junção de Directorias com o &kdiff3;</title>
+<sect1 id="dirmergeintro"
+><title
+>Introdução à Comparação ou Junção de Pastas</title>
+<para
+>Normalmente, os programadores precisam de modificar vários ficheiros numa pasta para atingir os seus fins. Para isso, o &kdiff3; também lhe permite comparar e juntar várias pastas de forma recursiva! </para
+><para
+>Ainda que a comparação e junção de pastas pareça ser bastante óbvia, existem vários detalhes que o utilizador deverá conhecer. O mais importante é, obviamente, o facto de que vários ficheiros poderão ser afectados por cada operação. Se não tiver cópias de segurança dos seus dados originais, então poderá ser bastante difícil ou mesmo impossível de voltar ao estado original. Por isso, antes de começar uma junção, certifique-se que os seus dados estão a salvo e que é possível voltar atrás. Se cria um pacote ou usa um sistema de controlo de versões é uma decisão sua, mas mesmo os programadores experientes e os integradores precisam do código antigo e do novo. E repare que até ao autor do &kdiff3; tenta fazer o seu melhor, mas não pode garantir que não existam erros. De acordo com a GPL da GNU, não existe NENHUMA GARANTIA de qualquer forma para este programa. Por isso, seja humilde e tenha sempre em mente: </para>
+<blockquote
+><para>
+   <emphasis
+>Errar é humano, mas para realmente baralhar as coisas é preciso um computador.</emphasis>
+</para
+></blockquote>
+<para
+>Por isso, este é o programa que poderá fazer isto por si: o &kdiff3; ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... lê e compara duas ou três pastas recursivamente,</para
+></listitem>
+     <listitem
+><para
+>... tem um cuidado especial com as ligações simbólicas,</para
+></listitem>
+     <listitem
+><para
+>... permite-lhe navegar nos ficheiros com um duplo-click do rato,</para
+></listitem>
+     <listitem
+><para
+>... propõe para cada item uma operação de junção, a qual poderá alterar antes de iniciar a junção de pastas,</para
+></listitem>
+     <listitem
+><para
+>... permite-lhe simular a junção e lista as acções que iriam tomar lugar, sem fazer nada de facto,</para
+></listitem>
+     <listitem
+><para
+>... permite-lhe fazer realmente a junção, possibilitando também a você interagir nas situações em que é necessária uma interacção manual,</para
+></listitem>
+     <listitem
+><para
+>... permite-lhe executar a operação seleccionada para todos os itens (tecla F7) ou para o item seleccionado (tecla F6),</para
+></listitem>
+     <listitem
+><para
+>... permite-lhe continuar a junção depois de uma interacção manual com a tecla F7,</para
+></listitem>
+     <listitem
+><para
+>... cria opcionalmente cópias de segurança com a extensão ".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Iniciar a Comparação ou Junção de Directoria</title>
+<para
+>Isto é bastante semelhante à junção e comparação simples com ficheiros únicos. O utilizador apenas terá de indicar nomes de pastas na linha de comandos ou na janela de abertura de ficheiros. </para>
+<sect2
+><title
+>Comparar/Juntar duas directorias: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2</replaceable
+> -o <replaceable
+>destino</replaceable
+>
+</screen>
+<para
+>Se não for indicada nenhuma pasta de destino, então o &kdiff3; irá usar a <replaceable
+>pasta2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Comparar/Juntar estas pastas: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2 pasta3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>pasta1 pasta2 pasta3</replaceable
+> -o <replaceable
+>destino</replaceable
+>
+</screen>
+<para
+>Quando forem reunidas três pastas, então a <replaceable
+>pasta1</replaceable
+> será usada como a base para a junção. Se não for indicada nenhuma pasta de destino, então o &kdiff3; irá usar a <replaceable
+>pasta3</replaceable
+> como pasta de destino para a junção. </para>
+
+<para
+>Repare que só a comparação é que começa automaticamente, não a junção. Para tal, terá de seleccionar primeiro um item do menu ou a tecla F7. (Mais detalhes posteriormente.) </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Informação Visível da Junção de Pastas</title>
+<para
+>Ao ler as pastas, aparece uma mensagem que o informa do progresso. Se você interromper a pesquisa das pastas, então só os ficheiros que tenham sido comparados até então serão listados. </para
+><para
+>Quando a pesquisa de pastas estiver completa, então o &kdiff3; irá mostrar uma lista com os resultados restantes, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... e os detalhes sobre o item seleccionado de momento à direita: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>A Coluna do Nome</title>
+<para
+>Cada ficheiro e pasta encontrado durante a pesquisa é aqui mostrado numa árvore. Você poderá seleccionar um item se carregar nele uma vez com o rato. </para
+><para
+>As pastas estão fechadas por omissão. Você poderá expandi-las e fechá-las se carregar no "+"/"-" ou se fizer duplo-click no item ou ainda usando as teclas de cursores esquerda/direita. O menu "Directoria" também contém duas acções "Fechar Todas as Sub-Directorias" e "Expandir Todas as Sub-Directorias", com as quais poderá fechar ou abrir todas as subpastas de uma vez. </para
+><para
+>Se fizer duplo-click num item de um ficheiro, então a comparação do ficheiro irá começar e irá aparecer a janela de diferenças do ficheiro. </para>
+<para
+>A imagem na coluna do nome reflecte o tio de ficheiro na primeira pasta ("A"). Poderá ser um dos seguintes: </para>
+<itemizedlist>
+     <listitem
+><para
+>Ficheiro normal</para
+></listitem>
+     <listitem
+><para
+>Pasta normal (imagem de pasta)</para
+></listitem>
+     <listitem
+><para
+>Ligação para um ficheiro (imagem de ficheiro com uma seta de ligação)</para
+></listitem>
+     <listitem
+><para
+>Ligação para uma pasta (imagem de pasta com uma seta de ligação)</para
+></listitem>
+</itemizedlist>
+<para
+>Se o tipo de ficheiro for diferente nas outras pastas, então isso é visível nas colunas A/B/C e na janela que mostra os detalhes sobre o item seleccionado. Repare que, neste caso, não poderá ser seleccionada nenhuma operação de junção automaticamente. Ao iniciar a junção, então o utilizador será informado dos problemas desse tipo. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>As Colunas A/B/C e o Esquema de Cores</title>
+<para
+>Como pode ser visto na imagem acima, as cores vermelha, verde, amarela e preta são usadas nas colunas A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Preto: O item não existe nesta pasta.</para
+></listitem>
+     <listitem
+><para
+>Verde: Item mais recente.</para
+></listitem>
+     <listitem
+><para
+>Amarelo: Mais antigo que o verde, mais recente que o vermelho.</para
+></listitem>
+     <listitem
+><para
+>Vermelho: O item mais antigo.</para
+></listitem>
+</itemizedlist>
+<para
+>Contudo, para os itens que eram idênticos na comparação, a sua cor é também idêntica mesmo que a idade seja diferente. </para
+><para
+>As pastas são consideradas iguais se todos os itens que contêm forem idênticos. Nesse caso, elas terão a mesma cor. Porém, a idade de uma pasta não é tida em consideração de acordo com a sua cor. </para
+><para
+>A ideia do autor para este esquema de coloração veio do <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. As cores lembram as cores de uma folha que é verde quando é nova, vai-se tornando amarela com o tempo e é vermelha quando é antiga. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>A Coluna de Operação</title>
+<para
+>Depois de comparar as patas, o &kdiff3; avalia também uma proposta para uma operação de junção. Esta é mostrada na coluna de "Operação". O utilizador poderá modificar a operação se carregar na operação que deseja alterar. Irá aparecer um pequeno menu que lhe permite seleccionar uma operação para esse item (Poderá também seleccionar as operações mais necessárias através do teclado. O Ctrl+1/2/3/4/Del irá seleccionar o A/B/C/Juntar/Remover, respectivamente, se estiver disponível.) Esta operação será executada durante a junção. Depende do item e do modo de junção em que se encontra e de que operações estão disponíveis. O modo de junção é um dos seguintes </para>
+<itemizedlist>
+     <listitem
+><para
+>Junção de três pastas (a "A" é tratada como a base mais antiga de ambas).</para
+></listitem>
+     <listitem
+><para
+>Junção de duas pastas.</para
+></listitem>
+     <listitem
+><para
+>Modo de sincronização de duas pastas (activado com a opção "Sincronizar as Directorias").</para
+></listitem>
+</itemizedlist>
+<para
+>Na junção de três pastas, a proposta de operação será: Se para um item ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... todas as três pastas forem iguais: Copiar do C</para
+></listitem>
+     <listitem
+><para
+>... o A e o C são iguais mas o B não: Copiar a partir do B (ou se o B não existir, remover o destino se existir)</para
+></listitem>
+     <listitem
+><para
+>... o A e o B são iguais mas o C não: Copiar a partir do C (ou se o C não existir, remover o destino se existir)</para
+></listitem>
+     <listitem
+><para
+>... o B e o C são iguais mas o A não: Copiar a partir do C (ou se o C não existir, remover o destino se existir)</para
+></listitem>
+     <listitem
+><para
+>... só o A existir: Remover o destino (se existir)</para
+></listitem>
+     <listitem
+><para
+>... só o B existir: Copiar a partir do B</para
+></listitem>
+     <listitem
+><para
+>... só o C existir: Copiar a partir do C</para
+></listitem>
+     <listitem
+><para
+>... o A, o B e o C não são iguais: Juntar</para
+></listitem>
+     <listitem
+><para
+>... o A, o B e o C não tiverem o mesmo tipo de ficheiro (&eg; o A é uma pasta e o B um ficheiro): "Erro: Tipo de Ficheiros em Conflito". Enquanto existirem itens nesta situação, a junção de pastas não poderá começar.</para
+></listitem>
+</itemizedlist>
+<para
+>Na junção de duas pastas, a proposta de operação será: Se para um item ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... ambas as pastas forem iguais: Copiar do B</para
+></listitem>
+     <listitem
+><para
+>... o A existir, mas o B não: Copiar a partir do A</para
+></listitem>
+     <listitem
+><para
+>... o B existir, mas o A não: Copiar a partir do B</para
+></listitem>
+     <listitem
+><para
+>... o A e o B existirem mas não forem iguais: Juntar</para
+></listitem>
+     <listitem
+><para
+>... o A e o B não tiverem o mesmo tipo de ficheiro (p.ex.,  o A é uma pasta e o B um ficheiro): "Erro: Tipo de Ficheiros em Conflito". Enquanto existirem itens nesta situação, a junção de pastas não poderá começar.</para
+></listitem>
+</itemizedlist>
+<para
+>O modo de sincronização só está activo se forem indicadas duas pastas e não se não for indicado nenhum destino explícito, assim como a opção "Sincronizar as directorias" terá de estar activa. Nesse caso, o &kdiff3; irá seleccionar uma operação por omissão, de modo a que ambas as pastas fiquem iguais no fim. Se, para um item ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... ambas as pastas forem iguais: Não será feito nada.</para
+></listitem>
+     <listitem
+><para
+>... o A existir mas o B não: Copiar o A para o B</para
+></listitem>
+     <listitem
+><para
+>... o B existir mas o A não: Copiar o B para o A</para
+></listitem>
+     <listitem
+><para
+>... o A e o B existirem, mas não forem iguais: Juntar e guardar o resultado em ambas as pastas. (Para o utilizador, o nome do ficheiro gravado visível será o B, mas o &kdiff3; irá copiar o B também para o A.)</para
+></listitem>
+     <listitem
+><para
+>... o A e o B não tiverem o mesmo tipo de ficheiro (p.ex.,  o A é uma pasta e o B um ficheiro): "Erro: Tipo de Ficheiros em Conflito". Enquanto existirem itens nesta situação, a junção de pastas não poderá começar.</para
+></listitem>
+</itemizedlist>
+<para
+>Quando duas pastas forem reunidas e a opção "Copiar o mais recente em vez de juntar" estiver seleccionada, então o &kdiff3; irá olhar para as datas e irá optar por escolher o ficheiro mais recente. Se os ficheiros não forem iguais mas tiverem datas iguais, então a operação irá conter "Erro: As datas são iguais mas os ficheiros não.". Enquanto esses itens existirem a junção de pastas não poderá começar. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>A Coluna de Estado</title>
+<para
+>Durante a junção, os ficheiros serão processados um a seguir ao outro. A coluna de estado irá mostrar "Terminado" para os itens em que a operação de junção foi bem sucedida e outros textos se algo ocorreu de inesperado. Quando se terminar uma junção, o utilizador deverá então fazer uma última verificação para confirmar se o estado de todos os itens é aceitável. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Colunas de Estatísticas</title>
+<para
+>Quando o modo de comparação de ficheiros "Análise Completa" estiver activo nas opções, então o &kdiff3; irá mostrar colunas extra que contêm o número de conflitos não resolvidos, resolvidos, de espaços em branco e dos outros conflitos. (A coluna de resolvidos só irá aparecer ao comparar ou ao juntar três pastas.) </para>
+</sect2>
+
+<sect2 id="selectingvisiblefiles"
+><title
+>Seleccionar os Ficheiros Listados</title>
+<para
+>Diversas opções influenciam os ficheiros que são listados aqui. Algumas estão acessíveis na <link linkend="dirmergeoptions"
+>janela de configuração</link
+>. O menu Directoria contém os itens: </para
+><para
+><itemizedlist>
+     <listitem
+><para
+>"Mostrar os Ficheiros Idênticos": Os ficheiros que foram detectados como iguais em todas as pastas de entrada.</para
+></listitem>
+     <listitem
+><para
+>"Mostrar os Ficheiros Diferentes": Os ficheiros que existem em duas ou mais pastas, mas que não são iguais entre si.</para
+></listitem>
+     <listitem
+><para
+>"Mostrar os Ficheiros Apenas em A": Os ficheiros que existem apenas em A, mas não em B ou C.</para
+></listitem>
+     <listitem
+><para
+>"Mostrar os Ficheiros Apenas em B": Os ficheiros que existem apenas em B, mas não em A ou C.</para
+></listitem>
+     <listitem
+><para
+>"Mostrar os Ficheiros Apenas em C": Os ficheiros que existem apenas em C, mas não em A ou B.</para
+></listitem>
+</itemizedlist
+></para>
+<para
+>Active apenas as opções "Mostrar" para os itens que deseja listar. Se, por exemplo, quiser listar apenas os itens que existem ou em A ou em B, mas não em ambos, terá de activar o "Mostrar os Ficheiros Apenas em A" e "Mostrar os Ficheiros Apenas em B" e desactivar todos os outros ("Mostrar os Ficheiros Idênticos", "Mostrar os Ficheiros Diferentes", "Mostrar os Ficheiros Apenas em C"). A lista será actualizada imediatamente para reflectir as alterações. </para
+><para
+>Estas opções também se aplicam nas pastas, com uma excepção: Se desactivar o "Mostrar os Ficheiros Diferentes" não irá esconder as pastas por completo. Isto só irá funcionar para os ficheiros dentro delas. </para
+><para
+>Lembre-se que, destas opções, só a "Mostrar os Ficheiros Idênticos" é persistente. As outras ficam activas ao iniciar o &kdiff3;. </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Fazer uma Junção de Pastas</title>
+<para
+>O utilizador tanto poderá reunir o item seleccionado de momento (ficheiro ou pasta) ou todos os itens. Quando tiver feito todas as suas opções de operação (em todas as subpastas também), aí então poderá iniciar a junção. </para
+><para
+>Tenha em atenção que, se não tiver indicado explicitamente uma pasta de destino, então o destino será o "C" no modo de três pastas, o "B" no modo de junção de duas pastas e no modo de sincronização será o "A" e/ou o "B". </para
+><para
+>Se tiver indicado uma pasta de destino, verifique também que todos os itens que deverão estar no resultado, estão na árvore respectiva. Existem algumas opções que fazem com que certos itens sejam omitidos na comparação e junção de pastas. Assinale estas opções para evitar surpresas desagradáveis: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Directorias Recursivas": Se estiver desligada, então os itens em todas as subpastas não serão tratados.</para
+></listitem>
+     <listitem
+><para
+>"Padrão"/"Anti-Padrão": Inclui/exclui os itens que correspondam ao padrão</para
+></listitem>
+     <listitem
+><para
+>"Excluir os Ficheiros Escondidos"</para
+></listitem>
+     <listitem
+><para
+>As <link linkend="selectingvisiblefiles"
+>opções "Mostrar"</link
+> (Mostrar os Ficheiros Iguais/Diferentes, Ficheiros apenas em A/B/C)</para
+></listitem>
+</itemizedlist>
+<para
+>Se mudar a configuração, para mostrar mais ficheiros, é preciso fazer uma nova pesquisa, com a opção "Directoria"->"Pesquisar de Novo". (A razão para tal é que o &kdiff3; omite a comparação dos ficheiros suprimidos por estes critérios.) Se mudou os seus padrões de ficheiros e pastas para excluir os ficheiros, então a lista de ficheiros será imediatamente actualizada, ao fechar a janela de opções. </para
+><para
+>Lembre-se que, quando gravar numa pasta completamente nova, normalmente também irá querer copiar os ficheiros iguais. Nesse caso, active a opção "Mostrar os Ficheiros Iguais". Se a sua pasta de destino é uma das entradas, então não será necessário, porque o ficheiro já estará lá. </para
+><para
+>Se estiver satisfeito até agora, o resto é simples. </para
+><para
+>Para juntar todos os itens: Seleccione "Iniciar/Continuar a junção da directoria" no menu "Directoria" ou carregue em F7 (que é o atalho). Para juntar apenas o item actual: Seleccione "Executar a Operação no Item Actual" ou carregue em F6. </para
+><para
+>Se, devido à existência de tipos de ficheiro em conflito, ainda permanecerem alguns itens com operações inválidas, então irá aparecer uma mensagem onde serão evidenciados esses itens, para que possa seleccionar uma operação válida para cada item. </para
+><para
+>Se juntar todos os itens, irá aparecer uma janela que lhe apresenta as opções "Fazê-lo", "Simulá-lo" e "Cancelar". </para>
+<itemizedlist>
+     <listitem
+><para
+>Seleccione "Simulá-lo" se quiser ver o que seria feito sobre o item sem aplicar de facto as modificações. Será apresentada uma lista descritiva com todas as operações.</para
+></listitem>
+     <listitem
+><para
+>Caso contrário, seleccione "Fazê-lo" para iniciar de facto a junção.</para
+></listitem>
+</itemizedlist>
+<para
+>Nesse caso, o &kdiff3; irá executar a operação indicada para todos os itens. Se for necessária alguma intervenção manual (na junção de ficheiros simples), então irá aparecer uma janela de junção (<link linkend="dirmergebigscreenshot"
+>ver a imagem grande</link
+>). </para
+><para
+>Quando tiver terminado um ficheiro, seleccione de novo "Iniciar/Continuar a junção da directoria" ou a tecla F7. Se não tiver ainda gravado nada, irá aparecer uma janela a pedir-lhe isso. Aí, o &kdiff3; irá passar ao próximo item. </para
+><para
+>Quando o &kdiff3; encontrar um erro, indicar-lhe-á tal facto e irá mostrar a informação descritiva do estado. No fundo desta lista, existirão algumas mensagens de erro que o deverão ajudar a compreender a causa do problema. Quando continuar a junção (com a tecla F7), o &kdiff3; indicar-lhe-á a opção para repetir ou saltar o item que causou o problema. Isto significa que, antes de continuar, poderá escolher outra operação ou resolver o problema por outros meios. </para
+><para
+>Quando a junção estiver completa, o &kdiff3; informá-lo-á então com uma mensagem. </para
+><para
+>Se alguns dos itens foram reunidos individualmente, então o &kdiff3; irá recordar isto (enquanto esta sessão de junção prosseguir) e não os juntará de novo, até que a junção para todos os itens tenha sido executada. Mesmo quando a junção tenha sido ignorada ou não tenha sido gravado nada, estes itens irão contar como completos. Só quando tiver alterado a operação de junção é que o estado de "Pronto" do item será removido e este poderá ser reunido de novo. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Opções para Comparar e Juntar Pastas</title>
+<para
+>As preferências do &kdiff3; (no menu "Configuração"-&gt;"Configurar o &kdiff3;") têm agora uma secção intitulada "Junção de Directorias" com as seguintes opções: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Directorias Recursivas:</emphasis
+></term
+><listitem
+><para
+>Indica se você deseja pesquisar as pastas de forma recursiva.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Padrões de Ficheiros:</emphasis
+></term
+><listitem
+><para
+>Só os ficheiros que correspondam ao padrão ou padrões aqui indicados é que serão colocados na árvore. Poderá ser indicado mais do que um padrão através do separador ponto-e-vírgula ";". São considerados caracteres especiais válidos o "*" e o "?". (&eg; "*.cpp;*.h"). Por omissão, este campo é igual a "*". As pastas não precisam de corresponder a este padrão.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-Padrões de Ficheiros:</emphasis
+></term
+><listitem
+><para
+>Os ficheiros que correspondam ao padrão ou padrões aqui indicados serão excluídos da árvore. Poderá ser indicado mais do que um padrão através do separador ponto-e-vírgula ";". São considerados caracteres especiais válidos o "*" e o "?". Por omissão, este campo é igual a "*.orig;*.o;*.obj".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Anti-Padrões da Directoria:</emphasis
+></term
+><listitem
+><para
+>As pastas que correspondam ao padrão ou padrões aqui indicados serão excluídas da árvore. Poderá ser indicado mais do que um padrão através do separador ponto-e-vírgula ";". São considerados caracteres especiais válidos o "*" e o "?". Por omissão, este campo é igual a "CVS;deps;.svn".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Usar CVS-Ignore:</emphasis
+></term
+><listitem
+><para
+>Ignora os ficheiros e pastas que são também ignorados pelo CVS. Muitos dos ficheiros gerados automaticamente são ignorados pelo CVS. A grande vantagem é que esta funcionalidade é específica para cada pasta através de um ficheiro ".cvsignore" local. (Veja em <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Procurar os Ficheiros e Directorias Escondidos:</emphasis
+></term
+><listitem
+><para
+>Em alguns sistemas de ficheiros, existe um atributo "Escondido". Em outros sistemas, um nome de ficheiro que comece por "." faz com que este seja considerados escondido. Esta opção permite-lhe decidir se deve incluir estes ficheiros na árvore ou não. Por omissão, são incluídos.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Seguir as Ligações de Ficheiros:</emphasis
+></term
+><listitem
+><para
+>Para as ligações aos ficheiros: Quando a opção estiver desactivada, as ligações simbólicas serão comparadas. Caso contrário, serão compilados os ficheiros para os quais apontam as ligações. Por omissão, a opção está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Seguir as Ligações de Directorias:</emphasis
+></term
+><listitem
+><para
+>Para as ligações a pastas: Quando a opção estiver desactivada, as ligações simbólicas serão comparadas. Se estiver activa, então a ligação será tratada como uma pasta e será pesquisada recursivamente. (Lembre-se que o programa não verifica se a ligação é "recursiva". Por isso, se uma pasta contiver por exemplo uma ligação para ela própria irá causar um ciclo infinito, pelo que ao fim de algum tempo a pilha estoira ou toda a memória será usada e o programa irá estoirar deste modo). Por omissão, a opção está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Comparação de Nomes de Ficheiros com Distinção de Maiúsculas:</emphasis
+></term
+><listitem
+><para
+>Por omissão, é falso no Windows e verdadeiro nos outros sistemas operativos.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Modo de Comparação de Ficheiros:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Comparação Binária:</emphasis
+></term
+><listitem
+><para
+>Este é o modo de comparação de ficheiros por omissão. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Análise Completa:</emphasis
+></term
+><listitem
+><para
+>Faz uma análise completa de cada ficheiro e mostra os resultados nas colunas de informação das estatísticas. (O número de conflitos resolvidos, por resolver, devido a espaços em branco ou a outros casos). A análise completa é mais lenta que uma simples comparação binária e é muito mais lenta se for usada em ficheiros que não contenham texto. (Indique os tipos de anti-padrões necessários.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Confiar na data de modificação:</emphasis
+></term
+><listitem
+><para
+>Se comparar pastas grandes numa rede lenta, poderá ser mais rápido comparar somente as datas de modificação e os tamanhos dos ficheiros. Porém, este melhoramento de velocidade traz alguma incerteza. Use esta opção com cuidado. Por omissão, está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Confiar no tamanho:</emphasis
+></term
+><listitem
+><para
+>É semelhante à comparação da data de modificação. Não ocorre nenhuma comparação em si. Dois ficheiros quaisquer são considerados iguais se os seus tamanhos de ficheiros forem iguais. Isto é útil quando a operação de cópia de ficheiros não preservar a data de modificação. Use esta opção com cuidado. Por omissão, está desligada.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Sincronizar as Directorias:</emphasis
+></term
+><listitem
+><para
+>Activa o "Modo de Sincronização" em que duas pastas são comparadas e não foi indicada nenhuma pasta de destino. Neste modo, as operações propostas serão escolhidas de modo a que ambas as pastas de origem fiquem iguais no fim. Do mesmo modo, o resultado da junção será gravado em ambas as pastas. Por omissão, esta opção está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Copiar o mais recente em vez de juntar:</emphasis
+></term
+><listitem
+><para
+>Em vez de juntar, a operação proposta irá copiar os ficheiros mais recentes se ocorreram algumas alterações. (É considerado inseguro, porque implica saber se o outro ficheiro não foi também alterado. Verifique para se certificar em qualquer um dos casos.). Por omissão, a opção está desligada.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ficheiros de segurança:</emphasis
+></term
+><listitem
+><para
+>Se um ficheiro ou uma pasta completa for substituído por outro ou for removido, então a versão original mudará para um nome com uma extensão ".orig". Se já existir um ficheiro antigo com uma extensão ".orig", então este será removido sem ser criada nenhuma cópia de segurança. Isto também afecta a junção normal de ficheiros simples, não só no modo de junção de pastas. Por omissão, a opção está activa.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Outras Funções na Janela de Junção de Pastas</title>
+<sect2
+><title
+>Modo de Ecrã Repartido/Completo</title>
+<para
+>Normalmente a lista de junção da pasta fica visível enquanto um único ficheiro é comparado ou reunido. Com o rato, o utilizador poderá mover a barra separadora que delimita a lista de ficheiros das janelas de diferenças do texto. Se não a quiser, poderá desactivar a "Janela Repartida" no menu "Directoria". Aí, poderá usar a opção "Comutar a Vista" no menu "Directoria" para alternar entre a lista de ficheiros e a janela de diferenças no texto que irá então ocupar o ecrã completo. </para>
+</sect2>
+<sect2
+><title
+>Comparar ou Juntar um Único Ficheiro</title>
+<para
+>Provavelmente, você irá preferir um duplo-click do rato simples sobre um ficheiro para o poder comparar. Contudo, existe também um item no menu "Directoria". Poderá também juntar directamente um único ficheiro sem iniciar a junção de pastas, através da opção "Juntar o ficheiro actual" do menu "Juntar". Ao gravar o resultado, o estado ficará como terminado e o ficheiro não será reunido de novo se for iniciada uma junção de pastas. </para
+><para
+>Mas repare que esta informação de estado será perdida quando voltar a executar uma pesquisa de pastas: menu "Directoria"->"Pesquisar de novo" </para>
+</sect2>
+<sect2
+><title
+>Comparar ou Juntar Ficheiros com Nomes Diferentes</title>
+<para
+>Em alguns casos, terá de comparar ou juntar ficheiros com nomes diferentes (p.ex., o ficheiro actual e a cópia de segurança na mesma pasta). </para
+><para
+>Seleccione o ficheiro exacto, carregando no ícone na coluna A, B ou C. O primeiro ficheiro seleccionado será então marcado com um "A", enquanto o segundo e o terceiro ficará com um "B" e um "C", independentemente da coluna em que se encontram. Só poderá escolher até três ficheiros desta forma. </para
+><para
+>Siga com a escolha de "Comparar os Ficheiros Explicitamente Seleccionados" ou "Juntar os Ficheiros Explicitamente Seleccionados" no menu "Pasta". Por conveniência, estes itens de menu também aparecem como um menu de contexto, quando carregar com o botão direito no último ficheiro seleccionado. </para
+><para
+>A comparação ou junção de um ficheiro irá acontecer na mesma janela. Se este método for usado para as pastas, será aberta uma nova janela. </para
+></sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Tópicos Diversos</title>
+<sect1 id="networktransparency">
+<title
+>Transparência na rede através do KIO</title>
+<sect2
+><title
+>KIO-Slaves</title>
+<para
+>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. </para
+><para
+>Exemplo: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> teste.cpp  ftp://ftp.longe.org/teste.cpp
+   <command
+>kdiff3</command
+> tar:/home/eu/pacote.tar.gz/pasta ./pasta
+</screen>
+</para>
+<para
+>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. </para
+><para
+>Outros 'KIO-slaves' que serão interessantes: </para>
+<itemizedlist>
+<listitem
+><para
+>Ficheiros da WWW (http:),</para
+></listitem>
+<listitem
+><para
+>Ficheiros de FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Transferência de ficheiros cifrada (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Recursos do Windows (smb:),</para
+></listitem>
+<listitem
+><para
+>Ficheiros locais (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>Outras coisas que são possíveis, mas provavelmente serão menos interessantes: </para>
+<itemizedlist>
+<listitem
+><para
+>Páginas do 'man' (man:),</para
+></listitem>
+<listitem
+><para
+>Páginas do 'info' (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Como Escrever URLs</title>
+<para
+>Um dado URL tem uma sintaxe diferente, em comparação com as localizações dos ficheiros e pastas locais. Alguns factores terão de ser tidos em consideração: </para>
+<itemizedlist>
+<listitem
+><para
+>Uma localização poderá ser relativa e conter "." ou "..". Isto não é possível para os URLs, dado que estes são sempre absolutos. </para
+></listitem
+><listitem
+><para
+>Os caracteres especiais têm de ser escritos "escapados". ("#"->"%23", espaço->"%20", etc.) &eg; Um ficheiro com o nome "/#xpto#" iria ter o URL "file:/%23xpto%23". </para
+></listitem
+><listitem
+><para
+>Quando os URLs não funcionarem como seria de esperar, tente abri-los primeiro no Konqueror. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Capacidades dos 'KIO-Slaves'</title>
+<para
+>A transparência na rede tem um senão: nem todos os recursos têm as mesmas capacidades. </para
+><para
+>Algumas das vezes estas são devidas ao sistema de ficheiros do servidor, enquanto que noutras ocasiões poderá ser devido ao protocolo. Aqui está uma pequena lista das restrições: </para>
+<itemizedlist>
+<listitem
+><para
+>Em alguns casos não existe o suporte para ligações simbólicas. </para
+></listitem
+><listitem
+><para
+>Ou não existe forma de distinguir se uma ligação aponta para um ficheiro ou uma pasta; é assumido sempre um ficheiro. (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Não é sempre possível determinar o tamanho do ficheiro. </para
+></listitem
+><listitem
+><para
+>Existe um suporte de permissões limitado. </para
+></listitem
+><listitem
+><para
+>Não existe a possibilidade de modificar as permissões ou a data de modificação, como tal as permissões ou a data de uma cópia poderão ser diferentes do original. (Veja a opção "Confiar no tamanho".) (A modificação de permissões ou das datas só é possível para os ficheiros locais.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Usar o &kdiff3; como uma KPart</title>
+<para
+>O &kdiff3; é uma KPart. De momento, implementa a interface "KParts::ReadOnlyPart". </para
+><para
+>A sua utilização principal é como visualizador de diferenças no KDevelop. O KDevelop inicia sempre o visualizador de diferenças interno em primeiro lugar. Para invocar o &kdiff3;, carregue com o botão direito do rato na janela do visualizador de diferenças e seleccionar "Mostrar no KDiff3Part" no menu de contexto. </para
+><para
+>O &kdiff3; necessita normalmente de dois ficheiros completos como entrada. Se for usado como componente KPart, o &kdiff3; irá assumir que o ficheiro de entrada é um ficheiro de 'patch' no formato unificado. O &kdiff3; irá então obter os nomes dos ficheiros originais do ficheiro de 'patch'. Pelo menos um dos dois ficheiros terá de estar disponível. O &kdiff3; irá então invocar o <command
+>patch</command
+> para criar de novo o segundo ficheiro. </para
+><para
+>No Konqueror;, o utilizador poderá seleccionar um ficheiro de 'patch' e seleccionar "Antevisão em"-"KDiff3Part" no menu de contexto. Tenha em atenção que isto não irá funcionar se nenhum dos ficheiros originais estiver disponível e não é fiável se os ficheiros originais tiverem sido alterados desde que o ficheiro de 'patch' foi gerado. </para
+><para
+>Quando é executado como um componente, o &kdiff3; só oferece uma diferença de dois ficheiros, uma barra de ferramentas muito pequena e um menu. A junção ou a comparação de pastas não é suportada nesse caso. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Perguntas e Respostas</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Porque é que se chama "&kdiff3;"? </para
+></question
+><answer
+><para
+>As ferramentas "KDiff" e "KDiff2" (agora chamada Kompare;) já existiam. Para além disso, o &kdiff3; deveria sugerir que consegue juntar ficheiros como a ferramenta "diff3" da colecção de ferramentas do Diff. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Porque é que é lançado segundo a GPL? </para
+></question
+><answer
+><para
+>O autor usou programas GPL durante bastante tempo até agora e aprendeu bastante ao olhar para bastante código. Daí, este é o "Muito Obrigado" para todos os programadores que também o fizeram ou irão fazer no futuro. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Faltam alguns botões e funções. O que é que se passa? </para
+></question
+><answer
+><para
+>Você compilou a partir do código mas não indicou provavelmente o prefixo correcto do KDE com o "configure". Por omissão, o "configure" deseja instalar no "/usr/local", mas aí o KDE não consegue encontrar o ficheiro de recursos da interface do utilizador (isto é, o "kdiff3ui.rc"). O ficheiro README contém mais informações sobre o prefixo correcto. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Muitas das vezes as linhas que são semelhantes mas não idênticas aparecem umas ao lado das outras mas noutros casos não. Porquê? </para
+></question
+><answer
+><para
+>As linhas em que apenas a quantidade de espaços em branco é diferente são tratadas como "iguais" à primeira vista, embora apenas um carácter que não seja um espaço em branco faça com que as linhas sejam "diferentes". Se as linhas semelhantes aparecerem uma ao lado da outra, isto poderá ser de facto uma coincidência, mas é felizmente o caso mais frequente. Veja também em <link linkend="manualdiffhelp"
+>Ajuda das Diferenças Manuais</link
+>. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Porque é que todos os conflitos deverão ser resolvidos para que o resultado da gravação possa ser gravado? </para
+></question
+><answer
+><para
+>Para cada secção igual ou diferente, o editor na janela do resultado da junção recorda onde é que esta começa ou termina. Isto é necessário para que os conflitos possam ser resolvidos manualmente ao seleccionar simplesmente o botão da origem (A, B ou C). Esta informação é perdida durante a gravação como texto e corresponde a demasiado esforço criar um formato de ficheiro especial que suporte a gravação e a reposição de toda a informação necessária. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Como é que posso sincronizar as janelas de diferenças e junção, de modo que todas mostrem a mesma posição de texto? </para
+></question
+><answer
+><para
+>Carregue na coluna de resumo à esquerda do texto. (<link linkend="synchronise_views"
+>Veja também aqui.</link
+>) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Porque é que o editor na janela do resultado da junção não tem uma função para "desfazer"? </para
+></question
+><answer
+><para
+>Isso era demasiado difícil até agora. Você poderá sempre repor uma versão de uma origem (A, B ou C) se carregar no botão respectivo. Para uma edição extensa, recomenda-se a utilização de outro editor, de qualquer forma. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Quando eu removi algum texto, apareceu de repente "&lt;Sem linha de origem&gt;" e esta não pode ser removida. O que é que significa e como é que se poderá removê-la? </para
+></question
+><answer
+><para
+>Para cada secção igual ou diferente, o editor na janela do resultado da junção recorda onde é que esta começa ou termina. O "&lt;Sem linha de origem&gt;" significa que não existe mais nada livre numa secção, nem mesmo um carácter de mudança de linha. Isto poderá acontecer durante a junção automática ou durante a edição. Isto não é nenhum problema, dado que esta dica não irá aparecer no ficheiro gravado. Se você quiser os dados originais de volta, basta seleccionar a secção (carregue na coluna de resumo à esquerda) e depois no botão da origem com o conteúdo necessário (A/B ou C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Porque é que o &kdiff3; não suporta o realce de sintaxe? </para
+></question
+><answer
+><para
+>O &kdiff3; já usa demasiadas cores para o realce das diferenças. Se suportasse o realce de sintaxe, tornar-se-ia confuso. Use outro editor para esse efeito. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Posso usar o &kdiff3; para comparar ficheiros do OpenOffice.Org, Word, Excel, PDF, &etc;? </para
+></question
+><answer
+><para
+>Ainda que o &kdiff3; analise qualquer tipo de ficheiro, o resultado poderá não ser muito satisfatório para si. </para
+><para
+>O &kdiff3; foi feito para comparar ficheiros de texto puros. O OpenOffice, Word, Excel etc. gravam muito mais informação nos ficheiros (acerca dos tipos de letra, imagens, páginas, cores, etc.), que o &kdiff3; não conhece. Deste modo, o &kdiff3; mostrar-lhe-á o conteúdo do ficheiro interpretado como texto puro, mas este poderá estar ilegível ou, pelo menos, ficará muito esquisito. </para
+><para
+>Dado que a maioria dos programas, nos dias de hoje, gravam o seu conteúdo no formato XML, poderá ser capaz de os ler como texto puro. Por isso, se a alteração foi pequena, o &kdiff3; podê-lo-á ajudar à mesma. </para
+><para
+>A melhor solução, se quiser apenas comparar o texto (sem as imagens incorporadas, como as imagens), é usar o "Seleccionar Tudo" e o "Copiar" no seu programa, para copiar o texto interessante para a área de transferência e depois, no &kdiff3;, colar o texto em qualquer uma das janelas de entrada. (Veja também o <link linkend="selections"
+>Seleccionar, Copiar e Colar</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Para onde foi a opção de pastas "Listar apenas os deltas"? </para
+></question
+><answer
+><para
+>Existem agora várias <link linkend="selectingvisiblefiles"
+>opções "Mostrar"</link
+> no menu de pastas. Se desactivar o "Mostrar os ficheiros iguais", irá obter o resultado que o "Listar apenas os deltas" fazia. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Como é que faço uma grande selecção na janela de entrada de diferenças, dado que o deslocamento leva tanto tempo? </para
+></question
+><answer
+><para
+>Comece a selecção da forma normal (carregue e mantenha o botão esquerdo do rato carregado). Depois, use as teclas de navegação (p.ex., o Page Up, Page Down), enquanto mantém carregado o botão esquerdo do rato. (Veja também em <link linkend="selections"
+>Seleccionar, Copiar e Colar</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Existe demasiada informação aqui, mas a sua dúvida ainda não foi respondida? </para
+></question
+><answer
+><para
+>Por favor envie ao autor a sua dúvida. Agradece-se qualquer comentário. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Créditos e Licença</title>
+
+<para
+>&kdiff3; - Ferramenta de Comparação e Junção de Ficheiros e Pastas </para>
+<para
+>Programa com 'copyright' 2002-2006 de Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+<para
+>Vieram várias ideias giras e relatórios de erros dos colegas do autor e de pessoas da Wild Wild Web. Muito obrigado! </para>
+
+<para
+>Documentação Copyright &copy; 2002-2006 Joachim Eibl <email
+>joachim.eibl at gmx.de</email
+> </para>
+
+<para
+>Tradução de Pedro Morais <email
+>morais@kde.org</email
+></para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Instalação</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Como obter o &kdiff3;</title>
+
+<para
+>Você poderá obter a última versão do &kdiff3; na sua página pessoal em <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>O &kdiff3; está também disponível para outras plataformas. Veja a página pessoal para mais detalhes. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Requisitos</title>
+
+<para
+>Para poder usar todas as funcionalidades com sucesso do &kdiff3;, precisa do &kde; 3.1 ou posterior. </para
+><para
+>Para mais informações sobre como correr o &kdiff3; noutras plataformas sem o KDE, veja por favor a <ulink url="http://kdiff3.sourceforge.net"
+>página pessoal</ulink
+>. </para
+><para
+>O utilizador poderá encontrar uma lista das alterações em <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> ou no ficheiro "ChangeLog" do pacote de código. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Compilação e Instalação</title>
+
+<para
+>Para poder compilar e instalar o &kdiff3; num sistema com o KDE, escreva o seguinte na pasta de base da distribuição do &kdiff3;:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-dir</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+>O <replaceable
+>kde-dir</replaceable
+> corresponde à pasta que contém o KDE no seu sistema. Se não tiver a certeza, leia o ficheiro README para mais detalhes. </para>
+<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>
+<para
+>Dado que o &kdiff3; usa o <command
+>autoconf</command
+> e o <command
+>automake</command
+>, você não deverá ter problemas a compilá-lo. No caso de ter alguns problemas, por favor comunique-os nas listas de correio do &kde;.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/pt/iteminfo.png b/doc/pt/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/pt/iteminfo.png
diff --git a/doc/pt/letter_by_letter.png b/doc/pt/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/pt/letter_by_letter.png
diff --git a/doc/pt/merge_current.png b/doc/pt/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/pt/merge_current.png
diff --git a/doc/pt/new.png b/doc/pt/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/pt/new.png
diff --git a/doc/pt/open_dialog.png b/doc/pt/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/pt/open_dialog.png
diff --git a/doc/pt/screenshot_diff.png b/doc/pt/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/pt/screenshot_diff.png
diff --git a/doc/pt/screenshot_merge.png b/doc/pt/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/pt/screenshot_merge.png
diff --git a/doc/pt/triple_diff.png b/doc/pt/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/pt/triple_diff.png
diff --git a/doc/pt/white_space.png b/doc/pt/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/pt/white_space.png
diff --git a/doc/sv/Makefile.am b/doc/sv/Makefile.am
new file mode 100644
index 0000000..bef483f
--- /dev/null
+++ b/doc/sv/Makefile.am
@@ -0,0 +1,4 @@
+KDE_DOCS = kdiff3
+KDE_LANG = sv
+
+
diff --git a/doc/sv/dirbrowser.png b/doc/sv/dirbrowser.png
new file mode 100644
index 0000000..d3c63b2
--- /dev/null
+++ b/doc/sv/dirbrowser.png
diff --git a/doc/sv/dirmergebig.png b/doc/sv/dirmergebig.png
new file mode 100644
index 0000000..b26b65c
--- /dev/null
+++ b/doc/sv/dirmergebig.png
diff --git a/doc/sv/index.docbook b/doc/sv/index.docbook
new file mode 100644
index 0000000..55c61e2
--- /dev/null
+++ b/doc/sv/index.docbook
@@ -0,0 +1,2938 @@
+<?xml version="1.0" ?>
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kdiff3 "<application
+>KDiff3</application
+>">
+  <!ENTITY kappname "&kdiff3;">
+  <!ENTITY package "extragear-utils">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Swedish "INCLUDE">
+]>
+
+<book lang="&language;">
+
+<!-- This header contains all of the meta-information for the document such
+as Authors, publish date, the abstract, and Keywords -->
+
+<bookinfo>
+<title
+>Handbok &kdiff3;</title>
+
+<authorgroup>
+<author
+><firstname
+>Joachim</firstname
+> <surname
+>Eibl</surname
+> <affiliation
+><address
+> <email
+>joachim.eibl snabela gmx.de</email>
+</address
+></affiliation>
+</author>
+<othercredit role="translator"
+><firstname
+>Stefan</firstname
+><surname
+>Asserhäll</surname
+><affiliation
+><address
+><email
+>stefan.asserhall@comhem.se</email
+></address
+></affiliation
+><contrib
+>Översättare</contrib
+></othercredit
+> 
+</authorgroup>
+
+<copyright>
+<year
+>2002-2006</year>
+<holder
+>Joachim Eibl</holder>
+</copyright>
+<!-- Translators: put here the copyright notice of the translation -->
+<!-- Put here the FDL notice.  Read the explanation in fdl-notice.docbook
+     and in the FDL itself on how to use it. -->
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<!-- Date and version information of the documentation
+Don't forget to include this last date and this last revision number, we
+need them for translation coordination !
+Please respect the format of the date (YYYY-MM-DD) and of the version
+(V.MM.LL), it could be used by automation scripts.
+Do NOT change these in the translation. -->
+
+<date
+>2006-05-14</date>
+<releaseinfo
+>0.9.90</releaseinfo>
+
+
+<abstract>
+<para
+>&kdiff3; är ett verktyg för jämförelser och sammanfogning av filer och kataloger, som <itemizedlist>
+<listitem
+><para
+>jämför och sammanfogar två eller tre indatafiler med text eller kataloger,</para
+></listitem>
+<listitem
+><para
+>visar skillnaden rad-för-rad och tecken-för-tecken(!),</para
+></listitem>
+<listitem
+><para
+>tillhandahåller en automatisk sammanfogningsfunktion,</para
+></listitem>
+<listitem
+><para
+>har en editor för bekväm upplösning av sammanfogningskonflikter,</para
+></listitem>
+<listitem
+><para
+>erbjuder nätverkstransparens via KIO,</para
+></listitem>
+<listitem
+><para
+>har alternativ för att färglägga eller dölja ändringar av blanktecken och kommentarer,</para
+></listitem>
+<listitem
+><para
+>stöder Unicode, UTF-8 och andra filkodningar,</para
+></listitem>
+<listitem
+><para
+>skriver ut skillnader,</para
+></listitem>
+<listitem
+><para
+>stöder versionshanteringsnyckelord och historiksammanfogning.</para
+></listitem>
+</itemizedlist>
+</para
+><para
+>Det här dokumentet beskriver &kdiff3; version 0.9.89. </para>
+</abstract>
+
+<!-- This is a set of Keywords for indexing by search engines.
+Please at least include KDE, the KDE package it is in, the name
+ of your application, and a few relevant keywords. -->
+
+<keywordset>
+<keyword
+>KDE</keyword>
+<keyword
+>kdeextragear</keyword>
+<keyword
+>kdiff3</keyword>
+<keyword
+>diff</keyword>
+<keyword
+>sammanfoga</keyword>
+<keyword
+>CVS</keyword>
+<keyword
+>trippeljämförelse</keyword>
+<keyword
+>jämföra</keyword>
+<keyword
+>filer</keyword>
+<keyword
+>kataloger</keyword>
+<keyword
+>versionshantering</keyword>
+<keyword
+>trevägs sammanfogning</keyword>
+<keyword
+>skillnader på plats</keyword>
+<keyword
+>synkronisera</keyword>
+<keyword
+>kpart</keyword>
+<keyword
+>kio</keyword>
+<keyword
+>nätverkstransparent</keyword>
+<keyword
+>editor</keyword>
+<keyword
+>blanktecken</keyword>
+<keyword
+>kommentarer</keyword>
+</keywordset>
+
+</bookinfo>
+
+<chapter id="introduction"
+><title
+>Inledning</title>
+<sect1 id="why"
+><title
+>Ännu ett jämförelsegränssnitt?</title>
+<para
+>Det finns flera grafiska jämförelseverktyg. Varför ska du välja &kdiff3;? Låt mig tala om varför jag skrev det. </para
+><para
+>&kdiff3; påbörjades därför att jag var tvungen att göra en svår sammanfogning. Att sammanfoga är nödvändigt när flera personer arbetar med samma fil i ett projekt. En sammanfogning kan vara delvis automatiserad, när sammanfogningsverktyget inte bara har tillgång till de nya ändrade filerna (som kallas "grenar"), utan också originalfilen (som kallas "bas"). Sammanfogningsverktyget väljer automatiskt en ändring som bara gjorts i en gren. När flera bidragsgivare ändrar samma rader, detekterar sammanfogningsverktyget en konflikt som måste lösas manuellt. </para
+><para
+>Sammanfogningen var svår eftersom en bidragsgivare hade ändrat mycket och rättat indenteringen på många ställen. Den andra bidragsgivaren hade också ändrat mycket text i samma fil, vilket orsakade flera konflikter vid sammanfogningen. </para
+><para
+>Verktyget som jag då använde visade bara ändrade rader, men inte vad som hade ändrats inom raden. Det fanns inte heller någon information om var bara indenteringen hade ändrats. Sammanfogningen var en mindre mardröm. </para
+><para
+>Det var alltså början. Den första versionen kunde visa skillnader på en rad, och visade skillnader i blanktecken. Senare tillkom många funktioner för att öka användbarheten. </para
+><para
+>Om du till exempel snabbt vill jämföra en text, kan du kopiera den till klippbordet och klistra in i endera jämförelsefönstret. </para
+><para
+>En funktion som krävde en stor ansträngning var funktionen för katalogjämförelse och sammanfogning, som gjorde programmet till en nästan fullständig filbläddrare. </para
+><para
+>Jag hoppas att &kdiff3; fungerar för dig, också. Ha det så kul! </para
+><para
+>Joachim Eibl (2003) </para>
+</sect1>
+
+<sect1 id="screenshots"
+><title
+>Skärmbilder och funktioner</title>
+<para
+>Den här skärmbilden visar skillnaden mellan två textfiler</para>
+<para
+>(Med en tidig version av &kdiff3;):</para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+
+<para
+>Trevägs sammanfogning stöds fullständigt. Den är användbar om två personer ändrar kod oberoende av varandra. Originalfilen (basen) används för att hjälpa &kdiff3; att automatiskt välja de riktiga ändringarna. Sammanfogningseditorn under jämförelsefönstren låter dig lösa konflikter, medan utdata du kommer att få visas. Skärmbilden visar tre indatafiler som håller på att' sammanfogas: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+
+<para id="dirmergebigscreenshot"
+>&kdiff3; hjälper dig också att jämföra och sammanfoga hela kataloger. Den här skärmbilden visar &kdiff3; under en katalogsammanfogning: </para
+><para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="dirmergebig.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</para>
+</sect1>
+
+<sect1 id="features"
+><title
+>Mer funktioner</title>
+<sect2
+><title
+>Rad-för-rad och tecken-för-tecken jämförelsevisning</title>
+<para
+>Genom att använda möjligheterna hos en grafisk färgskärm, visar &kdiff3; exakt vad skillnaderna är. När du måste göra många kodgranskningar, gillar du det här. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="letter_by_letter.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Se skillnader i blanktecken med en blick</title>
+<para
+>Mellanslag och tabulatorer som skiljer sig åt syns. När rader bara skiljer sig i mängden blanktecken syns det med en blick i sammanfattningskolumnen till vänster. (Inga mer problem om någon ändrar indenteringen.) </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="white_space.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Trevägsjämförelse</title>
+<para
+>Analysera tre filer och se var de skiljer sig åt. </para
+><para
+>Vänster/mitten/höger fönster kallas A/B/C och har blå/grön/magenta färg. </para
+><para
+>Om en fil är likadan och en annan annorlunda för en rad, så visar färgerna vilken fil som är annorlunda. Den röda färgen betyder att båda de andra filerna är olika. </para>
+<screenshot
+><mediaobject>
+   <imageobject
+><imagedata fileref="triple_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+</sect2>
+
+<sect2
+><title
+>Bekväm sammanfogning av två eller tre indatafiler</title>
+<para
+>&kdiff3; kan användas för att sammanfoga två eller tre indatafiler och sammanfogar automatiskt så mycket som möjligt. Resultatet visas i ett redigerbart fönster där de flesta konflikter kan lösas med ett enda musklick. Välj knapparna A/B/C i verktygsraden för att välja källan som ska användas. Du kan också välja mer än en källa. Eftersom utmatningsfönstret är en editor, kan till och med konflikter som behöver ytterligare korrigering lösas här utan att kräva ett annat verktyg. </para>
+</sect2>
+
+<sect2
+><title
+>Och ...</title>
+<itemizedlist>
+   <listitem
+><para
+>Snabb navigering via knappar.</para
+></listitem>
+   <listitem
+><para
+>Ett musklick i sammanfattningskolumnen synkroniserar alla fönster så att samma position visas.</para
+></listitem>
+   <listitem
+><para
+>Markera och kopiera från vilket fönster som helst, och klistra in i resultatfönstret för sammanfogning.</para
+></listitem>
+   <listitem
+><para
+>Översiktskolumn som visar var ändringar och konflikter finns.</para
+></listitem>
+   <listitem
+><para
+>Färgerna kan justeras enligt dina specifika önskemål.</para
+></listitem>
+   <listitem
+><para
+>Justerbar flikstorlek.</para
+></listitem>
+   <listitem
+><para
+>Alternativ för att infoga mellanslag istället för tabulatortecken.</para
+></listitem>
+   <listitem
+><para
+>Öppna filer bekvämt via dialogrutor, eller ange filnamn på kommandoraden.</para
+></listitem>
+   <listitem
+><para
+>Sök efter strängar i alla textfönster. Sök (Ctrl+F) och Sök igen (F3)</para
+></listitem>
+   <listitem
+><para
+>Visa radnummer för varje rad. </para
+></listitem>
+   <listitem
+><para
+>Klistra in klippbordet eller dra text till ett indatafönster för jämförelse</para
+></listitem>
+   <listitem
+><para
+>Nätverkstransparens via KIO.</para
+></listitem>
+   <listitem
+><para
+>Kan användas för jämförelsevisning i KDevelop 3.</para
+></listitem>
+   <listitem
+><para
+>Radbrytning för långa rader.</para
+></listitem>
+   <listitem
+><para
+>Stöd för Unicode, UTF-8 och andra kodningar.</para
+></listitem>
+   <listitem
+><para
+>Stöd för språk som läses från höger till vänster.</para
+></listitem>
+   <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+</chapter>
+
+<chapter id="documentation"
+><title
+>Filjämförelse och sammanfogning</title>
+
+<sect1 id="commandline"
+><title
+>Kommandoradsväljare</title>
+
+<sect2
+><title
+>Jämföra två filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Sammanfoga två filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fil1 fil2</replaceable
+> -o <replaceable
+>utdatafil</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Jämföra tre filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Sammanfoga tre filer: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+> -m
+   <command
+>kdiff3</command
+> <replaceable
+>fil1 fil2 fil3</replaceable
+> -o <replaceable
+>utdatafil</replaceable
+>
+</screen>
+<para
+>Observera att <replaceable
+>fil1</replaceable
+> behandlas som bas för <replaceable
+>fil2</replaceable
+> och <replaceable
+>fil3</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Specialfall: Filer med samma namn </title>
+<para
+>Om alla filer har samma namn men finns i olika kataloger, kan du reducera hur mycket du måste skriva genom att bara ange filnamnet för den första filen. T.ex.: </para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1/filnamn kat2 kat3</replaceable
+>
+</screen>
+</sect2>
+
+<sect2
+><title
+>Kommandorad för att starta en katalogjämförelse eller sammanfogning: </title>
+<para
+>Det här är mycket likt, men nu handlar det om kataloger.</para>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable
+> -o <replaceable
+>målkat</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable
+> -o <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>För katalogjämförelse och sammanfogning kan du fortsätta att läsa <link linkend="dirmerge"
+>här</link
+>.</para>
+</sect2>
+
+<sect2
+><title
+>Andra kommandoradsväljare</title>
+<para
+>För att se alla tillgängliga kommandoradsväljare, skriv</para>
+<screen
+><command
+>kdiff3</command
+> --help
+</screen>
+<para
+>Exempel på utmatning:</para>
+<screen
+>Väljare:
+  -m, --merge               Sammanfoga indata.
+  -b, --base file           Explicit basfil. För att fungera tillsammans med vissa verktyg.
+  -o, --output file         Utdatafil. Betyder underförstått -m. T.ex.: -o ny_fil.txt
+  --out file                Utdatafil, igen. (för att fungera med vissa verktyg.)
+  --auto                    Inget grafiskt gränssnitt om alla konflikter kan lösas automatiskt (kräver -o fil)
+  --qall                    Lös inte konflikter automatiskt. (För att fungera med andra verktyg...)
+  --L1 alias1               Synlig ersättning av namn för indatafil 1 (bas).
+  --L2 alias2               Synlig ersättning av namn för indatafil 2.
+  --L3 alias3               Synlig ersättning av namn för indatafil 3.
+  -L, --fname alias         Alternativ synlig ersättning av namn. Ange detta en gång för all indata.
+  --cs string               Överskrid en inställning. Använd en gång för varje inställning, t.ex.  --cs "AutoAdvance=1"
+  --confighelp              Visa lista med inställningar och nuvarande värden.
+  --config file             Använd en annan inställningsfil.
+</screen>
+<para
+>Väljaren <option
+>-cs</option
+> låter dig justera ett inställningsalternativ som annars bara kan justeras via inställningsdialogrutorna. Men var medveten om att när &kdiff3; avslutas lagras det ändrade värdet tillsammans med andra inställningar. Med <option
+>--confighelp</option
+> kan du ta reda på namnen på tillgängliga alternativ och nuvarande värden.</para>
+<para
+>Via <option
+>--config</option
+> kan du ange en annan inställningsfil. Om du ofta använder &kdiff3; med helt olika inställningar låter det dig enkelt byta mellan dem.</para>
+</sect2>
+<sect2
+><title
+>Kommandoradsväljare som ignoreras</title>
+<para
+>Många personer vill använda &kdiff3; tillsammans med något versionshanteringssystem, men när versionshanteringssystemet anroppar &kdiff3; med kommandoradsväljare som &kdiff3; inte känner igen, avslutas &kdiff3; med ett fel. Integrationsinställningarna gör det möjligt att ange kommandoradsväljare som ska ignoreras av &kdiff3;. De visas i användningshjälpen som i det här exemplet:</para>
+<screen
+>--<replaceable
+>väljare</replaceable
+>                     Ignoreras. (anvädardefinierad)
+</screen>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Kommandoradsväljare att ignorera:</emphasis
+></term
+><listitem
+><para
+>En lista med väljare, åtskilda med semikolon ';'. När en av dessa väljare finns på kommenderaden, ignorerar &kdiff3; den och kör utan att rapportera ett fel. (Förval är "u;query;html;abort").</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Om det inte är nog, rekommenderas du att skriva ett skalskript som gör översättningen av väljare.</para>
+</sect2>
+
+</sect1>
+
+<sect1 id="opendialog"
+><title
+>Dialogrutan Öppna</title>
+<para
+>Eftersom många indatafiler måste kunna väljas, har programmet en särskild öppningsdialogruta: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="open_dialog.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Öppningsdialogrutan tillåter att filnamnen redigeras för hand, att en fil väljes via filbläddraren ("Fil...") eller att senast använda filer väljes i kombinationsrutan. Om du öppnar dialogrutan igen, finns de nuvarande namnen fortfarande där. Den tredje indatafilen krävs inte. Om fältet för "C" förblir tomt, görs bara en tvåvägs jämförelseanalys. </para
+><para
+>Du kan också välja en katalog med "Katalog...". Om en katalog anges för A, startar en katalogjämförelse och sammanfogning. Om A anger en fil, men B, C eller utmatningen anger en katalog, använder &kdiff3; filnamnet från A i de angivna katalogerna. </para
+><para
+>Om "Sammanfoga" är valt, blir raden "Utmatning" redigerbar. Det krävs dock inte att utdatafilens namn anges omedelbart. Du kan också vänta med detta till du sparar. </para
+><para
+>Knappen "Anpassa..." visar inställningsdialogrutan, så att du kan ställa in alternativ innan analysen utförs. </para>
+</sect1>
+
+<sect1 id="pasteinput"
+><title
+>Klistra in eller släpp indata</title>
+<para
+>Ibland vill du jämföra delar av en text som inte är en egen fil. &kdiff3; låter dig också klistra in text från klippbordet i det indatafönster för jämförelse som har fokus. Jämförelseanalysen sker då omedelbart. I öppningsdialogrutan behöver du då inte ange filer, utan bara stänga den via "Avbryt". </para
+><para
+>Du kan också använda drag och släpp: Dra en fil från en filhanterare eller markerad text från en editor och släpp den på ett indatafönster för jämförelse. </para
+><para
+>Vad är idén? Ibland innehåller en fil två liknande funktioner, men att kontrollera hur lika de verkligen är blir en stor ansträngning om du först måste skapa två filer och sedan ladda dem. Nu kan du helt enkelt kopiera, klistra in och jämföra de relevanta avsnitten. </para
+><para
+>För närvarande kan du inte dra någonting från &kdiff3;. Bara att släppa indata i jämförelsefönstret stöds. </para
+><para
+>Varning: Vissa editorer tolkar fortfarande drag och släpp till ett annat program som klipp ut (istället för kopiera) och klistra in. Ditt ursprungliga data kan då gå förlorat. </para>
+</sect1>
+
+<sect1 id="interpretinginformation"
+><title
+>Jämföra filer och tolka informationen i indatafönstren</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_diff.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<sect2
+><title
+>Informationsrad</title
+><para
+>Längst upp i varje textfönster finns dess "informationsrad". Informationsraderna i indatafönstret innehåller bokstaven "A", "B" eller "C", filnamnet och radnumret för den första synliga raden i fönstret. (Observera att fönstret "C" är valfritt.) Varje informationsrad visas i en egen färg. </para
+><para
+>När du väljer en annan fil genom att bläddra eller avslutar redigera filnamnet här genom att trycka på returtangenten, laddas den nya filen och jämförs med filen eller filerna som redan är laddade. </para
+></sect2
+><sect2
+><title
+>Färgläggning</title
+><para
+>De tre indatafönstren tilldelas bokstäverna "A", "B" och "C". "A" har blå färg, "B" har grön färg och "C" har magenta. (Det är förvalda färger, men de kan ändras via menyn Inställningar.) </para
+><para
+>När en skillnad upptäcks visar färgen vilken indatafil som skiljer sig åt. När båda övriga indatafiler skiljer sig åt, är färgen som används för att uttrycka det normalt röd ("Konfliktfärg" i inställningarna). Det här färgläggningsschemat är särskilt användbart i fallet med tre indatafiler, som syns i nästa avsnitt (<link linkend="merging"
+>Sammanfogning</link
+>). </para
+></sect2
+><sect2
+><title
+>Sammanfattningskolumn</title
+><para
+>Till vänster om varje text är "sammanfattningskolumnen". Om skillnader uppstod på en rad, visar sammanfattningskolumnen motsvarande färg. För en skillnad som bara består av blanktecken är sammanfattningen kryssad. För programspråk, där blanktecken inte är så viktiga är det användbart för att se med en blick om något av vikt ändrades. (För C/C++ är blanktecken bara intressanta inne i strängar, i kommentarer, för preprocessorn och i några mycket esoteriska situationer.) </para
+><para
+>Den vertikala linjen som skiljer sammanfattningskolumnen och texten är avbruten om indatafilen inte har några rader där. När radbrytning är aktiverad visas den vertikala linjen med punkter för brutna rader. </para
+></sect2
+><sect2
+><title
+>Översiktskolumn</title
+><para
+>På höger sida är en "översiktskolumn" synlig till vänster om den vertikala rullningslisten. Den visar en komprimerad sammanfattning av indata "A". Alla skillnader och konflikter är synliga med en blick. När bara två indatafönster används, syns alla skillnader i rött här, eftersom alla skillnader också är konflikter. En svart rektangel ramar in den synliga delen av indata. För mycket långa indatafiler, där antalet indatarader är större än höjden på översikten i bildpunkter, delar flera indatarader en översiktsrad. En konflikt har prioritet över enkla skillnader, som har prioritet över inga ändringar, så att inga skillnader eller konflikter går förlorade här. Genom att klicka på översiktskolumnen visas motsvarande text. </para
+></sect2
+><sect2 id="manualdiffhelp"
+><title
+>Justera rader manuellt</title
+><para
+>Ibland placerar algoritmen fel rader intill varandra, eller så vill du jämföra ett textstycke med text på en helt annan position i den andra filen. I dessa fall kan du manuellt tala om för &kdiff3; att vissa rader ska arrangeras i rak linje. Markera texten som du vill arrangera med musen, som du skulle göra vid kopiera och klistra in, i det första jämförelsefönstret och välj därefter "Lägg till manuell justering av jämförelse" i menyn "Jämförelsevy" (snabbtangenten "Ctrl+Y"). En orange rad visas i sammanfattningskolumnen intill den markerade texten. Upprepa det för den andra och (om tillgänglig) tredje jämförelsevyn. &kdiff3; beräknar omedelbart om jämförelsen varje gång du gör det, och radar upp de markerade raderna. Naturligtvis kanske några av raderna som tidigare matchade inte längre matchar. </para
+><para
+>För närvarande stöder inte sammanfogning användning av manuell hjälp vid jämförelse. </para
+></sect2>
+</sect1>
+
+
+<sect1 id="merging"
+><title
+>Sammanfogning och editorfönstret för sammanfogningsutdata</title>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="screenshot_merge.png" format="PNG"/></imageobject>
+</mediaobject
+></screenshot>
+<para
+>Editorfönstret för sammanfogningsutdata (under indatafönstren för jämförelse) har också en informationsrad längst upp som visar "Utmatning", filnamnet och "[Ändrad]" om du redigerat något. Oftast innehåller det någon text från de automatiska sammanfogningsfunktionerna, men det innehåller också ofta konflikter. </para
+><para
+>Spara är inaktiverat till alla konflikter är lösta! (Använd knapparna "Gå till föregående/nästa olösta konflikt" för att hitta återstående konflikter.) </para
+><para
+>Med bara två filer är varje skillnad också en konflikt, som måste lösas manuellt. </para
+><para
+>Med tre indatafiler behandlas den första som bas, medan den andra och tredje indatafilen innehåller ändringar. Om bara indata B eller C har ändrats för en viss rad, men inte båda väljes den ändrade källan automatiskt. Bara om B och C har ändrats på samma rader, detekterar verktyget en konflikt som måste lösas manuellt. När B och C är likadana, men inte samma som A, väljes C.  </para
+><sect2
+><title
+>Sammanfattningskolumnen</title
+><para
+>Editorfönstret för sammanfogningsutdata har också en sammanfattningskolumn till vänster. Den visar bokstaven för indata som raden valdes, eller ingenting om alla tre källorna var likadana för raden. Vid konflikter visar den ett frågetecken "?" och raden visar "&lt; Konflikter vid sammanfogning &gt;", allt med rött. Eftersom det skulle ta mycket lång tid att lösa konflikter rad för rad, grupperas rader i grupper som har samma skillnader och konfliktkaraktär. Konflikter med bara blanktecken skiljs dock från andra konflikter för att förbättra sammanfogningen av filer där indenteringen ändrats på många rader. </para
+></sect2
+><sect2 id="synchronise_views"
+><title
+>Ställa in aktuell grupp och synkronisera sammanfognings- och jämförelsevyns position</title
+><para
+>När du klickar på sammanfattningskolumnen med vänster musknapp i endera fönstret, så markeras gruppen som hör till den raden i alla fönster och gruppens början visas. (Det här kan innebära ett automatiskt byte av position i fönstren om gruppens början inte syns.) Gruppen blir då den "aktuella gruppen". Den markeras med "Bakgrundsfärgen för aktuellt jämförelseintervall" och en svart rad visas till vänster om texten. </para
+></sect2
+><sect2
+><title
+>Välja indata A, B eller C för aktuell konflikt och redigering</title
+><para
+>Knappraden under menyraden innehåller tre knappar för indataval som innehåller bokstäverna "A", "B" och "C". Klicka på knappen för indataval för att infoga rader (eller ta bort dem om de redan infogats) från respektive källfil. För att välja rader från flera indatafiler klicka på respektive knappar i nödvändig ordning. Om du till exempel vill att rader från "B" ska hamna före rader från "A" i utdata, klicka först på "B" och därefter på "A". </para
+><para
+>Om du använder alternativet för att automatiskt gå vidare (<link linkend="autoadvance"
+>Gå automatiskt till nästa olösta konflikt efter val av källa</link
+>), måste du inaktivera det innan du väljer rader från flera indatafiler eller om du vill redigera raderna efter du valt dem. Annars går &kdiff3; till nästa konflikt efter den första indatafilen valts. </para
+><para
+>Det är ofta användbart att direkt redigera sammanfogad utdata. Sammanfattningskolumnen visar "m" för varje rad som ändrades manuellt. När skillnaderna till exempel justeras på ett sätt så att ett enkelt val av indata inte är tillfredsställande, kan du markera texten som behövs och använda normal <link linkend="selections"
+>kopiera och klistra in</link
+> för att placera den i sammanfogad utdata. </para
+><para
+>Ibland, när en rad tas bort antingen på grund av automatisk sammanfogning eller genom redigering och inga andra rader finns kvar i gruppen, visas texten &lt;Ingen källrad&gt; på raden. Det är bara en platsmarkör för gruppen om du ändrar dig och väljer en källa igen. Texten syns inte i sparade filer eller i några markeringar som du vill kopiera och klistra in. </para
+><para
+>Texten "&lt; Konflikter vid sammanfogning &gt;" visas på klippbordet om du kopierar och klistrar in någon text som innehåller en sådan rad. Men var ändå försiktig med att göra det. </para
+></sect2
+><sect2
+><title
+>Välja indata A, B eller C för alla konflikter</title
+><para
+>Den normala sammanfogningen börjar med att automatiskt lösa enkla konflikter. Menyn "Sammanfoga" tillhandahåller också några alternativ för andra vanliga behov. Om du måste välja samma källfil för de flesta konflikter, kan du välja "A", "B" eller "C" överallt, eller bara för återstående olösta konflikter, eller för olösta konflikter med blanktecken. Om du vill bestämma själv för varje enskild skillnad, kan du "Ändra skillnader till konflikter", eller om du vill återgå till de automatiska valen i &kdiff3; kan du välja "Lös automatiskt enkla konflikter". Då startar &kdiff3; om sammanfogningen. För åtgärder som påverkar dina tidigare ändringar frågar &kdiff3; om bekräftelse innan åtgärden utförs. </para
+><para
+>Observera: När endera källan väljes för olösta konflikter för blanktecken och alternativet "Ignorera siffror" eller "Ignorera C/C++ kommentarer" används, så behandlas ändringar i siffror eller kommentarer också som blanktecken. </para
+></sect2
+><sect2 id="vcskeywordsmergesupport"
+><title
+>Sammanfoga automatiskt nyckelord för versionshantering och historik (logg)</title
+><para
+>Många versionshanteringssystem stöder särskilda nyckelord i filen (t.ex. "&#36;Date&#36;", "&#36;Header&#36;", "&#36;Author&#36;", "&#36;Log&#36;" etc.) Vid arkivering ändrar versionshanteringssystemet (VCN) dessa rader. Till exempel ändras "&#36;Date&#36;" till "&#36;Date: 2005/03/22 18:45:01 &#36;". Eftersom raden är olika i varje version av filen, skulle den kräva manuell interaktion under sammanfogningen. </para
+><para
+>&kdiff3; erbjuder automatisk sammanfogning av dessa poster. För enkla rader som matchar alternativet "Reguljärt uttryck för automatisk sammanfogning" i alla indatafiler väljer &kdiff3; raden från B, eller om tillgänglig, den från C. (Dessutom är det nödvändigt att raderna i fråga radas upp i jämförelsen och att föregående rad inte innehåller en konflikt.) Den automatiska sammanfogningen kan antingen utföras omedelbart när sammanfogningen startas (aktivera alternativet "Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar") eller senare via "Kör automatisk sammanfogning med reguljärt uttryck" i menyn Sammanfoga. </para
+><para
+>Automatisk sammanfogning för versionshanteringshistorik (också kallat "logg") stöds också. Automatisk sammanfogning av historik kan antingen utföras omedelbart när sammanfogningen startas genom att aktivera alternativet "Sammanfogning enligt versionshanteringshistorik när sammanfogning startar" eller senare via "Lös automatiskt historikkonflikter" i menyn Sammanfoga. </para
+><para
+>Oftast börjar versionshanteringshistoriken med en rad som innehåller nyckelordet "&#36;Log&#36;". Den måste matchas av alternativet "Reguljärt uttryck för historikens början". &kdiff3; detekterar vilka efterföljande rader som ingår i historiken genom att analysera de inledande tecknen som fanns före nyckelordet "&#36;Log&#36;". Om samma "inledande kommentar" också finns på följande rader inkluderas de också i historiken. </para
+><para
+>Vid varje arkivering skriver VCS en unik rad som anger version, datum- och tidsinformation följd av rader med användarens kommentarer. Raderna utgör en historikpost. Historikavsnittet växer vid varje arkivering och de senaste posterna visas längst upp (efter historikens startrad). </para
+><para
+>När två utvecklare arkiverar grenar av en fil under parallell utveckling, kommer historiken för sammanfogning att innehålla flera poster som visas som konflikter under sammafogning av grenarna. Eftersom sammafogning av dem kan bli mycket tröttsam, erbjuder &kdiff3; stöd för den med två möjliga strategier: Bara infoga historikinformationen från båda bidragsgivarna längst upp, eller sortera historikinformationen enligt en användardefinierad nyckel. </para
+><para
+>Metoden att bara infoga alla poster är enklast att ställa in. &kdiff3; behöver bara en metod att detektera vilka rader som hör till en historikpost. De flesta VCS infogar en tom rad efter varje historikpost. Om det inte finns några andra tomma rader, är det ett tillräckligt villkor för &kdiff3;. Ange bara en tom "Reguljärt uttryck för historikens början". Om kriteriet med en tom rad inte är tillräckligt kan du ange ett reguljärt uttryck för att detektera historikpostens början. </para
+><para
+>Observera att &kdiff3; tar bort duplicerade historikposter.Om en historikpost fanns flera gånger i en indatafils historik, förblir bara en post i utmatningen. </para
+><para
+>Om du vill sortera historiken måste du ange hur sorteringsnyckeln ska byggas. Använd parenteser som i "Reguljärt uttryck för historikpostens början" för att gruppera delar av det reguljära uttrycket som senare ska användas i sorteringsnyckeln. Ange därefter "Sorteringsnycklarnas ordning från historikpostens början" med en lista av nummer som refererar till gruppens position i det reguljära uttrycket åtskilda av kommatecken ",". </para
+><para
+>Eftersom det inte är så enkelt att få det rätt omedelbart, kan du prova och förbättra det reguljära uttrycket och nyckelgenereringen i en särskild dialogruta genom att klicka på knappen "Prova dina reguljära uttryck". </para
+><para
+>Antag att historiken ser ut så här: <screen>
+/**************************************************************************
+** HISTORIK:    &#36;Log: \toms_sammanfogning_huvudvy\Mitt_program\kod\komplexalgoritm.cpp &#36;
+**
+**     \head\integreringsgren_12   2 Apr 2001 10:45:41   tom
+**  Sammanfogade grenen simongren_15.
+**
+**     \main\henry_felrättningsgren_7\1   30 Mar 2001 19:22:05   henry
+**  Förbättrade hastigheten för delrutinen omvandlaTill().
+**  Fixade krasch.
+**************************************************************************/
+</screen
+> Historikens inledande rad matchar det reguljära uttrycket ".*\&#36;Log.*\&#36;.*". Därefter följer historikposterna. </para
+><para
+>Raden med nyckelordet "&#36;Log&#36;" börjar med två "*" och därefter följer ett mellanslag. &kdiff3; använder den första strängen utan blanktecken som "inledande kommentar" och antar att historiken slutar med den första raden utan denna inledande kommentar. I exemplet slutar den sista raden med en sträng som också börjar med två "*", men istället för ett mellanslag följer fler "*". Därför avslutar denna rad historiken. </para
+><para
+>Om sortering av historiken inte krävs kan det reguljära uttrycket för historikpostens början se ut så här. (Raden är delad i två eftersom den inte skulle få plats annars.) <screen>
+\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.*
+</screen
+> För detaljinformation om reguljära uttryck se <ulink url="http://doc.trolltech.com/3.3/qregexp.html#details"
+>Trolltechs dokumentation av reguljära uttryck</ulink
+>. Observera att "\s" (med ett litet "s") matchar alla blanktecken och  "\S" (med ett stort "S") matchar alla tecken som inte är blanktecken. I vårt exempel innehåller historikpostens början först versionsinformation med det reguljära uttrycket "\\main\\\S+", datumet som består av dagen "[0-9]+", månaden "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" och året "[0-9][0-9][0-9][0-9]", tiden "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" och till sist utvecklarens inloggningsnamn ".*". Observera att den inledande kommentaren (i exemplet "**") redan har tagits bort av &kdiff3; innan matchningsförsöket, därför börjar det reguljära uttrycket med en matchning av en eller flera blanktecken "\s*". </para
+><para
+>Om du kräver sorterad historik måste sorteringsnyckeln beräknas. För att göra det måste relevanta delar i det reguljära uttrycket grupperas med parenteser. (De extra parenteserna kan också vara kvar även om historiksortering inaktiveras.) <screen>
+\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)
+ ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*)
+</screen
+> Parenteserna innehåller nu 1. versionsinformation, 2. dag, 3. månad, 4. år, 5. tid, 6. namn. Men om vi vill sortera enligt datum och tid måste vi skapa en nyckel med elementen synliga i en annan ordning: Först året, följt av månad, dag, tid, versionsinformation och namn. Därför ska sorteringsnyckelns ordning som anges vara  "4,3,2,5,1,6". </para
+><para
+>Eftersom månadsnamn inte är bra att sortera enligt ("Apr" skulle vara först) detekterar &kdiff3; vilken ordning månadsnamnen anges och använder det numret istället ("Apr"->"04"). Och om ett rent nummer hittas omvandlas det till ett fyrasiffrors värde med inledande nollor för sortering. Till sist blir den resulterande sorteringsnyckeln för den första historikpostens inledande rad: <screen
+>2001 04 0002 10:45:41 integreringsgren_12   tom 
+</screen>
+</para
+><para
+>För mer information, se också <link linkend="diffmergeoptions"
+>Inställningar av jämför och sammanfoga</link
+>. </para>
+</sect2>
+</sect1>
+
+<sect1 id="navigation"
+><title
+>Navigering och redigering</title>
+<para
+>Mycket navigering görs med rullningslisterna och musen, men du kan också navigera med tangentbordet. Om du klickar på något fönster kan du använda markörtangenterna vänsterpil, högerpil, uppåtpil, neråtpil, Page Up, Page Down, Home, End, Ctrl+Home och Ctrl+End som du kan i andra program. Sammanfattningskolumnen intill indatafilernas vertikala rullningslist kan också användas för att navigera genom att klicka i den. </para
+><para
+>Du kan också använda hjulmusen för att rulla uppåt och neråt. </para
+><para
+>I editorn för sammanfogningsutdata kan du också använda andra tangenter för redigering. Du kan byta mellan infognings- och ersättningsläge med tangenten Insert. (Normalläget är infoga.) </para
+><para
+>Ett klick med vänster musknapp i någon sammanfattningskolumn synkroniserar alla fönster för att visa början på samma grupp av rader (som förklaras i avsnittet <link linkend="synchronise_views"
+>Ställa in aktuell grupp och synkronisera sammanfognings- och jämförelsevyns position</link
+>). </para
+><para
+>Verktygsraden innehåller också nio navigeringsknappar som du kan använda för att gå till aktuell/första/sista skillnaden, till nästa/föregående skillnad (Ctrl+Neråtpil eller Ctrl+Uppåtpil), till nästa/föregående konflikt (Ctrl+Page Down eller Ctrl+Page Up) eller till nästa/föregående olösta konflikt. Observera att för &kdiff3; förblir en "konflikt" som inte automatiskt löstes vid start av sammanfogningen alltid en "konflikt" även om den är löst. Därav nödvändigheten att särskilja "olösta konflikter". </para>
+<sect2 id="autoadvance"
+><title
+>Automatisk fortsättning</title>
+<para
+>Det finns också en knapp som heter "Gå automatiskt till nästa olösta konflikt efter val av källa" (automatisk fortsättning). Om du aktiverar det här, så går &kdiff3; automatiskt till nästa olösta konflikt när en källa väljes. Det kan hjälpa till när du bara vill välja en källa. När du behöver båda källor, eller du vill redigera efter valet, bör du troligen stänga av det här. Innan &kdiff3; fortsätter till nästa olösta konflikt, visas effekten av valet en kort tid. Den här fördröjningen kan justeras i inställningarna under Jämför och sammanfoga. Du kan ange "Fördröjning vid automatisk fortsättning" i millisekunder mellan 0 och 2000. Tips: Är du trött på många klick? Använd en kort fördröjning vid automatisk fortsättning och snabbtangenterna Ctrl+1/2/3 för att välja A/B/C för många konflikter. </para>
+</sect2>
+</sect1>
+
+<sect1 id="selections"
+><title
+>Markera, kopiera och klistra in</title>
+<para
+>Indatafönstren visar inte någon markör, så markeringar måste göras med musen, genom att klicka med vänster musknapp på början, hålla nere musknappen och gå till slutet, där musknappen släpps upp igen. Du kan också markera ett ord genom att dubbelklicka på det. I editorn för sammanfogningsutdata kan du också markera med tangentbordet, genom att hålla nere skifttangenten och navigera med piltangenterna. </para
+><para
+>Om markeringen överstiger det synliga området, kan du flytta musen över fönsterkanterna, vilket gör att &kdiff3; rullar i den riktningen. </para
+><para
+>För mycket stora markeringar kan du också använda navigationstangenterna medan musknappen hålls nere. Använd t.ex. Page Up och Page Down för att snabbt gå till en viss position. Släpp upp musknappen på slutpositionen. </para
+><para
+>För att markera allt i det nuvarande fönstret, använd menyn "Redigera" -> "Markera allt" (Ctrl+A). </para
+><para
+>För att kopiera till klippbordet måste du trycka på knappen "Kopiera" (Ctrl+C eller Ctrl+Insert). Men det finns ett alternativ som heter "Kopiera automatiskt markering". Om det är aktiverat, kopieras vad du än väljer omedelbart, och du behöver aldrig explicit kopiera. Men var försiktig när du använder detta, eftersom klippbordets innehåll kan förstöras av misstag. </para
+><para
+>"Klipp ut" (Ctrl+X eller Skift+Delete) kopierar till klippbordet och tar bort den markerade texten. </para
+><para
+>"Klistra in" (Ctrl+V eller Skift+Insert) infogar texten på klippbordet vid markörens position eller istället för den nuvarande markeringen. Om du klistrar in i något av jämförelsefönstren visas klippbordets innehåll i fönstret och jämförelsen startas omedelbart om. Det är användbart om du snabbt vill hämta ett textstycke någonstans och jämföra det med något annat utan att först skapa filer. </para>
+</sect1>
+
+<sect1 id="saving"
+><title
+>Spara</title>
+<para
+>Att spara tillåts bara när alla konflikter är lösta. Om filen redan finns och alternativet "Säkerhetskopiera filer" är markerat, ändras originalversionens namn med tillägg av filändelsen .orig, och om en sådan fil redan finns tas den bort. När du avslutar eller startar en ny jämförelseanalys och data inte sparats ännu, frågar &kdiff3; om du vill spara, avbryta eller fortsätta utan att spara. (&kdiff3; fångar inga signaler, så om du "dödar" &kdiff3; går data förlorat.) </para
+><para
+>Radslut sparas enligt den normala metoden i det underliggande operativsystemet. För Unix slutar varje rad med ett nyradstecken "\n", medan för Windows-baserade system slutar varje rad med ett returtecken och ett nyradstecken "\r\n". &kdiff3; behåller inte radslut för indatafilerna, vilket också betyder att du inte ska använda &kdiff3; med binärfiler. </para>
+</sect1>
+
+<sect1 id="find"
+><title
+>Söka efter strängar</title>
+<para
+>Du kan söka efter en sträng i vilket textfönster som helst i &kdiff3;. Kommandot "Sök..." (Ctrl+F) i menyn Redigera, visar en dialogruta som låter dig ange strängen att söka efter. Du kan också välja de fönster som ska sökas. Sökning startar alltid från början. Använd kommandot "Sök igen" (F3) för att fortsätta till nästa förekomst. Om du väljer att söka i flera fönster, söks det första fönstret från början till slut innan sökningen fortsätter från början i nästa fönster, etc. </para>
+</sect1>
+
+<sect1 id="printing"
+><title
+>Utskrift</title>
+<para
+>&kdiff3; stöder utskrift av skillnader mellan textfiler. Kommandot "Skriv ut..." (Ctrl+P) i menyn Arkiv visar en dialogruta som låter dig välja skrivare och justera andra alternativ. </para
+><para
+>Det finns flera möjligheter att justera intervallet. Beroende på olika utskriftsdialogrutor på olika operativsystem, varierar metoden för att åstadkomma val av ett visst intervall. </para>
+<variablelist>
+   <varlistentry
+><term
+>Alla:</term
+><listitem
+><para
+>Skriv ut allt.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Aktuell:</term
+><listitem
+><para
+>Skriv ut en sida som börjar på den första synliga raden i fönstret. (På system utan alternativet kan det åstadkommas genom att ange sidnumret 10000 för utskrift.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Markering:</term
+><listitem
+><para
+>Innan du väljer att skriva ut, markera text med musen (som för kopiera och klistra in) i ett av jämförelsefönstren för att definiera start- och slutrad. Om ingen text var markerad i något av jämförelsefönstren, är inte alternativet tillgängligt. (På system utan alternativet kan det åstadkommas genom att ange sidnumret 9999 för utskrift.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+>Intervall:</term
+><listitem
+><para
+>Ange första och sista sidan. </para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Andra viktiga inställningar för utskrift tas från de normala inställningarna: </para
+><itemizedlist>
+   <listitem
+><para
+>Teckensnitt, teckenstorlek</para
+></listitem>
+   <listitem
+><para
+>Visa radnummer</para
+></listitem>
+   <listitem
+><para
+>Radbryt</para
+></listitem>
+   <listitem
+><para
+>Färger</para
+></listitem>
+   <listitem
+><para
+>etc.</para
+></listitem>
+</itemizedlist>
+<para
+>Liggande formatering rekommenderas också för utskrift. </para>
+</sect1>
+
+<sect1 id="options"
+><title
+>Alternativ</title>
+<para
+>Alternativ och listan med senaste filer sparas när du avslutar programmet, och laddas igen när du startar det. (Menyn Inställningar -> Anpassa &kdiff3;...) </para>
+<sect2
+><title
+>Teckensnitt</title>
+<para
+>Välj ett teckensnitt med fast breddsteg. (På vissa system visar dialogrutan också teckensnitt med variabel bredd, men du bör inte använda dem.) </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Kursiv stil för skillnader:</emphasis
+></term
+><listitem
+><para
+>Om du markerar detta, visas textskillnader med kursiv version av det valda teckensnittet. Om teckensnittet inte stöder kursiv stil, gör det ingenting.</para>
+   </listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Färger</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Förgrundsfärg:</emphasis
+></term
+><listitem
+><para
+>Oftast svart. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bakgrundsfärg:</emphasis
+></term
+><listitem
+><para
+>Oftast vit. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bakgrundsfärg för jämförelse:</emphasis
+></term
+><listitem
+><para
+>Oftast ljusgrå. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg A:</emphasis
+></term
+><listitem
+><para
+>Oftast mörkblå. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg B:</emphasis
+></term
+><listitem
+><para
+>Oftast mörkgrön. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg C:</emphasis
+></term
+><listitem
+><para
+>Oftast mörk magenta. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Konfliktfärg:</emphasis
+></term
+><listitem
+><para
+>Oftast röd.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bakgrundsfärg för aktuellt intervall:</emphasis
+></term
+><listitem
+><para
+>Oftast ljusgul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Bakgrundsfärg för aktuellt jämförelseintervall:</emphasis
+></term
+><listitem
+><para
+>Oftast mörkgul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg för manuellt valda jämförelseintervall:</emphasis
+></term
+><listitem
+><para
+>Oftast orange.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg för nyaste fil i katalogjämförelse:</emphasis
+></term
+><listitem
+><para
+>Oftast grön.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg för äldsta fil i en katalogjämförelse:</emphasis
+></term
+><listitem
+><para
+>Oftast röd.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg för medelgamla filer i en katalogjämförelse:</emphasis
+></term
+><listitem
+><para
+>Oftast mörkgul.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Färg för saknade filer i en katalogjämförelse:</emphasis
+></term
+><listitem
+><para
+>Oftast svart.</para
+></listitem
+></varlistentry>
+</variablelist>
+<para
+>Att ändra färgerna för katalogjämförelser får inte någon effekt förrän nästa katalogjämförelse startas. </para>
+<para
+>För system med bara 16 eller 256 färger är vissa rena färger inte tillgängliga. För sådana system väljer knappen "Förval" en ren färg. </para>
+</sect2>
+
+<sect2
+><title
+>Inställningar för editor</title>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Tabulator infogar mellanslag:</emphasis
+></term
+><listitem
+><para
+>Om det här inte är markerat, och du trycker på tabulatortangenten, infogas en tabulator, annars infogas lämpligt antal mellanslag.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Tabulatorbredd:</emphasis
+></term
+><listitem
+><para
+>Kan justeras för dina speciella behov. Normalvärdet är 8. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Automatisk indentering:</emphasis
+></term
+><listitem
+><para
+>När du trycker på Enter eller returtangenten, används föregående rads indentering för den nya raden. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kopiera automatiskt markering:</emphasis
+></term
+><listitem
+><para
+>Varje markering kopieras omedelbart till klippbordet när den aktiveras, och du behöver inte kopiera den explicit. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Radslutstil:</emphasis
+></term
+><listitem
+><para
+>När du sparar kan du välja vilken radslutsstil du föredrar. Förvald inställning är det vanliga valet för operativsystemet som används. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="diffmergeoptions"
+><title
+>Inställningar av jämför och sammanfoga</title>
+<para
+>När filer jämförs försöker &kdiff3; först att matcha rader som är lika i alla indatafiler. Det är bara under detta steg som blanktecken kan ignoreras. Det andra steget jämför varje rad. Under detta steg ignoreras inte blanktecken. Under sammanfogning ignoreras inte heller blanktecken. </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Behåll returtecken:</emphasis
+></term
+><listitem
+><para
+>Vissa editorer (på vissa system) sparar returtecken '\r' och nyradstecken '\n' i slutet på raden, medan andra bara sparar nyradstecknet '\n'. Oftast ignorerar &kdiff3; returtecknet, men då ser filer som inte har samma storlek likadana ut vid jämförelse sida vid sida. När det här alternativet är markerat, görs returtecken synliga, men behandlas som blanktecken. Det här alternativet måste vara av under en sammanfogning. Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorera siffror:</emphasis
+></term
+><listitem
+><para
+>Normalvärdet är av. Siffertecken ('0'-'9', '.', '-') ignoreras under första delen av analysen när radmatchningen görs. Skillnaderna för resultatet visas ändå, men de behandlas som blanktecken. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorera C/C++ kommentarer:</emphasis
+></term
+><listitem
+><para
+>Normalvärdet är av. Ändringar i kommentarer behandlas som ändringar i blanktecken. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ignorera skiftläge:</emphasis
+></term
+><listitem
+><para
+>Normalvärdet är av. Ändringar i skiftläge för tecken (som 'A' eller 'a') hanteras som ändringar i blanktecken. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Preprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>Se <link linkend="preprocessors"
+>nästa avsnitt</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Radmatchande preprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>Se <link linkend="preprocessors"
+>nästa avsnitt</link
+>. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Var noggrann:</emphasis
+></term
+><listitem
+><para
+>Gör en ansträngning att hitta en ännu mindre skillnad (Normalvärdet är på). Det här är troligen effektivt för komplicerade och stora filer, och långsamt för mycket stora filer. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Fördröjning vid automatisk fortsättning (ms):</emphasis
+></term
+><listitem
+><para
+>I automatiskt fortsättningsläge anger den här inställningen hur länge resultatet för gruppen ska visas innan hopp till nästa olösta konflikt. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Standardvärde för sammanfogning av blanktecken med två/tre filer:</emphasis
+></term
+><listitem
+><para
+>Lös automatiskt alla konflikter för blanktecken genom att välja angiven fil. (Normalvärdet är manuellt val.) Användbart om blanktecken verkligen är oviktiga i många filer. Om du bara behöver det ibland, är det bättre att använda "Välj A/B/C för olösta konflikter med blanktecken" i menyn Sammanfoga. Observera att om du antingen aktiverar "Ignorera siffror" eller "Ignorera C/C++ kommentarer" gäller det automatiska valet också vid konflikter för siffror eller kommentarer. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Reguljärt uttryck för automatisk sammanfogning:</emphasis
+></term
+><listitem
+><para
+>Reguljärt uttryck för rader där &kdiff3; automatisk ska välja en källa. Se också <link linkend="vcskeywordsmergesupport"
+>Automatisk sammanfogning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar:</emphasis
+></term
+><listitem
+><para
+>Om aktiverad utför &kdiff3; den automatiska sammanfogningen med "Reguljärt uttryck för automatisk sammanfogning" när en sammanfogning startas. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Reguljärt uttryck för historikens början:</emphasis
+></term
+><listitem
+><para
+>Reguljärt uttryck för början av historikposten för sammanfogning. Oftast innehåller raden nyckelordet "&#36;Log&#36;". Förvalt värde: ".*\&#36;Log.*\&#36;.*" </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Reguljärt uttryck för historikpostens början:</emphasis
+></term
+><listitem
+><para
+>En historikpost för sammanfogning består av flera rader. Ange det reguljära uttrycket för att detektera den första raden (utan inledande kommentar). Använd parenteser för att gruppera nycklarna du vill använda för sortering. Om det lämnas tomt, antar &kdiff3; att tomma rader skiljer historikposterna åt. Se också <link linkend="vcskeywordsmergesupport"
+>Automatisk sammanfogning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sortering av historiksammanfogning:</emphasis
+></term
+><listitem
+><para
+>Aktivera sortering av versionshanteringshistorik. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sorteringsnycklarnas ordning från historikpostens början:</emphasis
+></term
+><listitem
+><para
+>Varje parentes som används i det reguljära uttrycket för historikens startpost grupperar en nyckel som kan användas för sortering. Ange listan med nycklar (som numreras i ordning de uppträder med början på 1) med ',' som skiljetecken (t.ex. "4,5,6,1,2,3,7"). Om det lämnas tomt utförs ingen sortering. Se också <link linkend="vcskeywordsmergesupport"
+>Automatisk sammanfogning ...</link
+> </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sammanfogning enligt versionshanteringshistorik när sammanfogningen startar:</emphasis
+></term
+><listitem
+><para
+>Om aktiverad utför &kdiff3; den automatiska sammafogningen av historik med tidigarenämnda alternativ när en sammanfogning startas. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Prova dina reguljära uttryck</emphasis
+></term
+><listitem
+><para
+>Knappen visar en dialogruta som låter dig förbättra och prova det reguljära uttrycket ovan. Kopiera bara respektive data från dina filer till exempelraderna. "Matchningsresultat" visar omedelbart om matchningen lyckas eller inte. "Sorteringsnyckelresultat" visar nyckeln som används för sortering vid sammanfogning av historik. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Ej relevant sammanfogningskommando:</emphasis
+></term
+><listitem
+><para
+>Ange ett eget kommando som ska anropas när &kdiff3; detekterar att filen från B inte bidrar med något relevant data som inte reda finns i filen från C. Kommandot anropas med de tre filnamnen som parametrar. Data som matchas av "Reguljärt uttryck för automatisk sammanfogning" eller i historiken anses inte vara relevant. </para
+></listitem
+></varlistentry>
+</variablelist>
+
+</sect2>
+
+<sect2
+><title
+>Katalogsammanfogning</title>
+<para
+>De här alternativen har att göra med avsökning av katalogen och hantering av sammanfogningen: Se <link linkend="dirmergeoptions"
+>Katalogjämförelse och sammanfogning</link
+> för detaljinformation. </para
+><para
+>Ändå finns det ett alternativ här som också är relevant för att spara enstaka filer: </para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Säkerhetskopiera filer:</emphasis
+></term
+><listitem
+><para
+>När en fil sparas och en äldre version redan finns, ändras originalversionens namn med tillägg av filändelsen ".orig". Om en gammal säkerhetskopia med filändelsen ".orig" redan finns tas den bort utan säkerhetskopiering. </para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2
+><title
+>Inställningar för region och språk</title>
+  <variablelist>
+    <varlistentry
+><term
+><emphasis
+>Språk:</emphasis
+></term
+><listitem
+><para
+>Justera användargränssnittets språk. Att ändra alternativet påverkar inte programmet som kör. Du måste avsluta och starta om &kdiff3; för att ändra språk. (Alternativet är inte tillgängligt i KDE-versionen av &kdiff3;, eftersom språket kan justeras i de allmänna KDE-inställningarna.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Använd samma kodning för allt:</emphasis
+></term
+><listitem
+><para
+>Följande kodningsalternativ kan justeras separat för varje objekt, eller om alternativet är sant, ställs alla värden in till det första värdet. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Lokal kodning:</emphasis
+></term
+><listitem
+><para
+>Ovanför kodningsväljarna visas en anmärkning som talar om för dig vad den lokala kodningen är (Den kan inte justeras, utan bara som information om du inte vet vad den lokala kodningen är, men behöver kunna välja den.) </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning för A/B/C:</emphasis
+></term
+><listitem
+><para
+>Justera filkodningen för indatafiler. Det ger effekt på hur specialtecken tolkas. Eftersom du kan justera varje kodning separat, kan du till och med jämföra och sammanfoga filer som sparades med olika kodningar. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning för sammanfogad utdata och vid spara:</emphasis
+></term
+><listitem
+><para
+>När du har redigerat en fil, kan du justera vilken kodning som används när den sparas till disk. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Filkodning för preprocessorfiler:</emphasis
+></term
+><listitem
+><para
+>När du definierar preprocessorer kanske de inte kan hantera din kodning (exempelvis om dina filer använder 16-bitars Unicode och preprocessorn bara kan hantera 8-bitars ASCII). Med det här alternativet kan du definiera kodningen för preprocessorns utdata. </para
+></listitem
+></varlistentry>
+    <varlistentry
+><term
+><emphasis
+>Språk som läses från höger till vänster</emphasis
+></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
+></listitem
+></varlistentry>
+
+  </variablelist>
+</sect2>
+
+<sect2
+><title
+>Diverse</title>
+<para
+>(Dessa alternativ och åtgärder är tillgängliga i menyerna eller verktygsraden.)</para>
+<variablelist>
+  <varlistentry
+><term
+><emphasis
+>Visa radnummer:</emphasis
+></term
+><listitem
+><para
+>Du kan välja om radnummer ska visas för indatafilerna.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Visa mellanslag och tabulatortecken i jämförelse:</emphasis
+></term
+><listitem
+><para
+>Ibland är synliga mellanslag och tabulatortecken störande. Du kan stänga av detta.</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Visa blanktecken:</emphasis
+></term
+><listitem
+><para
+>Stäng av det här för att inte visa ändringar av bara blanktecken i texten eller översiktskolumnerna. (Observera att detta också gäller ändringar av siffror eller kommentarer om alternativen "Ignorera siffror" eller "Ignorera C/C++ kommentarer" är aktiva.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Översiktsalternativ:</emphasis
+></term
+><listitem
+><para
+>Dessa alternativ är bara tillgängliga när du jämför tre filer. I normalläge visas alla skillnader i en färgkodad översiktskolumn, men ibland är du särskilt intresserad av skillnaderna mellan två av de tre filerna. Genom att välja översikten "A mot B", "A mot C" eller "B mot C", visas en andra översiktskolumn med begärd information intill den vanliga översikten. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Radbryt skillnadsfönster:</emphasis
+></term
+><listitem
+><para
+>Radbryt rader när deras längd skulle överskrida ett fönsters bredd. </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Visa fönster A/B/C:</emphasis
+></term
+><listitem
+><para
+>Ibland vill du använda skärmutrymmet bättre för långa rader. Dölj fönster som inte är viktiga. (I menyn Fönster.)</para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Byt delningsorientering:</emphasis
+></term
+><listitem
+><para
+>Byt mellan jämförelsefönster som visas intill varandra (A till vänster om B till vänster om C) eller ovanför varandra (A ovanför B ovanför C). Det bör också hjälpa för långa rader. (I menyn Fönster.) </para
+></listitem
+></varlistentry>
+  <varlistentry
+><term
+><emphasis
+>Starta sammanfogning snabbt:</emphasis
+></term
+><listitem
+><para
+>Ibland tittar du på skillnader, och bestämmer dig för att sammanfoga. <inlinemediaobject
+><imageobject
+><imagedata fileref="merge_current.png" format="PNG"/></imageobject
+></inlinemediaobject
+> "Sammanfoga aktuell fil" i menyn Katalog fungerar också om du bara jämför två filer. Ett enkelklick startar sammanfogningen och använder filnamnet på den sista indatafilen som förvalt utmatningsfilnamn. (När detta används för att starta om en sammanfogning, behålls utmatningsfilnamnet.)</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect2>
+
+<sect2 id="shortcuts"
+><title
+>Anpassa snabbtangenter</title>
+<para
+>För närvarande stöder bara KDE-versionen anpassningsbara snabbtangenter (Menyn Inställningar -> Anpassa genvägar...) </para>
+</sect2>
+</sect1>
+
+<sect1 id="preprocessors"
+><title
+>Preprocessorkommandon</title>
+<para
+>&kdiff3; stöder två preprocessoralternativ. </para
+><para>
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Preprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>När en fil läses, skickas den via det här externa kommandot. Utmatningen från kommandot visas istället för den ursprungliga filen. Du kan skriva din egen preprocessor som uppfyller dina speciella behov. Använd det här för att ta bort störande delar av filen, eller för att automatiskt korrigera indenteringen, etc. </para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Radmatchande preprocessorkommando:</emphasis
+></term
+><listitem
+><para
+>När en fil läses, skickas den via det här externa kommandot. Om ett preprocessorkommando (se ovan) också anges är utmatningen från preprocessorn inmatning till den radmatchande preprocessorn. Utmatningen används bara under radmatchningsfasen av analysen. Du kan skriva din egen preprocessor som uppfyller dina speciella behov. Varje indatarad måste ha en motsvarande utdatarad. </para
+></listitem
+></varlistentry>
+</variablelist>
+</para>
+<para
+>Idén är att ge användaren större flexibilitet när jämförelseresultatet ställs in, men det kräver ett externt program, och många användare vill inte skriva ett själva. De goda nyheterna är att ofta klarar <command
+>sed</command
+> eller <command
+>perl</command
+> av jobbet. </para>
+<para
+>Till exempel ett enkelt fall att prova: Betrakta filen a.txt (6 rader): <screen>
+      aa
+      ba
+      ca
+      da
+      ea
+      fa
+</screen
+> Och filen b.txt (3 rader): <screen>
+      cg
+      dg
+      eg
+</screen
+> Utan en preprocessor skulle följande rader placeras intill varandra: <screen>
+      aa - cg
+      ba - dg
+      ca - eg
+      da
+      ea
+      fa
+</screen
+> Det är troligen inte vad som önskas eftersom den första bokstaven innehåller den intressanta informationen. För att hjälpa matchningsalgoritmen att ignorera den andra bokstaven kan man använda ett radmatchande preprocessorkommando som ersätter 'g' med 'a': <screen>
+   <command
+>sed</command
+> 's/g/a/'
+</screen
+> Med det kommandot blir resultatet av matchningen: <screen>
+      aa
+      ba
+      ca - cg
+      da - dg
+      ea - eg
+      fa
+</screen
+> Internt ser matchningsalgoritmen filerna efter den radmatchande preprocessorn har körts, men på skärmen är filen oförändrad. (Den normala preprocessorn skulle också ändra data på skärmen.) </para>
+
+<sect2 id="sedbasics"
+><title
+>Grundläggande information om <command
+>sed</command
+></title>
+<para
+>Det här avsnittet introducerar bara några mycket grundläggande funktioner i <command
+>sed</command
+>. För mer information se <ulink url="info:/sed"
+>info:/sed</ulink
+> eller <ulink url="http://www.gnu.org/software/sed/manual/html_mono/sed.html"
+>http://www.gnu.org/software/sed/manual/html_mono/sed.html</ulink
+>. En förkompilerad version för Windows finns på <ulink url="http://unxutils.sourceforge.net"
+>http://unxutils.sourceforge.net</ulink
+>. Observera att följande exempel antar att <command
+>sed</command
+> finns i någon katalog i miljövariabeln PATH. Om det inte är fallet, måste du ange fullständig absolut sökväg till kommandot. </para>
+<note
+><para
+>Observera också att följande exempel använder enkla citationstecken ('), vilket inte fungerar i Windows. I Windows ska du istället använda dubbla citationstecken (").</para
+></note>
+<para
+>I det här sammanhanget används bara ersättningskommandot i <command
+>sed</command
+>: <screen>
+   <command
+>sed</command
+> 's/<replaceable
+>REGUTTRYCK</replaceable
+>/<replaceable
+>ERSÄTTNING</replaceable
+>/<replaceable
+>FLAGGOR</replaceable
+>'
+</screen
+> Innan du använder ett nytt kommando inne i &kdiff3;, bör du först prova det i en terminal. Då är kommandot <command
+>echo</command
+> användbart. Till exempel: <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/'
+   -> obrakadabra
+</screen
+> Exemplet visar ett mycket enkelt sed-kommando som ersätter den första förekomsten av "a" med "o". Om du vill ersätta alla förekomster behöver du flaggan "g": <screen>
+   <command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g'
+   -> obrokodobro
+</screen
+> Symbolen "|" är rörledningskommandot som överför utdata från föregående kommando till indata i efterföljande kommando. Om du vill prova med en längre fil kan du använda <command
+>cat</command
+> på Unix-liknande system eller <command
+>type</command
+> på Windows-liknande system. <command
+>sed</command
+> utför ersättningen för varje rad. <screen
+><command
+>cat</command
+> <replaceable
+>filnamn</replaceable
+> |<command
+>sed</command
+> <replaceable
+>väljare</replaceable
+>
+</screen>
+</para>
+</sect2>
+<sect2 id="sedforkdiff3"
+><title
+>Exempel på användning av <command
+>sed</command
+> i &kdiff3;</title>
+<sect3
+><title
+>Ignorera andra typer av kommentarer</title>
+<para
+>För närvarande förstår &kdiff3; bara C/C++ kommentarer. Genom att använda ett radmatchande preprocessorkommando kan du också ignorera andra typer av kommentarer genom att konvertera dem till C/C++ kommentarer. För att till exempel ignorera kommentarer som börjar med "#", skulle du vilja konvertera dem till "//". Observera att du också måste aktivera alternativet "Ignorera C/C++ kommentarer" för att få någon effekt. Ett lämpligt radmatchande preprocessorkommando skulle vara: <screen>
+   <command
+>sed</command
+> 's/#/\/\//'
+</screen
+> Eftersom tecknet "/" har en särskild betydelse i <command
+>sed</command
+>, är det nödvändigt att lägga till tecknet "\" innan varje "/" i ersättningssträngen. Ibland behövs "\" för att lägga till eller ta bort en särskild betydelse för vissa tecken. De enkla citationstecknen (') innan och efter ersättningskommandot är nu viktiga, eftersom skalet annars skulle försöka tolka vissa specialtecken som '#', '$' eller '\' innan de skickas till <command
+>sed</command
+>. <emphasis
+>Observera att i Windows behöver du dubbla citationstecken (") här. Windows ersätter andra tecken som '%', så du kan behöva experimentera något.</emphasis
+> </para>
+</sect3>
+<sect3
+><title
+>Jämförelse som inte är skiftlägeskänslig</title>
+<para
+>Använd följande radmatchande preprocessorkommando för att omvandla all indata till stora bokstäver: <screen>
+   <command
+>sed</command
+> 's/\(.*\)/\U\1/'
+</screen
+> Här är ".*" ett reguljärt uttryck som matchar alla strängar, och i det här sammanhanget matchar alla tecken på raden. Tecknet "\1" i ersättningssträngen motsvarar den matchade texten mellan det första paret "\(" och "\)". "\U" konverterar den infogade texten till stora bokstäver. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorera nyckelord för versionshantering</title>
+<para
+>CVS och andra versionshanteringssystem använder flera nyckelord för att infoga automatiskt skapade strängar (<ulink url="info:/cvs/Keyword substitution"
+>info:/cvs/Keyword substitution</ulink
+>). Alla följer mönstret "$NYCKELORD skapad text$". Nu behöver vi ett radmatchande preprocessorkommando som bara tar bort den skapade texten: <screen>
+   <command
+>sed</command
+> 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/'
+</screen
+> Strängen "\|" skiljer de möjliga nyckelorden åt. Du kanske vill ändra listan enligt dina behov. Tecknet "\" framför "$" behövs eftersom annars matchar  "$" radens slut. </para>
+<para
+>Medan du experimenterar med <command
+>sed</command
+> kan du komma att förstå och till och med tycka om de reguljära uttrycken. De är användbara eftersom det finns många andra program som också stöder liknande funktioner. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorera siffror</title>
+<para
+>Att ignorera siffror är i själva verket ett inbyggt alternativ, men som ett annat exempel, visas hur det skulle se ut som ett radmatchande preprocessorkommando. <screen>
+   <command
+>sed</command
+> 's/[0123456789.-]//g'
+</screen
+> Alla tecken inom '[' och ']' matchar och kommer att ersättas av ingenting. </para>
+</sect3>
+
+<sect3
+><title
+>Ignorera vissa kolumner</title>
+<para
+>Ibland är texten mycket strikt formaterad, och innehåller kolumner som du alltid vill ignorera, medan det finns andra kolumner du vill bevara för analys. I följande exempel ignoreras de fem första kolumnerna (tecknen), de följande tio kolumnerna bevaras, därefter ignoreras återigen fem kolumner och resten av raden bevaras. <screen>
+   <command
+>sed</command
+> 's/.....\(..........\).....\(.*\)/\1\2/'
+</screen
+> Varje punkt '.' motsvarar vilket enstaka tecken som helst. Strängarna "\1" och "\2" i ersättningssträngen refererar till den matchande texten inom det första och andra paret av  "\(" och "\)" som anger texten att bevara. </para>
+</sect3>
+
+<sect3
+><title
+>Kombinera flera ersättningar</title>
+<para
+>Ibland vill du tillämpa flera ersättningar samtidigt. Då kan du använda semikolon ';' för att skilja dem från varandra. Till exempel: <screen
+><command
+>echo</command
+> abrakadabra | <command
+>sed</command
+> 's/a/o/g;s/\(.*\)/\U\1/'
+   -> OBROKODOBRO
+</screen>
+</para>
+</sect3>
+
+<sect3
+><title
+>Använda <command
+>perl</command
+> istället för <command
+>sed</command
+></title>
+<para
+>Istället för <command
+>sed</command
+> kanske du vill använda något annat som <command
+>perl</command
+>. <screen>
+   <command
+>perl</command
+> -p -e 's/<replaceable
+>REGUTTRYCK</replaceable
+>/<replaceable
+>ERSÄTTNING</replaceable
+>/<replaceable
+>FLAGGOR</replaceable
+>'
+</screen
+> Men vissa detaljer är annorlunda i <command
+>perl</command
+>. Observera att där <command
+>sed</command
+> behöver "\(" och "\)" kräver <command
+>perl</command
+> det enklare  "(" och ")" utan inledande '\'. Till exempel: <screen
+><command
+>sed</command
+> 's/\(.*\)/\U\1/'
+   <command
+>perl</command
+> -p -e 's/(.*)/\U\1/'
+</screen>
+</para>
+</sect3>
+</sect2>
+
+<sect2
+><title
+>Ordning vid körning av preprocessor</title>
+<para
+>Data skickas igenom all intern och extern förbehandling i följande ordning: </para>
+<itemizedlist>
+<listitem
+><para
+>Normal preprocessor,</para
+></listitem>
+<listitem
+><para
+>Preprocessor för radmatchning,</para
+></listitem>
+<listitem
+><para
+>Ignorera skiftläge (konvertering till stora bokstäver),</para
+></listitem>
+<listitem
+><para
+>Detektering av C/C++ kommentarer,</para
+></listitem>
+<listitem
+><para
+>Ignorera siffror,</para
+></listitem>
+<listitem
+><para
+>Ignorera blanktecken</para
+></listitem>
+</itemizedlist>
+<para
+>Data efter den normala förbehandlingen bevaras för att visas och sammanfogas. De andra åtgärderna ändrar bara data som algoritmen för radmatchande jämförelse ser. </para
+><para
+>I de sällsynta fall då du använder normal förbehandling, observera att den radmatchande förbehandlingen ser utdata från den normala förbehandlingen som indata. </para>
+</sect2>
+
+<sect2
+><title
+>Varning</title>
+<para
+>Förbehandlingskommandon är ofta mycket användbara, men som med alla alternativ som ändrar texten eller döljer vissa skillnader automatiskt, kan du av misstag hoppa över vissa skillnader och i värsta fall förstöra viktig data. </para
+><para
+>Av denna orsak, om ett normalt preprocessorkommando används under en sammanfogning, talar &kdiff3; om det för dig och frågar om det ska inaktiveras eller inte. Men du får ingen varning om ett radmatchande preprocessorkommando är aktivt. Sammanfogningen sker inte förrän alla konflikter är lösta. Om du inaktiverade "Visa blanktecken" blir också skillnaderna som togs bort med det radmatchande preprocessorkommandot osynliga. Om knappen Spara förblir inaktiv under en sammanfogning (på grund av kvarvarande konflikter), försäkra dig om att aktivera "Visa blanktecken". Om du inte vill sammanfoga dessa mindre viktiga skillnader för hand kan du välja "Välj [A|B|C] för olösta konflikter med blanktecken" i menyn "Sammanfoga". </para>
+</sect2>
+</sect1>
+</chapter>
+
+
+<chapter id="dirmerge"
+><title
+>Katalogjämförelse och sammanfogning med &kdiff3;</title>
+<sect1 id="dirmergeintro"
+><title
+>Introduktion till katalogjämförelse och sammanfogning</title>
+<para
+>Ofta måste programmerare ändra många filer i en katalog för att uppnå sina syften. För att åstadkomma detta låter &kdiff3; dig också jämföra och sammanfoga hela kataloger rekursivt! </para
+><para
+>Även om jämförelse och sammanfogning av kataloger verkar vara ganska självklart, finns det flera detaljer som du bör känna till. Det viktigaste är förstås faktum att många filer nu kan påverkas av varje åtgärd. Om du inte har säkerhetskopior av originaldata, kan det vara mycket svårt eller till och med omöjligt att återgå till originalläget. Så innan du påbörjar en sammanfogning, försäkra dig om att data är säkert, och att det är möjligt att återställa. Om du skapar ett arkiv, eller använder ett versionshanteringssystem är ditt eget beslut, men till och med erfarna programmerare och integratörer behöver ibland gammal källkod. Observera också att även om jag (upphovsmannen till &kdiff3;) försöker att göra mitt bästa, kan jag inte garantera att det inte finns fel. Enligt GNU GPL finns det INGEN GARANTI av något slag för det här programmet. Så var ödmjuk, och kom alltid ihåg: </para>
+<blockquote
+><para>
+   <emphasis
+>Att fela är mänskligt, men för att verkligen ställa till det behövs en dator.</emphasis>
+</para
+></blockquote>
+<para
+>Så det här är vad programmet kan göra åt dig: &kdiff3; ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... läser och jämför två eller tre kataloger rekursivt,</para
+></listitem>
+     <listitem
+><para
+>... hanterar symboliska länkar särskilt,</para
+></listitem>
+     <listitem
+><para
+>... låter dig bläddra mellan filer med ett dubbelklick på musen,</para
+></listitem>
+     <listitem
+><para
+>... föreslår ett sammanfogningsalternativ för varje objekt, som du kan ändra innan katalogsammanfogningen startas,</para
+></listitem>
+     <listitem
+><para
+>... låter dig simulera sammanfogningen och listar åtgärderna som skulle ske, utan att verkligen göra dem,</para
+></listitem>
+     <listitem
+><para
+>... låter dig utföra sammanfogningen, och låter dig bestämma så fort manuell interaktion behövs,</para
+></listitem>
+     <listitem
+><para
+>... låter dig utföra vald åtgärd för alla objekt (tangenten F7 ) eller markerat objekt (tangenten F6),</para
+></listitem>
+     <listitem
+><para
+>... låter dig fortsätta sammanfogningen efter manuell interaktion med tangenten F7,</para
+></listitem>
+     <listitem
+><para
+>... skapar valfria säkerhetskopior, med filändelsen ".orig",</para
+></listitem>
+     <listitem
+><para
+>...</para
+></listitem>
+</itemizedlist>
+</sect1>
+
+<sect1 id="startingdirmerge"
+><title
+>Starta katalogjämförelse eller sammanfogning</title>
+<para
+>Det här liknar mycket sammanfogning och jämförelse av en enstaka fil. Du måste bara ange kataloger på kommandoraden eller i dialogrutan för filöppning. </para>
+<sect2
+><title
+>Jämföra eller sammanfoga två kataloger: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2</replaceable
+> <option
+>-o</option
+> <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>Om ingen målkatalog anges, använder &kdiff3; <replaceable
+>kat2</replaceable
+>. </para>
+</sect2>
+
+<sect2
+><title
+>Jämföra eller sammanfoga tre kataloger: </title>
+<screen
+><command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable>
+   <command
+>kdiff3</command
+> <replaceable
+>kat1 kat2 kat3</replaceable
+> <option
+>-o</option
+> <replaceable
+>målkat</replaceable
+>
+</screen>
+<para
+>När tre kataloger sammanfogas, används <replaceable
+>kat1</replaceable
+> som basen för sammanfogningen. Om ingen målkatalog anges, använder &kdiff3; <replaceable
+>kat3</replaceable
+> som målkatalog för sammanfogningen. </para>
+
+<para
+>Observera att bara jämförelsen startas automatiskt, inte sammanfogningen. För det måste du först välja ett menyalternativ eller tangenten F7. (Mer information kommer senare.) </para>
+</sect2>
+</sect1>
+
+<sect1 id="dirmergevisible"
+><title
+>Katalogsammanfogning av synlig information</title>
+<para
+>Medan katalogerna läses visas en meddelanderuta som informerar dig om förloppet. Om du avbryter katalogavsökningen, visas bara filer som hittills har jämförts. </para
+><para
+>När katalogavsökningen är färdig, visar &kdiff3; en listruta med återstående resultat, ... </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="dirbrowser.png" format="PNG"/></imageobject
+> <!--alt="Image of the directory browser."-->
+</mediaobject
+></screenshot>
+<para
+>... och detaljinformation om det markerade objektet till höger: </para>
+<screenshot
+><mediaobject>
+<imageobject
+><imagedata fileref="iteminfo.png" format="PNG"/></imageobject>
+   <!--alt="Image with information about the selected item."-->
+</mediaobject
+></screenshot>
+
+<sect2 id="name"
+><title
+>Namnkolumnen</title>
+<para
+>Varje fil och katalog som hittades under avsökningen visas här i ett träd. Du kan välja ett objekt genom att klicka en gång på det med musen. </para
+><para
+>Katalogerna är normalt ihopdragna. Du kan expandera och dra ihop dem genom att klicka på "+"/"-", genom att dubbelklicka på objektet eller genom att använda tangenterna vänsterpil och högerpil. Menyn "Katalog" innehåller också två alternativ "Dra ihop alla underkataloger" och "Expandera alla underkataloger" som du kan använda för att dra ihop eller expandera alla kataloger på en gång. </para
+><para
+>Om du dubbelklickar på ett filobjekt, utförs filjämförelsen och jämförelsefönstret för filer visas. </para>
+<para
+>Ikonen i namnkolumnen motsvarar filtypen i den första katalogen ("A"). Den kan vara någon av dessa: </para>
+<itemizedlist>
+     <listitem
+><para
+>Normal fil</para
+></listitem>
+     <listitem
+><para
+>Normal katalog (katalogikon)</para
+></listitem>
+     <listitem
+><para
+>Länk till en fil (filikon med en länkpil)</para
+></listitem>
+     <listitem
+><para
+>Länk till en katalog (katalogikon med en länkpil)</para
+></listitem>
+</itemizedlist>
+<para
+>Om filtypen är annorlunda i övriga kataloger, syns det i kolumnerna A/B/C och i fönstret som visar detaljinformation om det markerade objektet. Observera att i dessa fall kan inte någon sammanfogningsåtgärd väljas automatiskt. När sammanfogningen startas, informeras användaren om den här sortens problem. </para>
+</sect2>
+
+<sect2 id="coloring"
+><title
+>Kolumnerna A/B/C och färgläggningsschemat</title>
+<para
+>Som syns i bilden ovan, används färgerna röd, grön, gul och svart i kolumnerna A/B/C. </para>
+<itemizedlist>
+     <listitem
+><para
+>Svart: Det här objektet finns inte i den här katalogen.</para
+></listitem>
+     <listitem
+><para
+>Grön: Nyaste objektet.</para
+></listitem>
+     <listitem
+><para
+>Gul: Äldre än grön, nyare än röd.</para
+></listitem>
+     <listitem
+><para
+>Röd: Äldsta objektet.</para
+></listitem>
+</itemizedlist>
+<para
+>Utom för objekt som var identiska i jämförelsen, där är färgen också identisk även om åldern inte är det. </para
+><para
+>Kataloger anses vara likadana om alla objekt de innehåller är likadana. Då har de också samma färg. Åldern på en katalog spelar dock ingen roll för dess färg. </para
+><para
+>Idén för färgläggningsschemat hittade jag i <ulink url="http://samba.org/cgi-bin/cvsweb/dirdiff"
+>dirdiff</ulink
+>. Färgerna motsvarar färgerna hos ett löv som är grönt från början, sedan blir gult och till sist rött när det är gammalt. </para>
+
+</sect2
+><sect2 id="operation"
+><title
+>Åtgärdskolumnen</title>
+<para
+>Efter att ha jämfört katalogerna utvärderar &kdiff3; också ett förslag på sammanfogningsåtgärd. Det visas i kolumnen "Åtgärd". Du kan ändra den genom att klicka på åtgärden du vill ändra. En liten meny dyker upp och låter dig välja en åtgärd för objektet. (Du kan också välja den oftast använda åtgärden via tangentbordet. Ctrl+1/2/3/4/Delete väljer A/B/C/Sammanfoga/Ta bort om de är tillgängliga.) Åtgärden utförs under sammanfogningen. Vilka åtgärder som är tillgängliga beror på objektet och sammanfogningsläget som används. Sammanfogningsläget är ett av </para>
+<itemizedlist>
+     <listitem
+><para
+>Sammanfogning av tre kataloger ("A" behandlas som äldsta bas för båda).</para
+></listitem>
+     <listitem
+><para
+>Sammanfogning av två kataloger.</para
+></listitem>
+     <listitem
+><para
+>Tvåkatalogs synkroniseringsläge (aktiveras med alternativet "Synkronisera kataloger").</para
+></listitem>
+</itemizedlist>
+<para
+>Vid trekatalogers sammanfogning är den förslagna åtgärden: Om för ett objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... alla tre katalogerna är likadana: Kopiera från C</para
+></listitem>
+     <listitem
+><para
+>... A och C är likadana med B är det inte: Kopiera från B (eller om B inte finns, ta bort målet om det finns)</para
+></listitem>
+     <listitem
+><para
+>... A och B är likadana med C är det inte: Kopiera från C (eller om C inte finns, ta bort målet om det finns)</para
+></listitem>
+     <listitem
+><para
+>... B och C är likadana med A är det inte: Kopiera från C (eller om C inte finns, ta bort målet om det finns)</para
+></listitem>
+     <listitem
+><para
+>... bara A finns: Ta bort målet (om det finns)</para
+></listitem>
+     <listitem
+><para
+>... bara B finns: Kopiera från B</para
+></listitem>
+     <listitem
+><para
+>... bara C finns: Kopiera från C</para
+></listitem>
+     <listitem
+><para
+>... A, B och C är inte likadana: Sammanfoga</para
+></listitem>
+     <listitem
+><para
+>... A, B och C har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas.</para
+></listitem>
+</itemizedlist>
+<para
+>Vid tvåkatalogers sammanfogning är den förslagna åtgärden: Om för ett objekt... </para>
+<itemizedlist>
+     <listitem
+><para
+>... båda katalogerna är likadana: Kopiera från B</para
+></listitem>
+     <listitem
+><para
+>... A finns men inte B: Kopiera från A</para
+></listitem>
+     <listitem
+><para
+>... B finns men inte A: Kopiera från B</para
+></listitem>
+     <listitem
+><para
+>... A och B finns men är inte likadana: Sammanfoga</para
+></listitem>
+     <listitem
+><para
+>... A och B har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas.</para
+></listitem>
+</itemizedlist>
+<para
+>Synkroniseringsläge är bara aktivt om två kataloger och ingen explicit målkatalog anges, och om alternativet "Synkronisera kataloger" är aktivt. &kdiff3; väljer då en standardåtgärd så att båda katalogerna är likadana efteråt. Om för ett objekt ... </para>
+<itemizedlist>
+     <listitem
+><para
+>... båda katalogerna är lika: Ingenting görs.</para
+></listitem>
+     <listitem
+><para
+>... A finns, men inte B: Kopiera A till B</para
+></listitem>
+     <listitem
+><para
+>... B finns, men inte A: Kopiera B till A</para
+></listitem>
+     <listitem
+><para
+>... A och B finns, men är inte likadana: Sammanfoga och lagra resultatet i båda kataloger. (För användaren är det synliga filnamnet för att spara B, men därefter kopierar &kdiff3; också B till A.)</para
+></listitem>
+     <listitem
+><para
+>... A och B har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas.</para
+></listitem>
+</itemizedlist>
+<para
+>När två kataloger sammanfogas och alternativet "Kopiera nyare istället för att sammanfoga" är markerat, tittar &kdiff3; på datum och föreslår att välja den nyare filen. Om filerna inte är lika men har samma datum, innehåller åtgärden "Fel: Datum är lika men filerna är det inte." Medan sådana objekt finns, kan inte katalogsammanfogningen startas. </para>
+</sect2>
+
+<sect2 id="status"
+><title
+>Statuskolumnen</title>
+<para
+>Under sammanfogningen behandlas en fil i taget. Statuskolumnen visar "Klar" för objekt där sammanfogningsåtgärden har lyckats, och någon annan text om något oväntat inträffade. När en sammanfogning är färdig, bör du göra en sista kontroll för att se att status för alla objekt är acceptabel. </para>
+</sect2>
+
+<sect2 id="statisticscolulmns"
+><title
+>Statistikkolumner</title>
+<para
+>När filjämförelseläget "Fullständig analys" är aktiverat i alternativen, visar &kdiff3; extra kolumner som innehåller antal oupplösta, upplösta, inte blanka och blanka konflikter. (Kolumnen lösta visas bara när kataloger jämförs eller sammanfogas.) </para>
+</sect2>
+
+<sect2 id="selectingvisiblefiles"
+><title
+>Välja listade filer</title>
+<para
+>Flera alternativ påverkar vilka filer som listas här. Vissa är tillgängliga i <link linkend="dirmergeoptions"
+>inställningsdialogrutan</link
+>. Menyn Katalog innehåller alternativen: </para
+><para
+><itemizedlist>
+     <listitem
+><para
+>"Visa identiska filer": Filer som har detekterats som lika i alla indatakataloger.</para
+></listitem>
+     <listitem
+><para
+>"Visa olika filer": Filer som finns i två eller flera kataloger men inte är lika.</para
+></listitem>
+     <listitem
+><para
+>"Visa bara filer i A": Filer som bara finns i A, men inte i B eller C.</para
+></listitem>
+     <listitem
+><para
+>"Visa bara filer i B": Filer som bara finns i B, men inte i A eller C.</para
+></listitem>
+     <listitem
+><para
+>"Visa bara filer i C": Filer som bara finns i C, men inte i A eller B.</para
+></listitem>
+</itemizedlist
+></para>
+<para
+>Aktivera bara alternativen "Visa" för objekten du vill lista. Om du till exempel bara vill lista alla objekt som antingen finns i A eller i B men inte i båda, måste du aktivera "Visa bara filer i A" och "Visa bara filer i B" och inaktivera alla andra ("Visa identiska filer", "Visa olika filer", "Visa bara filer i C"). Listan uppdateras omedelbart för att motsvara ändringen. </para
+><para
+>Alternativen gäller också för kataloger med ett undantag: Att inaktivera "Visa olika filer" döljer inte hela kataloger. Det fungerar bara för filer inne i dem. </para
+><para
+>Observera att av dessa är bara alternativet "Visa identiska filer" som är bestående Övriga aktiveras när &kdiff3; startas. </para>
+</sect2>
+
+</sect1>
+
+
+<sect1 id="dothemerge"
+><title
+>Utföra en katalogsammanfogning</title>
+<para
+>Du kan antingen sammanfoga markerat objekt (fil eller katalog), eller alla objekt. När du har gjort alla val av åtgärder (också i alla underkataloger), kan du utföra sammanfogningen. </para
+><para
+>Var medveten om att om du inte explicit angav en målkatalog, blir målet "C" i trekatalogsläge, "B" i tvåkatalogsläge, och i synkroniseringsläge är det "A" och/eller "B". </para
+><para
+>Om du också har angivit en målkatalog, kontrollera att alla objekt som ska finnas i utmatningen finns i trädet. Det finns några alternativ som får vissa objekt att utelämnas från katalogjämförelsen och sammanfogningen. Kontrollera dessa alternativ för att undvika obehagliga överraskningar: </para>
+<itemizedlist>
+     <listitem
+><para
+>"Rekursiva kataloger": Om det är av, hittas inte objekt i underkataloger.</para
+></listitem>
+     <listitem
+><para
+>"Mönster" eller "Undantagsmönster": Inkludera eller undanta objekt som matchar</para
+></listitem>
+     <listitem
+><para
+>"Undanta gömda filer"</para
+></listitem>
+     <listitem
+><para
+><link linkend="selectingvisiblefiles"
+>"Visa"-alternativ</link
+> (Visa identiska/olika filer, bara filer i A/B/C)</para
+></listitem>
+</itemizedlist>
+<para
+>Om du ändrar inställningarna för att visa fler filer, måste du göra en omsökning via menyn "Katalog" -> "Avsök igen". (Orsaken till det är att &kdiff3; utelämnar jämförelsen för filer enligt kriterierna för att få snabbare jämförelsehastighet.) Om du ändrade fil- och katalogmönster för att undanta filer, uppdateras fillistan omedelbart när inställningsdialogrutan stängs. </para
+><para
+>Observera att när du skriver till en helt ny katalog vill du oftast också kopiera de identiska filerna. Aktivera "Visa identiska filer" i detta fall. Om din målkatalog är en av indatakatalogerna, är det inte nödvändigt eftersom filerna redan finns där. </para
+><para
+>Om du är nöjd hittills, är resten enkelt. </para
+><para
+>För att sammanfoga alla objekt: Välj "Starta eller fortsätt katalogsammanfogning" i menyn "Katalog" eller tryck på F7 (som är snabbtangenten). För att bara sammanfoga aktuellt objekt: Välj "Utför åtgärd för aktuellt objekt" eller tryck på F6. </para
+><para
+>Om vissa objekt med ogiltiga filtyper fortfarande finns, på grund av filtyper med konflikter, visas en meddelanderuta och objekten pekas ut, så att du kan välja en giltig åtgärd för objektet. </para
+><para
+>Om du sammanfogar alla objekt visas en dialogruta som ger dig alternativen "Gör det", "Simulera det" och "Avbryt". </para>
+<itemizedlist>
+     <listitem
+><para
+>Välj "Simulera det" om du vill se vad som skulle göras utan att verkligen göra det. En utförlig lista med alla åtgärder visas.</para
+></listitem>
+     <listitem
+><para
+>Välj annars "Gör det" för att verkligen utföra sammanfogningen.</para
+></listitem>
+</itemizedlist>
+<para
+>Därefter utför &kdiff3; den angivna åtgärden för alla objekt. Om manuell interaktion krävs (sammanfogning av enstaka fil), visas ett sammanfogningsfönster (<link linkend="dirmergebigscreenshot"
+>se den stora skärmbilden</link
+>). </para
+><para
+>När du är klar med manuell sammanfogning av en fil, välj återigen "Starta eller fortsätt katalogsammanfogning" eller tryck på F7. Om du inte har sparat ännu, ber en dialogruta dig att göra det. Därefter fortsätter &kdiff3; till nästa objekt. </para
+><para
+>När &kdiff3; stöter på ett fel, meddelas det och utförlig statusinformation visas. Längst ner i listan finns det några felmeddelanden som bör hjälpa dig att förstå problemets orsak. När du fortsätter sammanslagningen (tangenten F7), ger &kdiff3; dig valet att försöka igen eller hoppa över objektet som orsakade problemet. Det betyder att du kan välja en annan åtgärd, eller lösa problemet på annat sätt, innan du fortsätter. </para
+><para
+>När sammanfogningen är färdig, informerar &kdiff3; dig med en meddelanderuta. </para
+><para
+>Om vissa objekt sammanfogades individuellt innan katalogsammanfogningen, kommer &kdiff3; ihåg det (medan sammanfogningssessionen pågår), och sammanfogar dem inte igen när sammanfogningen för alla objekt utförs. Även när sammanfogningen hoppas över eller ingenting sparas räknas dessa objekt som färdiga. Bara när sammanfogningsåtgärden ändras, tas objektets "klar"-status bort och det kan sammanfogas igen. </para>
+</sect1>
+
+<sect1 id="dirmergeoptions"
+><title
+>Alternativ för att jämföra och sammanfoga kataloger</title>
+<para
+>Inställning av &kdiff3; (menyn "Inställningar" -&gt; "Anpassa &kdiff3;") har en sida som heter "Katalogsammanfogning" med följande alternativ: </para>
+
+<variablelist>
+   <varlistentry
+><term
+><emphasis
+>Rekursiva kataloger:</emphasis
+></term
+><listitem
+><para
+>Välj om kataloger ska sökas igenom rekursivt.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Mönster för filer:</emphasis
+></term
+><listitem
+><para
+>Bara filer som matchar något mönster här läggs till i trädet. Mer än ett mönster kan anges genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. (t.ex. "*.cpp;*.h"). Normalvärdet är "*". Mönstret används inte för kataloger.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Undantagsmönster för filer:</emphasis
+></term
+><listitem
+><para
+>Filer som matchar något mönster undantas från trädet. Mer än ett mönster kan anges här genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. Normalvärdet är "*.orig;*.o;*.obj".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Undantagsmönster för kataloger:</emphasis
+></term
+><listitem
+><para
+>Kataloger som matchar något mönster undantas från trädet. Mer än ett mönster kan anges genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. Normalvärdet är "CVS;deps;.svn".</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Använd .cvsignore:</emphasis
+></term
+><listitem
+><para
+>Ignorera filer och kataloger som också skulle ignoreras av CVS. Många automatiskt genererade filer ignoreras av CVS. Den stora fördelen är att detta kan vara katalogspecifikt via en lokal ".cvsignore" fil. (Se <ulink url="info:/cvs/cvsignore"
+>info:/cvs/cvsignore</ulink
+>.)</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Sök efter gömda filer och kataloger:</emphasis
+></term
+><listitem
+><para
+>För vissa filsystem har filer egenskapen "Dold". För andra system döljs ett filnamn som börjar med en punkt ("."). Alternativet låter dig bestämma om dessa filer ska ingå i trädet eller inte. Normalvärdet är på.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Följ fillänkar:</emphasis
+></term
+><listitem
+><para
+>För länkar till filer: Om inaktiverad, jämförs de symboliska länkarna. Om aktiverad, jämförs filerna bakom länkarna. Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Följ kataloglänkar:</emphasis
+></term
+><listitem
+><para
+>För länkar till kataloger: Om inaktiverad, jämförs symboliska länkar. Om aktiverad behandlas länken som en katalog och avsöks rekursivt. (Observera att programmet inte kontrollerar om länken är "rekursiv". En katalog som innehåller en länk till samma katalog skulle orsaka en oändlig snurra, och efter en viss tid när stacken blir full eller minnet tar slut, kraschar programmet.) Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Skiftlägeskänslig filnamnsjämförelse:</emphasis
+></term
+><listitem
+><para
+>Förvalt värde är falskt på Windows, och sant för andra operativsystem.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Filjämförelseläge:</emphasis
+></term
+><listitem
+><para>
+<variablelist
+>            
+   <varlistentry
+><term
+><emphasis
+>Binär jämförelse:</emphasis
+></term
+><listitem
+><para
+>Det här är förvalt filjämförelseläge. </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Fullständig analys:</emphasis
+></term
+><listitem
+><para
+>Gör en fullständig analys av varje fil och visa kolumner med statistisk information. (Antal upplösta, oupplösta, inte blanka och blanka konflikter.) Den fullständiga analysen är långsammare än en enkel binäranalys, och är mycket långsammare för filer som inte innehåller text. (Ange lämpliga filmönster för att undvika dem.) </para
+></listitem
+></varlistentry
+>         
+   <varlistentry
+><term
+><emphasis
+>Lita på ändringsdatum:</emphasis
+></term
+><listitem
+><para
+>Om du jämför stora kataloger via ett långsamt nätverk, kan det gå snabbare att bara jämföra ändringsdatum och fillängd. Men hastighetsförbättringen sker till priset av en liten osäkerhet. Använd alternativet med försiktighet. Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Lita på storleken:</emphasis
+></term
+><listitem
+><para
+>Liknar att lita på ändringsdatum. Ingen verklig jämförelse sker. Två filer anses vara lika om deras filstorlekar är lika. Detta är användbart när filkopieringsåtgärden inte bevarade ändringsdatum. Använd alternativet med försiktighet. Normalvärdet är av.</para
+></listitem
+></varlistentry>
+</variablelist
+></para
+></listitem
+></varlistentry>
+         
+   <varlistentry
+><term
+><emphasis
+>Synkronisera kataloger:</emphasis
+></term
+><listitem
+><para
+>Aktiverar "synkroniseringsläge" när två kataloger jämförs och ingen explicit målkatalog anges. I det här läget väljes föreslagna åtgärder så att båda källkatalogerna är likadana efteråt. Sammanfogningsresultatet skrivs också till båda kataloger. Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Kopiera nyare istället för att sammanfoga:</emphasis
+></term
+><listitem
+><para
+>Istället för att sammanfoga kopierar den föreslagna åtgärden den nyare källan om ändringar har skett. (Anses vara osäkert, eftersom det förutsätter att du vet att den andra filen inte också har redigerats. Kontrollera för att vara säker i varje enskilt fall.) Normalvärdet är av.</para
+></listitem
+></varlistentry>
+   <varlistentry
+><term
+><emphasis
+>Säkerhetskopiera filer:</emphasis
+></term
+><listitem
+><para
+>Om en fil eller hel katalog ersätts med en annan eller tas bort, då ändras originalversionens namn med tillägg av filändelsen ".orig". Om en gammal säkerhetskopia med filändelsen ".orig" redan finns tas den bort utan säkerhetskopiering. Det här gäller också normal sammanfogning av enstaka filer, inte bara sammanfogningsläge för kataloger. Normalvärdet är på.</para
+></listitem
+></varlistentry>
+</variablelist>
+</sect1>
+
+<sect1 id="other"
+><title
+>Andra funktioner i katalogsammanfogningsfönstret</title>
+<sect2
+><title
+>Delat eller fullskärmsläge</title>
+<para
+>Oftast förblir listfönstret för katalogsammanfogning synligt medan en enstaka fil jämförs eller sammanfogas. Du kan flytta raden som delar fillistan från fönstren för textjämförelse med musen. Om du inte vill göra det, kan du inaktivera "Delad skärmvy" i menyn "Katalog". Därefter kan du använda "Byt vy" i menyn "Katalog" för att byta mellan fillistan och fönstren för textjämförelse, som då upptar hela fönstret. </para>
+</sect2>
+<sect2
+><title
+>Jämföra och sammanfoga en ensam fil</title>
+<para
+>Du föredrar troligen ett vanligt dubbelklick på musen för att jämföra en fil. Hur som helst finns det också ett alternativ i menyn "Katalog". Du kan också direkt sammanfoga en enstaka fil, utan att starta katalogsammanfogning via "Sammanfoga markerade filer" i menyn "Sammanfoga". När resultatet sparas, sätts status till klar, och filen sammanfogas inte igen om en katalogsammanfogning startas. </para
+><para
+>Men observera att statusinformationen går förlorad när du kör om en katalogavsökning: menyn "Katalog", "Avsök igen" </para>
+</sect2>
+<sect2
+><title
+>Jämföra eller sammanfoga filer med olika namn</title>
+<para
+>Ibland behöver du jämföra eller sammanfoga filer med olika namn (t.ex. nuvarande fil och säkerhetskopian i samma katalog). </para
+><para
+>Markera den exakta filen genom att klicka på ikonen i kolumnen A, B eller C. Filen som först markeras på det sättet markeras med "A", den andra och tredje med "B" och "C" oberoende av vilken kolumn de finns i. Bara upp till tre filer kan markeras på detta sätt. </para
+><para
+>Fortsätt genom att välja "Jämför explicit markerade filer" eller "Sammanfoga explicit markerade filer" från menyn "Katalog". Av bekvämlighetsskäl finns också menyalternativen som en sammanhangsberoende meny som visas när du klickar på den senast markerade filen. </para
+><para
+>Jämförelsen eller sammanfogningen av en fil sker i samma fönster. Om metoden används för kataloger öppnas ett nytt fönster. </para
+></sect2>
+</sect1>
+</chapter>
+
+<chapter id="misc">
+<title
+>Diverse ämnen</title>
+<sect1 id="networktransparency">
+<title
+>Nätverkstransparens via KIO</title>
+<sect2
+><title
+>I/O-slavar</title>
+<para
+>KDE stöder nätverkstransparens via I/O-slavar. &kdiff3; använder dem för att läsa indatafiler och avsöka kataloger. Det betyder att du kan ange filer och kataloger på lokal- och fjärr-resurser via webbadresser. </para
+><para
+>Exempel: </para
+><para>
+<screen
+><command
+>kdiff3</command
+> test.cpp  ftp://ftp.langtbortistan.org/test.cpp
+   <command
+>kdiff3</command
+> tar:/home/hackare/arkiv.tar.gz/kat ./kat
+</screen>
+</para>
+<para
+>Den första raden jämför en lokal fil med en fil på en FTP-server. Den andra raden jämför en katalog i ett komprimerat arkiv med en lokal katalog. </para
+><para
+>Andra I/O-slavar som är intressanta är: </para>
+<itemizedlist>
+<listitem
+><para
+>Filer från WWW (http:),</para
+></listitem>
+<listitem
+><para
+>Filer från FTP (ftp:),</para
+></listitem>
+<listitem
+><para
+>Krypterad filöverföring (fish:, sftp:),</para
+></listitem>
+<listitem
+><para
+>Resurser från Windows (smb:),</para
+></listitem>
+<listitem
+><para
+>Lokala filer (file:),</para
+></listitem>
+</itemizedlist>
+<para
+>Andra saker som är möjliga, men troligen mindre användbara, är: </para>
+<itemizedlist>
+<listitem
+><para
+>Manualsidor (man:),</para
+></listitem>
+<listitem
+><para
+>Infosidor (info:),</para
+></listitem>
+</itemizedlist>
+</sect2>
+
+<sect2
+><title
+>Hur man skriver webbadresser</title>
+<para
+>En webbadress har en annorlunda syntax jämfört med sökvägar till lokala filer och kataloger. Vissa saker måste tas hänsyn till: </para>
+<itemizedlist>
+<listitem
+><para
+>En sökväg kan vara relativ, och kan innehålla "." eller "..". Det är inte möjligt för webbadresser, som alltid är absoluta. </para
+></listitem
+><listitem
+><para
+>Specialtecken måste skrivas med särskilda "teckenföljder". ("#" blir "%23", mellanslag blir "%20", etc.) Till exempel skulle en fil med namnet "/#foo#" ha webbadressen "file:/%23foo%23". </para
+></listitem
+><listitem
+><para
+>När webbadresser inte fungerar som väntat, försök att öppna dem i Konqueror först. </para
+></listitem>
+</itemizedlist>
+
+</sect2>
+
+<sect2
+><title
+>Möjligheter med I/O-slavar</title>
+<para
+>Nätverkstransparens har en nackdel: Inte alla resurser har samma möjligheter. </para
+><para
+>Ibland beror det på serverns filsystem, ibland på protokollet. Här är en kort lista med begränsningar: </para>
+<itemizedlist>
+<listitem
+><para
+>Ibland finns det inget stöd för länkar. </para
+></listitem
+><listitem
+><para
+>Eller finns det inget sätt att särskilja om en länk pekar på en fil eller katalog, då antas alltid en fil (ftp:, sftp:). </para
+></listitem
+><listitem
+><para
+>Kan inte alltid avgöra filstorleken. </para
+></listitem
+><listitem
+><para
+>Begränsat stöd för rättigheter. </para
+></listitem
+><listitem
+><para
+>Ingen möjlighet att ändra rättigheter eller ändringstid, så rättigheter eller tiden för en kopia skiljer sig från originalet. (Se alternativet "Lita på storlek". Ändring av rättigheter eller ändringstid är bara möjligt för lokala filer.) </para
+></listitem>
+</itemizedlist>
+</sect2>
+</sect1>
+
+<sect1 id="kpart">
+<title
+>Använda &kdiff3; som en Kpart</title>
+<para
+>Kdiff3 är en Kpart. För närvarande implementeras gränssnittet KParts::ReadOnlyPart. </para
+><para
+>Den huvudsakliga användningen är för skillnadsvisning i KDevelop. KDevelop startar alltid den interna skillnadsvisningen först. För att använda &kdiff3;, klicka med höger musknapp i skillnadsvisningens fönster och välj "Visa i KDiff3-del" i den sammanhangsberoende menyn. </para
+><para
+>&kdiff3; kräver normalt två fullständiga filer som indata. När det används som en del, antar &kdiff3; att indatafilen är en programfixfil med unifierat format. &kdiff3; hämtar därefter originalfilernas namn i programfixfilen. Åtminstone en av de två filerna måste vara tillgänglig. &kdiff3; startar då kommandot <command
+>patch</command
+> för att återskapa den andra filen. </para
+><para
+>Du kan välja en programfixfil i Konqueror och välja "Förhandsgranska i"-"Kdiff3-del" i den sammanhangsberoende menyn. Var medveten om att det inte fungerar om ingen av originalfilerna finns tillgänglig, och är inte tillförlitligt om originalfilen eller filerna har ändrats sedan programfixfilen skapades. </para
+><para
+>När det kör som ett delprogram tillhandahåller &kdiff3; bara jämförelse mellan två filer, en mycket liten verktygsrad och meny. Sammanfogning eller katalogjämförelse stöds då inte. </para>
+</sect1>
+</chapter>
+
+<chapter id="faq">
+<title
+>Vanliga frågor</title>
+&reporting.bugs; &updating.documentation; <qandaset id="faqlist">
+
+<qandaentry
+><question
+><para
+>Varför kallas det "&kdiff3;"? </para
+></question
+><answer
+><para
+>Verktyg som heter "KDiff" och "KDiff2" (som nu kallas "Kompare") fanns redan. Dessutom ska "Kdiff3" antyda att programmet kan sammanfoga som verktyget "diff3" från samlingen med diff-verktyg. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Varför licensieras det under GPL? </para
+></question
+><answer
+><para
+>Jag har använt GPL-program under mycket lång tid nu, och lärt mig mycket genom att titta på en hel del av källkoden. Alltså är det här mitt "tack" till alla programmerare som också gjorde eller kommer att göra samma sak. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Vissa knappar och funktioner saknas. Vad är fel? </para
+></question
+><answer
+><para
+>Du kompilerade från källkod, men angav troligen inte rätt KDE-prefix med configure. Normalt vill configure installera i /usr/local, men då kan inte KDE hitta resursfilerna för användargränssnittet (dvs. kdiff3ui.rc). Filen README innehåller mer information om riktigt prefix. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Ofta visas rader som är liknande men inte identiska intill varandra, men inte alltid. Varför? </para
+></question
+><answer
+><para
+>Rader där bara antal blanktecken är olika behandlas som "lika", medan bara ett annorlunda blanktecken gör att raderna är "olika". Om liknande rader finns intill varandra, är detta i själva verket en slump men det är som tur är oftast fallet. Se också <link linkend="manualdiffhelp"
+>hjälpen på manualsidan för diff</link
+>. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Varför måste alla konflikter vara lösta innan sammanfogningsresultatet kan sparas? </para
+></question
+><answer
+><para
+>För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med sammanfogningsresultatet ihåg var det börjar och slutar. Det behövs eftersom konflikter kan lösas upp manuellt genom att helt enkelt välja källknappen (A, B eller C). Informationen går förlorad när filen sparas som text, och det är för mycket ansträngning att skapa ett speciellt filformat som stöder att spara och återställa all nödvändig information. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hur kan jag synkronisera jämförelsevyn och sammanfogningsvyn så att alla vyer visar samma textposition? </para
+></question
+><answer
+><para
+>Klicka på sammanfattningskolumnen till vänster om texten. (<link linkend="synchronise_views"
+>Se också här.</link
+>) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Varför har inte editorn i resultatfönstret för sammanfogning en "ångra"-funktion? </para
+></question
+><answer
+><para
+>Hittills har det varit för stor ansträngning. Du kan alltid återställa en version från en källa (A, B eller C) genom att klicka på motsvarande knapp. För större redigering, rekommenderas användning av en annan editor ändå. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>När jag tog bort en del text, visades plötsligt "&lt;Ingen källrad&gt;" och det kan inte tas bort. Vad betyder det och hur kan man ta bort det? </para
+></question
+><answer
+><para
+>För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med sammanfogningsresultatet ihåg var det börjar och slutar. "&lt;Ingen källrad&gt;" betyder att det inte finns någonting kvar i ett avsnitt, inte ens ett nyradstecken. Detta kan inträffa antingen vid automatisk sammanfogning eller efter redigering. Det är inget problem, eftersom den här informationen inte finns med i den sparade filen. Om du vill ha tillbaka originalkällan, markera bara källan (klicka på sammanfattningskolumnen till vänster) och klicka därefter på källknappen med innehållet som önskas (A, B eller C). </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Varför stöder inte &kdiff3; syntaxfärgläggning? </para
+></question
+><answer
+><para
+>&kdiff3; använder redan många färger för färgläggning av jämförelser. Ytterligare färgläggning skulle vara förvirrande. Använd en annan editor för detta. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Kan jag använda &kdiff3; för att jämföra filer från OpenOffice.Org, Word, Excel, PDF, och så vidare? </para
+></question
+><answer
+><para
+>Även om &kdiff3; kan analysera alla sorters filer, är resultatet troligen inte särskilt tillfredsställande för dig. </para
+><para
+>&kdiff3; skapades för att jämföra rena textfiler. OpenOffice, Word, Excel, och så vidare, lagrar mycket mer information i filerna (om teckensnitt, bilder, sidor, färger, etc.), som &kdiff3; inte känner till. Alltså visar &kdiff3; dig innehållet i filen tolkat som ren text, men det kan vara oläsbart eller åtminstone se mycket konstigt ut. </para
+><para
+>Eftersom de flesta program nuförtiden lagrar sitt innehåll med XML-format, kanske du kan läsa det som ren text. Om ändringen bara var liten, kanske &kdiff3; fortfarande kan hjälpa dig. </para
+><para
+>Den bästa lösningen om du bara vill jämföra texten (utan inbäddade objekt som bilder) är att använda "Markera alla" och "Kopiera" i programmet för att kopiera den intressanta texten till klippbordet och därefter klistra in texten i något av jämförelsefönstren i &kdiff3;. (Se också <link linkend="selections"
+>Markera, kopiera och klistra in</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Vart har katalogalternativet "Lista bara skillnader" tagit vägen? </para
+></question
+><answer
+><para
+>Det finns nu flera olika <link linkend="selectingvisiblefiles"
+>"Visa"-alternativ</link
+> i katalogmenyn. Att inaktivera "Visa identiska filer" åstadkommer vad aktivering av "Lista bara skillnader" brukade göra. </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Hur kan man göra en stor markering i jämförelsefönstret fastän det tar så lång tid att rulla texten? </para
+></question
+><answer
+><para
+>Påbörja markeringen som vanligt (klicka och håll nere vänster musknapp). Använd därefter navigationstangenterna (t.ex. Page Up, Page Down) medan vänster musknapp hålls nere. (Se också <link linkend="selections"
+>Markera, kopiera och klistra in</link
+>.) </para
+></answer
+></qandaentry>
+
+<qandaentry
+><question
+><para
+>Det finns en stor mängd  information här, men din fråga har ändå inte besvarats? </para
+></question
+><answer
+><para
+>Skicka gärna din fråga till mig. Jag uppskattar alla kommentarer. </para
+></answer
+></qandaentry>
+
+</qandaset>
+</chapter>
+
+<chapter id="credits">
+
+<title
+>Tack till och licens</title>
+
+<para
+>&kdiff3;: Verktyg för jämförelser och sammanfogning av filer och kataloger </para>
+<para
+>Program copyright 2002-2006 Joachim Eibl <email
+>joachim.eibl snabela gmx.de</email
+> </para>
+<para
+>Flera häftiga idéer och felrapporter kom från kolleger och många personer ute i den Vida Vilda Världen. Tack! </para>
+
+<para
+>Dokumentation Copyright &copy; 2002-2006 Joachim Eibl <email
+>joachim. eibl snabela gmx.de</email
+> </para>
+
+<para
+>Översättning Stefan Asserhäll<email
+>stefan.asserhall@comhem.se</email
+></para
+> 
+&underFDL; &underGPL; </chapter>
+
+<appendix id="installation">
+<title
+>Installation</title>
+
+<sect1 id="getting-kdiff3">
+<title
+>Hur man skaffar &kdiff3;</title>
+
+<para
+>Du kan ladda ner senaste version av &kdiff3; från hemsidan <ulink url="http://kdiff3.sourceforge.net"
+>http://kdiff3.sourceforge.net</ulink
+>. </para
+><para
+>&kdiff3; är också tillgänglig för andra plattformar. Se hemsidan för detaljinformation. </para>
+
+
+</sect1>
+
+<sect1 id="requirements">
+<title
+>Krav</title>
+
+<para
+>För att använda alla funktioner i &kdiff3; med lyckat resultat behöver du &kde; 3.1 eller senare. </para
+><para
+>För information om hur &kdiff3; kan köras på andra plattformar utan KDE, se <ulink url="http://kdiff3.sourceforge.net"
+>hemsidan</ulink
+>. </para
+><para
+>Du hittar en lista med ändringar på <ulink url="http://kdiff3.sourceforge.net/ChangeLog"
+>http://kdiff3.sourceforge.net/ChangeLog</ulink
+> eller i filen "ChangeLog" i källkodspaketet. </para>
+</sect1>
+
+<sect1 id="compilation">
+<title
+>Kompilering och installation</title>
+
+<para
+>För att kompilera och installera &kdiff3; på ett system med KDE, skriv följande i baskatalogen för distributionen av &kdiff3;:</para>
+
+<screen
+><prompt
+>%</prompt
+> <userinput
+><command
+>./configure --prefix=<replaceable
+>kde-katalog</replaceable
+></command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+></userinput>
+<prompt
+>%</prompt
+> <userinput
+><command
+>make</command
+> install</userinput
+>
+</screen>
+<para
+><replaceable
+>kde-katalog</replaceable
+> anger katalogen som innehåller KDE på ditt system. Om du inte är säker, läs filen README för detaljinformation. </para>
+<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>
+<para
+>Eftersom &kdiff3; använder <command
+>autoconf</command
+> och <command
+>automake</command
+> bör du inte ha några problem med att kompilera det. Skulle du stöta på problem, rapportera dem gärna till &kde;:s e-postlistor.</para>
+
+</sect1>
+
+</appendix>
+
+&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
+-->
diff --git a/doc/sv/iteminfo.png b/doc/sv/iteminfo.png
new file mode 100644
index 0000000..0b81443
--- /dev/null
+++ b/doc/sv/iteminfo.png
diff --git a/doc/sv/letter_by_letter.png b/doc/sv/letter_by_letter.png
new file mode 100644
index 0000000..8ddd48a
--- /dev/null
+++ b/doc/sv/letter_by_letter.png
diff --git a/doc/sv/merge_current.png b/doc/sv/merge_current.png
new file mode 100644
index 0000000..3f2e341
--- /dev/null
+++ b/doc/sv/merge_current.png
diff --git a/doc/sv/new.png b/doc/sv/new.png
new file mode 100644
index 0000000..df3fd25
--- /dev/null
+++ b/doc/sv/new.png
diff --git a/doc/sv/open_dialog.png b/doc/sv/open_dialog.png
new file mode 100644
index 0000000..029f8d4
--- /dev/null
+++ b/doc/sv/open_dialog.png
diff --git a/doc/sv/screenshot_diff.png b/doc/sv/screenshot_diff.png
new file mode 100644
index 0000000..d2865d5
--- /dev/null
+++ b/doc/sv/screenshot_diff.png
diff --git a/doc/sv/screenshot_merge.png b/doc/sv/screenshot_merge.png
new file mode 100644
index 0000000..1eb935b
--- /dev/null
+++ b/doc/sv/screenshot_merge.png
diff --git a/doc/sv/triple_diff.png b/doc/sv/triple_diff.png
new file mode 100644
index 0000000..c635d14
--- /dev/null
+++ b/doc/sv/triple_diff.png
diff --git a/doc/sv/white_space.png b/doc/sv/white_space.png
new file mode 100644
index 0000000..e40a1c7
--- /dev/null
+++ b/doc/sv/white_space.png