Use tdeAppHEADmaster

Signed-off-by: Michele Calgaro <[email protected]>

169 files changed, 1149 insertions, 1149 deletions

diff --git a/doc/da/digikam/index.docbook b/doc/da/digikam/index.docbook
index 7ccd7cca..6df94628 100644
--- a/doc/da/digikam/index.docbook
+++ b/doc/da/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Danish "INCLUDE"><!-- change language only here -->
@@ -87,10 +87,10 @@
 <chapter id="introduction">
 <title>Indledning</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Baggrund</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Om &digikam;</title>
 
        <para>&digikam; er et avanceret digitalt fotohåndteringsprogram for desktopmiljøet &kde;. Det sørger for en enkel grænseflade som gør det muligt at importere og organisere digitale foto "i en håndevending". &digikam; giver dig mulighed for at håndtere et stort antal digitale fotografier i albummer, og at organisere fotografierne med mærker for nemt at kunne komme til dem. Det har mange funktioner til at vise, organisere, behandle og dele billeder med andre. </para>
@@ -133,7 +133,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Kom i gang</title>
 
         <sect2 id="firstrundialog">
@@ -164,15 +164,15 @@
               <textobject><phrase>Albummernes manglende dialog</phrase></textobject></inlinemediaobject>
         </para>
 
-        <para>Når du bruger en eksisterende mappe med fotografier som mappe for albumbiblioteker, bemærker du at albummene i listen Mine albummer ikke har fotografier som ikoner. Den første gang du viser hvert album, laver &digikam; et miniaturebillede fra det første fotografiet i albummet og bruger det som albumikon. Se afsnittet <link linkend="using-kapp-myalbumsview">Mine albummer</link> for detaljer om hvordan man ændrer albumikonen. </para>
+        <para>Når du bruger en eksisterende mappe med fotografier som mappe for albumbiblioteker, bemærker du at albummene i listen Mine albummer ikke har fotografier som ikoner. Den første gang du viser hvert album, laver &digikam; et miniaturebillede fra det første fotografiet i albummet og bruger det som albumikon. Se afsnittet <link linkend="using-tdeApp-myalbumsview">Mine albummer</link> for detaljer om hvordan man ændrer albumikonen. </para>
 
-        <para>Hvis du tidligere har brugt et andet program til at komme til din fotografisamling, og det har oprettet miniaturebilleder i undermapper som ikke følger standarden, viser &digikam; mapperne med miniaturebilleder som separate albummer. &digikam; følger standarden fra <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> for mapper med miniaturebilleder. Der er ingen måde at skjule mapper med miniaturebilleder som ikke følger standarden fra listen "Mine albummer". Hvis du vil beholde dem vil du kunne oprette en albumsamling som kun indeholder alle mapper med miniaturebilleder og derefter kigge på dine albummer i samlingsrækkefølge. Se afsnittet <link linkend="using-kapp-myalbumsview">Mine albummer</link> for mere information om albumsamlinger. </para>
+        <para>Hvis du tidligere har brugt et andet program til at komme til din fotografisamling, og det har oprettet miniaturebilleder i undermapper som ikke følger standarden, viser &digikam; mapperne med miniaturebilleder som separate albummer. &digikam; følger standarden fra <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> for mapper med miniaturebilleder. Der er ingen måde at skjule mapper med miniaturebilleder som ikke følger standarden fra listen "Mine albummer". Hvis du vil beholde dem vil du kunne oprette en albumsamling som kun indeholder alle mapper med miniaturebilleder og derefter kigge på dine albummer i samlingsrækkefølge. Se afsnittet <link linkend="using-tdeApp-myalbumsview">Mine albummer</link> for mere information om albumsamlinger. </para>
 
-        <para>Når du har indstillet mappen for albumbiblioteket kan du indstille &digikam; til at virke med dit digitalkamera. Lær dig derefter hvordan man bruger <link linkend="using-kapp-myalbumsview">Mine albummer</link> og <link linkend="using-kapp-mytagsview">Mine mærker</link> til at arrangere dine fotografialbummer. </para> 
+        <para>Når du har indstillet mappen for albumbiblioteket kan du indstille &digikam; til at virke med dit digitalkamera. Lær dig derefter hvordan man bruger <link linkend="using-tdeApp-myalbumsview">Mine albummer</link> og <link linkend="using-tdeApp-mytagsview">Mine mærker</link> til at arrangere dine fotografialbummer. </para> 
         </sect2> 
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Billedfilformater som understøttes</title>
 
         <sect2>
@@ -208,7 +208,7 @@
 
             <sect3>
             <title>PNG</title>
-                <para>PNG er et billedformat som blev udviklet som en erstatning for et antal ældre billedfilformater som var bredt brugt  i 1990'erne. Det er et tabsfrit format ligesom TIFF, men det er meget kompaktere og sparer diskplads. Selvom det ikke er sandsynligt at dit kamera understøtter PNG, synes visse om at konvertere deres fotografier til PNG så snart de har overført dem til maskinen. I modsætning til JPEG, taber PNG-billeder ikke kvalitet hver gang du koder dem efter ændringer. &digikam; understøtter PNG-billeder fuldstændigt, og pluginnet for baggrundsbehandling af billeder kan konvertere et sæt billeder fra et hvilket som helst format som understøttes til PNG i et skridt. Se afsnittet <link linkend="using-kapp-setup">Indstilling</link> for information om hvordan plugin bruges i &digikam;. </para>
+                <para>PNG er et billedformat som blev udviklet som en erstatning for et antal ældre billedfilformater som var bredt brugt  i 1990'erne. Det er et tabsfrit format ligesom TIFF, men det er meget kompaktere og sparer diskplads. Selvom det ikke er sandsynligt at dit kamera understøtter PNG, synes visse om at konvertere deres fotografier til PNG så snart de har overført dem til maskinen. I modsætning til JPEG, taber PNG-billeder ikke kvalitet hver gang du koder dem efter ændringer. &digikam; understøtter PNG-billeder fuldstændigt, og pluginnet for baggrundsbehandling af billeder kan konvertere et sæt billeder fra et hvilket som helst format som understøttes til PNG i et skridt. Se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link> for information om hvordan plugin bruges i &digikam;. </para>
     
                 <para>PNG er et udvideligt filformat for tabsfri, flytbar, velkomprimeret opbevaring af rasterbilleder. PNG sørger for en patentfri erstatning af &GIF; og kan også erstatte meget andet brug af TIFF. PNG er beregnet til at virke godt i direkte visningsprogrammer, såsom internettet, så det er fuldstændigt strømningsbart med mulighed for progressiv visning. Desuden kan PNG gemme gamma og kromaticitetsdata på heterogene platforme. PNG understøtter dybderne 8- og 16 bit pr farve og billedpunkt. Det er et perfekt filformat at arkivere fotografier med. For mere information om PNG-formatet se <ulink url="http://www.libpng.org/pub/png/">PNG hjemmesiden</ulink>. </para>
             
@@ -219,7 +219,7 @@
                 
                 <para>Nogle, typisk dyrere, kameraer lader dig gemme billeder i et ubehandlet format (RAW). Et ubehandlet format følger egentlig ikke nogen billedstandard i det hele taget. Det er forskelligt for hvert kameramærke. Billeder i ubehandlet format indeholder al data som kommer direkte fra kameraets billedsensor inden programmellet i kameraet udfører behandling såsom hvidbalance, skærpning, &etc;. Ved at opbevare fotografier i kameraets ubehandlede format kan du ændre indstillinger såsom hvidbalancen efter fotografiet er taget. De fleste professionelle fotografer bruger ubehandlet format eftersom det giver dem maksimal fleksibilitet. Bagdelen er at filer i ubehandlet format kan være virkelig meget store. </para>
                 
-                <para>Hvis du vil lære dig mere om ubehandlede billedformater, så besøg guiderne <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">Luminous Landscape</ulink> og <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>, som kan være til stor hjælp. Du kan konvertere billeder med ubehandlet format til JPEG eller TIFF i &digikam;, med pluginnet for konvertering af ubehandlede billeder. Se afsnittet <link linkend="using-kapp-setup">Indstilling</link> for information om hvordan plugin bruges i &digikam;. </para>
+                <para>Hvis du vil lære dig mere om ubehandlede billedformater, så besøg guiderne <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">Luminous Landscape</ulink> og <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>, som kan være til stor hjælp. Du kan konvertere billeder med ubehandlet format til JPEG eller TIFF i &digikam;, med pluginnet for konvertering af ubehandlede billeder. Se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link> for information om hvordan plugin bruges i &digikam;. </para>
 
                 <para>&digikam; understøtter kun indlæsning af ubehandlede billeder med understøttelse af programmet <ulink url="http://www.cybercom.net/~dcoffin/dcraw/">DCRAW</ulink> som er inkluderet i &digikam;s kerne og understøtter over 200 RAW filformater. Se nedenfor en kort liste af de hovedsagelige kamera ubehandlede filer som er understøttet af &digikam;: <informaltable><tgroup cols="2">
         
@@ -293,13 +293,13 @@
 
         <para>Denne afhængighed af andre biblioteker betyder at det ikke er muligt at give en definitiv liste over alle formater som er tilgængelige på dit system. I det mindste vil JPEG, PNG og TIFF være tilgængelige. </para>
 
-        <para>&digikam; viser kun filer som har formater som det kan forstå. Det gøres ved at kigge på filernes filendelser og kontrollere dem mod en fordefineret liste. Hvis filendelsen findes i listen, viser &digikam; filen i billedvisningen. Du kan ændre listen med filendelser som &digikam; accepterer. Se afsnittet <link linkend="using-kapp-setup">Indstilling</link> for mere detaljeret information. </para>
+        <para>&digikam; viser kun filer som har formater som det kan forstå. Det gøres ved at kigge på filernes filendelser og kontrollere dem mod en fordefineret liste. Hvis filendelsen findes i listen, viser &digikam; filen i billedvisningen. Du kan ændre listen med filendelser som &digikam; accepterer. Se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link> for mere detaljeret information. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Plugin som understøttes</title>
 
         <para>En af de bedste ting ved &digikam; er hvor enkelt dets funktion kan udvides ved at bruge plugin. To arkitekturer for plugin er tilgængelige: <itemizedlist>
@@ -320,7 +320,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camerasupport">
+    <sect1 id="using-tdeApp-camerasupport">
     <title>Digitale stillbilledkameraer som understøttes</title>
     <anchor id="digitalstillcamera.anchor"/>
         
@@ -389,14 +389,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Brug af &digikam;</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>Hovedvinduet i &digikam;</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Introduktion til hovedvinduet</title>
 
             <para>
@@ -404,7 +404,7 @@
               </inlinemediaobject>
             </para>
 
-            <para>&digikam;s hovedvindue har fire områder. Det første er en sidebjælke i venstremarginen som lader dig skifte mellem fire visninger: <guibutton>Mine albummer</guibutton>, <guibutton>Mine datoer</guibutton>, <guibutton>Mine mærker</guibutton> og <guibutton>Mine søgninger</guibutton>. Derefter er der et træområde som viser den valgte visning. Hovedbilledvinduet er lige i midten, og til højre vises yderligere en <link linkend="using-kapp-sidebar">sidebjælke</link>. Den kan bruges til at vise al information om dine billeder. Du kan bruge disse visninger til at organisere og finde dine fotografier. </para>
+            <para>&digikam;s hovedvindue har fire områder. Det første er en sidebjælke i venstremarginen som lader dig skifte mellem fire visninger: <guibutton>Mine albummer</guibutton>, <guibutton>Mine datoer</guibutton>, <guibutton>Mine mærker</guibutton> og <guibutton>Mine søgninger</guibutton>. Derefter er der et træområde som viser den valgte visning. Hovedbilledvinduet er lige i midten, og til højre vises yderligere en <link linkend="using-tdeApp-sidebar">sidebjælke</link>. Den kan bruges til at vise al information om dine billeder. Du kan bruge disse visninger til at organisere og finde dine fotografier. </para>
 
             <para>Øverst langs hele vinduet er der en menulinje og under den er værktøjslinjen. </para>
             
@@ -445,28 +445,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>Visningen "Mine albummer"</title>
 
             <para>Træet "Mine albummer" sørger for en organiseret visning af dit fotografialbum. Alle fotografier som håndteres af &digikam; opbevares i en enkelt mappegren. Albummer kan sorteres efter deres mappelayout på harddisken, efter samlingsnavnet som er indstillet under albumegenskaber eller efter albummets dato (datoen kan også ændres under egenskaberne for hvert album). </para>
             
             <para>Du kan skifte mellem disse rækkefølger ved at bruge <guimenuitem>Sortér albummer</guimenuitem> fra menuen <guimenu>Vis</guimenu>. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Opret et nyt album</title>
                 
                 <para>Der er et antal måder at oprette et nyt album. Du kan oprette et nyt album når du indlæser nye fotografier fra kameraet med kameraværktøjet. Du kan også oprette et nyt tomt album ved at klikke på knappen <menuchoice><guimenu>Vis</guimenu></menuchoice> i værktøjslinjen. Som et yderligere alternativ, kan du oprette et nyt album ved at importere en eksisterende mappe med fotografier fra din computer, ved at bruge <menuchoice><guimenu>Album</guimenu> <guimenuitem>Importér</guimenuitem> <guimenuitem>Importér mapper</guimenuitem></menuchoice> og vælge mappen som du vil importere. Et album oprettes med samme navn som mappen på harddisken. Du kan bruge træk og slip til at importere en mappe. Træk en mappeikon, for eksempel fra et &konqueror;-vindue, og slip den på albumlisten til venstre. En menu vises så, som giver dig mulighed for at flytte eller kopiere mappen til &digikam;. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Slet et album</title>
                 
                 <para>Når du sletter et album fra &digikam; flyttes det til &kde;'s affaldsspand. Alternativt kan du ændre denne opførsel, så sletning virkelig sletter et  album og alle fotografier i det. Dette kan ændres ved at vælge <menuchoice><guimenu>Opsætning</guimenu> <guimenuitem>Indstil &digikam;</guimenuitem></menuchoice> og vælge siden Diverse. Længst oppe på siden findes indstillingerne som bestemmer hvad der sker når et fotografi slettes. For at slette et album højreklikkes på det i træet "Mine albummer" og så vælges Slet album i den sammenhængsafhængige menu. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Tilføj et fotografi til et album</title>
                 
                 <para>For det meste laver du nye albummer og fylder dem op med fotografier direkte fra kameraet med kameraværktøjet. Af og til vil du dog alligevel tilføje et fotografi som du allerede har på maskinen i et eksisterende album. For at tilføje et fotografi til et album, skal du sørge for at albummet er markeret. Klik derefter enten på ikonen <guilabel>Tilføj billeder</guilabel> i værktøjslinjen eller vælg <menuchoice><guimenu>Album</guimenu> <guimenuitem>Importér</guimenuitem> <guimenuitem>Tilføj billeder</guimenuitem></menuchoice> i menulinjen. Vælg fotografierne du vil tilføje i fildialogen og klik  på <guilabel>Åbn</guilabel>. Fotografierne kopieres så til albummet. Alternativt kan du bruge træk og slip til at importere fotografier. Træk fotografiernas ikoner, for eksempel fra et &konqueror;-vindue, og slip dem på billedlisten til højre. </para>
@@ -475,14 +475,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Flytte eller kopiere fotografier mellem album</title>
                 
                 <para>or at flytte eller kopiere et fotografi fra et album til et andet, dra helt enkelt fotografiet og slæpp det på målalbummet. En menu vises som giver dig valgmulighederne at <guilabel>Flytta</guilabel> eller <guilabel>Kopiér</guilabel> fotografiet. Du kan flytte eller kopiere flere fotografier på samme sætt. Markera kun alle fotografier du vil flytte og dra dem til målalbummet. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Håndtering af albummer</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -512,7 +512,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Indstil albumikon</title>
                 
                 <para>Når du kigger på et album første gang vælger &digikam; det første fotografi i albummet som ikon til at vise i listen "Mine albummer". Det hjælper dig med at huske hvilken slags fotografier der findes i et album. Sommetider er det første fotografi i albummet ikke det mest repræsentative og du vil måske vælge et andet som albumikon. </para> 
@@ -521,7 +521,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Noter om albumsamlinger</title>
                 
                 <para>Et album kan kun være i én albumsamling, og albumsamlinger kan ikke indgå i et hierarki. </para>
@@ -532,7 +532,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Billedvisning</title>
 
             <sect3>
@@ -548,7 +548,7 @@
             
                 <para>Information om hvert fotografi vises under miniaturebilledet. Du kan bestemme hvilken information som vises i dialogen <menuchoice><guimenu>Opsætning</guimenu> <guimenuitem>Indstil &digikam;</guimenuitem></menuchoice>. Vælg siden Album og kig efter <guilabel>Ekstra information i miniaturebilleder</guilabel>. </para> 
 
-                <para>Miniaturebillederne har værktøjsvink som dukker op hvis du holder musen stille over et miniaturebillede et øjeblik. Værktøjsvinket viser fotografiets vigtigste egenskaber inklusive eventuelle mærker du har tilføjet. Skærmbilledet længst oppe i afsnittet <link linkend="using-kapp-mainwindow-intro">Introduktion til hovedvinduet</link> indeholder et værktøjsvink som vises. </para>
+                <para>Miniaturebillederne har værktøjsvink som dukker op hvis du holder musen stille over et miniaturebillede et øjeblik. Værktøjsvinket viser fotografiets vigtigste egenskaber inklusive eventuelle mærker du har tilføjet. Skærmbilledet længst oppe i afsnittet <link linkend="using-tdeApp-mainwindow-intro">Introduktion til hovedvinduet</link> indeholder et værktøjsvink som vises. </para>
 
             </sect3>
 
@@ -559,14 +559,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Vis et fotografi</title>
              
-                <para>Du kan åbne billededitoren for et fotografi ved enten at dobbeltklikke på miniaturebilledet eller ved at højreklikke og vælge <guilabel>Vis/Redigér</guilabel> i den sammenhængsafhængige menu. Se afsnittet <link linkend="using-kapp-imageeditor">&digikam;s billededitor</link> for instruktioner om hvordan du kan redigere dine fotografier. </para>
+                <para>Du kan åbne billededitoren for et fotografi ved enten at dobbeltklikke på miniaturebilledet eller ved at højreklikke og vælge <guilabel>Vis/Redigér</guilabel> i den sammenhængsafhængige menu. Se afsnittet <link linkend="using-tdeApp-imageeditor">&digikam;s billededitor</link> for instruktioner om hvordan du kan redigere dine fotografier. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Vis eller redigér et fotografi med et andet program</title>
 
                 <para>Sommetider sørger &digikam; måske ikke for alle de muligheder som du behøver. Du kan åbne et fotografi i et andet program ved at højreklikke på det og vælge det i undermenuen <guilabel>Åbn med</guilabel>. Listen over programmer som vises i menuen bestemmes af &kde;'s sædvanlige filtilknytninger for fotografiets billedformat. Kig i &kde;'s håndbog for instruktioner om hvordan man ændrer filtilknytninger hvis programmet du behøver ikke angives. </para>
@@ -575,7 +575,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Rotér et fotografi</title>
              
                 <note><para>Du skal have installeret KIPI-pluginnet Tabsfri JPEG for rotationsfunktionerne. Hvis du ikke har dette plugin installeret, kan du stadigvæk rotere dine fotografier, men du skal gøre det inde i billededitoren. Billededitoren bruger en anden måde at rotere et billede. Du mærker måske ikke  nogen forskel, men billededitorens metode kan forårsage et vist kvalitetstab i fotografiet. Rotationsmetoderne som beskrives her bruger KIPI-pluginnet Tabsfri JPEG og forårsager intet kvalitetstab fra originalfotografiet. </para></note>
@@ -588,14 +588,14 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Omdøb et fotografi</title>
              
                 <para>Du kan ændre et fotografis filnavn ved at højreklikke på miniaturebilledet og vælge <guilabel>Omdøb</guilabel>. Husk at beholde filendelsen (.jpg, .tif, &etc;.). </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Slet et fotografi</title>
              
                 <para>Når du sletter et fotografi fra &digikam; flyttes det til &kde;'s affaldsspand. Hvis du foretrækker at fotografiet virkelig fjernes fuldstændigt, kan du indstille dette tilvalg  ved at vælge <menuchoice><guimenu>Opsætning</guimenu> <guimenuitem>Instil &digikam;</guimenuitem></menuchoice> og vælge siden <guilabel>Diverse</guilabel>. Længst oppe på siden er de indstillinger som bestemmer hvad som hænder når et fotografi fjernes. </para>
@@ -606,7 +606,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
           <title>Visningen "Mine mærker"</title>
 
             <para>Mærkning af fotografier giver en fleksibel måde at organisere og katalogisere dine fotografier. Mærker er etiketter som kan angives for individuelle fotografier. Når et fotografi er mærket, kan fotografiet findes igen ved at klikke på mærket. </para>
@@ -621,7 +621,7 @@
 
             <para>Når du vælger et mærke i træet som indeholder andre undermærker, viser &digikam; normalt ikke fotografier som er mærkede med undermærkerne. Du kan ændre denne opførsel hvis du foretrækker at alle fotografier som er markerede med et undermærke til det nuværende mærke skal vises. For at indstille dette, åbn <menuchoice><guimenu>Opsætning</guimenu> <guimenuitem>Indstil &digikam;</guimenuitem></menuchoice> i hovedmenulinjen, vælg siden <guilabel>Album</guilabel> og vælg derefter <guilabel>Vis punkter i undermærker</guilabel>. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
                 <title>Håndtering af mærker</title>
              
                 <para>Du kan tilføje nye mærker ved enten at højreklikke på feltet "Mine mærker" eller på et eksisterende mærke, og vælge <guilabel>Nyt mærke</guilabel>. Hvis du tilføjer et nyt mærke ved at højreklikke på et eksisterende mærke, laves det nye mærke som et undermærke. </para>
@@ -636,7 +636,7 @@
                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
                <title>Giv fotografier mærker</title>
              
                 <para>Inden du kan få ud så meget som muligt ud af &digikam;s mærkefunktion skal du først markere dine fotografier med mærker. Der er to måder at mærke fotografier. Når du har identificeret fotografierne du vil mærke, kan du enten trække og slippe dem på mærket i træet "Mine mærker" eller, ved at højreklikke på de markerede fotografier i billedvinduet, kan du bruge menuen <guilabel>Tilknyt mærke</guilabel> for at vælge de mærker du vil bruge. </para>
@@ -655,7 +655,7 @@
                                 
         </sect2>
         
-        <sect2 id="using-kapp-mydatesview">
+        <sect2 id="using-tdeApp-mydatesview">
             <title>"Datovisning" i hovedvinduet</title>
 
             <para><inlinemediaobject><imageobject><imagedata fileref="maininterfacedateview.png" format="PNG"/> </imageobject>
@@ -668,7 +668,7 @@
             
         </sect2>
           
-        <sect2 id="using-kapp-mysearchesview">
+        <sect2 id="using-tdeApp-mysearchesview">
         <title>Visningen "Mine søgninger"</title>
 
             <sect3>
@@ -687,7 +687,7 @@
                 
                 <para>Når du er tilfreds med dit valg, klikkes på knappen <guilabel>O.k.</guilabel> så udføres søgningen, og resultatet vises i visningen "Mine søgninger" i hovedvinduet. Tekstfeltet <guilabel>Gem søgning som</guilabel> bruges for at navnge din spørge i listen "Mine søgninger". Hvis du vil ændre valet efter en søgning har utforts, højreklikke helt enkelt på et objekt i visningen "Mine søgninger" og vælg et alternativ i den sammenhængsafhængig menuen. </para>
                 
-                <para>Hvis du vælger <guilabel>Redigér søgning</guilabel>, så vises søgeformularenigen med din tidligere søgeinformation. Hvis du vælger <guilabel>Redigér som avanceret søgning</guilabel>, startes dialogen med værktøjet for avanceret søgning for at ændre dine tidligere søgeinformation med flere søgeregler. Se afsnittet <link linkend="using-kapp-mainwindow-advancedsearchtool"> Værktøjet for avanceret søgning</link> for mere information. </para>
+                <para>Hvis du vælger <guilabel>Redigér søgning</guilabel>, så vises søgeformularenigen med din tidligere søgeinformation. Hvis du vælger <guilabel>Redigér som avanceret søgning</guilabel>, startes dialogen med værktøjet for avanceret søgning for at ændre dine tidligere søgeinformation med flere søgeregler. Se afsnittet <link linkend="using-tdeApp-mainwindow-advancedsearchtool"> Værktøjet for avanceret søgning</link> for mere information. </para>
                 
                 <para>Hvis du vil fjerne en eksisterende søgning fra listen, så vælg blot <guilabel>Slet søgning</guilabel> i den sammenhængsafhængige menu. </para>
     
@@ -698,7 +698,7 @@
 
             </sect3>            
             
-            <sect3 id="using-kapp-mainwindow-advancedsearchtool">
+            <sect3 id="using-tdeApp-mainwindow-advancedsearchtool">
             <title>Værktøjet for avanceret søgning</title>
             <anchor id="advancedsearchtool.anchor"/>
             
@@ -761,32 +761,32 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-sidebar">
+    <sect1 id="using-tdeApp-sidebar">
     <title>&digikam;s sidebjælke</title>
     <anchor id="sidebar.anchor"/>
     
         <sect2>
         <title>Introduktion til højre sidebjælke</title>
-           <para>Hovedvinduet i &digikam; indeholder en sidebjælke ved højrekanten som sørger for vigtig information og handlinger for de markerede billeder. Samme sidebjælke er også tilgængelig i <link linkend="using-kapp-imageeditor">billededitorens visning</link>, uden pilene for første, foregående, næste og sidste billede. Den kan vises ved at klikke på en af de fem faneblade: </para>
+           <para>Hovedvinduet i &digikam; indeholder en sidebjælke ved højrekanten som sørger for vigtig information og handlinger for de markerede billeder. Samme sidebjælke er også tilgængelig i <link linkend="using-tdeApp-imageeditor">billededitorens visning</link>, uden pilene for første, foregående, næste og sidste billede. Den kan vises ved at klikke på en af de fem faneblade: </para>
 
            <para>
             <itemizedlist>
             
-                <listitem><para><link linkend="using-kapp-sidebarfileproperties">Egenskaber</link>: Fil- og billedegenskaber, vigtigere fotografiparametre (EXIF-data)</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarfileproperties">Egenskaber</link>: Fil- og billedegenskaber, vigtigere fotografiparametre (EXIF-data)</para></listitem>
 
-                <listitem><para><link linkend="using-kapp-sidebarmetadata">Metadata</link>: EXIF, Makernotes, IPTC og GPS-data</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarmetadata">Metadata</link>: EXIF, Makernotes, IPTC og GPS-data</para></listitem>
                    
-                <listitem><para><link linkend="using-kapp-sidebarcolors">Farver</link> : Histogram og indlejrede ICC-profiler</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcolors">Farver</link> : Histogram og indlejrede ICC-profiler</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebarcommentstags">Kommentarer og mærker</link>: Kommentarer, dato- og tidsindstillinger, scoring, mærker</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcommentstags">Kommentarer og mærker</link>: Kommentarer, dato- og tidsindstillinger, scoring, mærker</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebartagfilters">Etiketfilter</link>: Etiketfilter som bruges for udvalget i hovedvinduet</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebartagfilters">Etiketfilter</link>: Etiketfilter som bruges for udvalget i hovedvinduet</para></listitem>
             
             </itemizedlist>
 Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes sammen langs kanten. </para>
         </sect2>
 
-        <sect2 id="using-kapp-sidebarfileproperties">
+        <sect2 id="using-tdeApp-sidebarfileproperties">
         <title>Egenskaber</title>
            <para>Sidebjælken med egenskaber viser den vigtigste information om det markerede billede som stort set er selvforklarende. Den er grupperet i følgende afsnit: <itemizedlist>
 
@@ -805,7 +805,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
            </para>
         </sect2>
 
-        <sect2 id="using-kapp-sidebarmetadata">
+        <sect2 id="using-tdeApp-sidebarmetadata">
         <title>Metadata-faneblade</title>
 
            <para>Sidebjælken Metadata består af fire delfaneblade <guilabel>EXIF, Makernotes, IPTC og GPS-data</guilabel>. Til venstre lader to knapper dig vælge mellem en fuldstændig eller forenklet datavisning. Ved siden af den er der en udskrifts- og kopieringsknap. De udfører netop det: udskrift (med dialogen &kprinter;) eller kopiering af de respektive fanebaldes data til klippebordet. I hovedvinduets visning ser du et sæt navigationsknapper med filnavnet ovenfor fanebladene. </para>
@@ -813,7 +813,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
            <para><inlinemediaobject><imageobject><imagedata fileref="sidebarmetadata.png" format="PNG"/> </imageobject><textobject><phrase>Metadata-faneblade</phrase></textobject></inlinemediaobject>
            </para>
 
-           <sect3 id="using-kapp-sidebarmetadataexif">
+           <sect3 id="using-tdeApp-sidebarmetadataexif">
            <title>EXIF-data</title>
 
                 <anchor id="kexif.anchor"/>
@@ -855,7 +855,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
            </sect3>
 
-           <sect3 id="using-kapp-sidebarmetadatamakernote">
+           <sect3 id="using-tdeApp-sidebarmetadatamakernote">
            <title>Fremstillermærker</title>
 
                 <sect4>
@@ -877,7 +877,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
            </sect3>
 
-           <sect3 id="using-kapp-sidebarmetadataiptc">
+           <sect3 id="using-tdeApp-sidebarmetadataiptc">
            <title>IPTC-mærker</title>
 
                 <sect4>
@@ -903,7 +903,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
            </sect3>
 
-           <sect3 id="using-kapp-sidebarmetadatagps">
+           <sect3 id="using-tdeApp-sidebarmetadatagps">
            <title>GPS-fanebladet under metadata</title>
 
                 <sect4>
@@ -911,7 +911,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
                     <para>Det <ulink url="http://en.wikipedia.org/wiki/Global_Positioning_System">globale positioneringssystem</ulink>, sædvanligvis kaldet GPS, er det eneste fuldt funktionsdygtige satelitnavigationssystem. En samling af mere end to dusin GPS-sateliter udsender nøjagtige tidssignaler via radio, hvilket gør det muligt for hver GPS-modtager at bestemme sin position hvor som helst på jorden (længdegrad, breddegrad og højde). GPS sørger også for en yderst præcis tidsreference og bestemmer hastighed med meget høj nøjagtighed. </para>
                     
-                    <para>GPS-information kan opbevares direkte i billeder af kameraet, eller i synkroniseringsfiler med en ekstern GPS-enhed. Kig i <link linkend="using-kapp-gps">følgende afsnit</link> for mere information. </para>
+                    <para>GPS-information kan opbevares direkte i billeder af kameraet, eller i synkroniseringsfiler med en ekstern GPS-enhed. Kig i <link linkend="using-tdeApp-gps">følgende afsnit</link> for mere information. </para>
                    
                 </sect4>
 
@@ -931,18 +931,18 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
            </sect3>
 
         </sect2>
-        <sect2 id="using-kapp-sidebarcolors">
+        <sect2 id="using-tdeApp-sidebarcolors">
         <title>Farver</title>
-           <para>Sidebjælken med farver har de to delfaneblade <guilabel>Histogram og ICC-profil</guilabel>. Her er de mere detaljeret information om <link linkend="using-kapp-iccprofile">farvehåndtering</link>. </para>
+           <para>Sidebjælken med farver har de to delfaneblade <guilabel>Histogram og ICC-profil</guilabel>. Her er de mere detaljeret information om <link linkend="using-tdeApp-iccprofile">farvehåndtering</link>. </para>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogramvisning</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Et histogram for et billede viser mængden af hver farve som findes og deres forskellige amplituder i billedet. Hvis fotografiet har en farveforvrængning kan du måske se hvad fejlen er ved at kigge på histogrammet. </para>
             
-                <para>Histogramvisningen angiver information om den statistiske fordeling af farveværdier i nuværende billede. Den er rent informativ, ingenting du gør med den forårsager ændringer i billedet. Hvis du vil udføre histogrambaseret farvekorrektion, bruges billededitorens plugin Niveaujustering eller Kurvejustering. Disse plugin er en del af <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projektet DigikamImagePlugins</ulink>. For mere information om at bruge plugin i &digikam;, se afsnittet <link linkend="using-kapp-setup">Indstilling</link>. </para>
+                <para>Histogramvisningen angiver information om den statistiske fordeling af farveværdier i nuværende billede. Den er rent informativ, ingenting du gør med den forårsager ændringer i billedet. Hvis du vil udføre histogrambaseret farvekorrektion, bruges billededitorens plugin Niveaujustering eller Kurvejustering. Disse plugin er en del af <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projektet DigikamImagePlugins</ulink>. For mere information om at bruge plugin i &digikam;, se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link>. </para>
                                                 
                 <example>   <title>Histogramvisningen i gang</title>
                     <screenshot><screeninfo>Histogramvisningen i gang</screeninfo><mediaobject><imageobject><imagedata fileref="sidebarcolorshistogramviewer.png" format="PNG"/> </imageobject></mediaobject></screenshot>
@@ -982,7 +982,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Hvordan man bruger et histogram</title>
                 
                 <para>Et histogram er en grafisk måde at evaluere nøjagtigheden af et billede som vises på skærmen. Grafen repræsenterer fotografiets tre områder af lysstyrke: <itemizedlist> <listitem><para>  (1): skyggetonerne til venstre. </para></listitem> <listitem><para> (2): mellemtonerne i midten. </para></listitem> <listitem><para> (3): de fremhævede toner til højre. </para></listitem> </itemizedlist> <example> <title>Et billedhistogram i tilstanden Alle farver </title> <screenshot><screeninfo>Et billedhistogram i tilstanden Alle farver</screeninfo><mediaobject><imageobject><imagedata fileref="editorhistogramdescription.png" format="PNG"/> </imageobject></mediaobject></screenshot> </example> Grafens fordeling, hvor toppene og bulerne er samlede, angiver om billedet er for mørkt, for lyst eller velafbalanceret. </para>
@@ -995,13 +995,13 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
                 <para>Vigtigt: Alle fotografier behøver ikke at vise denne udbuling i den centrale del af histogrammet. Det afhænger meget af fotografiets motiv. I visse tilfælde kan det være passende at histogrammet viser en top i den ene eller anden ende, eller begge. </para>
                         
-                <para>Histogrammet er en tilforladelig måde at afgøre om et fotografi er rigtigt eksponeret eller ej. Skulle histogrammet vise en over- eller undereksponering, skal et <link linkend="using-kapp-correctingexposure">værktøj til at korrigere eksponering</link> bruges for at ordne fotografiet. </para>
+                <para>Histogrammet er en tilforladelig måde at afgøre om et fotografi er rigtigt eksponeret eller ej. Skulle histogrammet vise en over- eller undereksponering, skal et <link linkend="using-tdeApp-correctingexposure">værktøj til at korrigere eksponering</link> bruges for at ordne fotografiet. </para>
                 
             </sect3>
  
         </sect2>
 
-        <sect2 id="using-kapp-sidebarcommentstags">
+        <sect2 id="using-tdeApp-sidebarcommentstags">
         <title>Kommentarer og mærker</title>
            <para>Denne sidebjælke tjener til at ændre og redigere billedattributter såsom kommentarer, scoring, dato og mærker. Attributterne opbevares i den tilhørende database i IPTC- og EXIF-datafelterne og bliver en del af billedet. Der er adgang til alle attributter i en sidebjælkevisning som vises på skærmaftrykket nedenfor. Når billedet læses er prioritetsrækkefølgen a) databasen, b) IPTC, og c) EXIF. Hvis der er forskel mellem nogen af de tre, gælder prioriteringen og en synkronisering udføres. Sidebjælken har et navigationsfelt længst oppe med pile for første, foregående, næste og sidste hvis den vises i hovedprogrammet. </para>
 
@@ -1065,14 +1065,14 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
            <para>Kombinationsfeltet længst nede er yderligere en ergonomisk funktion for nemt at give en serie billeder et mærke. Når du tilføjer forskellige mærker bliver de husket i dette felt for hurtigt at kunne få adgang til dem. </para>
 
            <para>Ellers tilføjes mærker helt enkelt ved at markere de respektive felter i træet. Alle mærker for et billede overføres til IPTC-datafeltet 'nøgleord'. </para>
-           <note><para>Hvis du har markeret et antal billeder i hovedvisningen og markerer et mærke i træet med mærker, tilføjes dette kun for det fremhævede billede, og ikke for hele udvalget. Hvis du vil tilføje mærker for de markerede billeder, se afsnittet <link linkend="using-kapp-sidebartagfilters">Mærkefilter</link>. </para></note>
+           <note><para>Hvis du har markeret et antal billeder i hovedvisningen og markerer et mærke i træet med mærker, tilføjes dette kun for det fremhævede billede, og ikke for hele udvalget. Hvis du vil tilføje mærker for de markerede billeder, se afsnittet <link linkend="using-tdeApp-sidebartagfilters">Mærkefilter</link>. </para></note>
 
           </sect3>
 
         </sect2>
 
 
-        <sect2 id="using-kapp-sidebartagfilters">
+        <sect2 id="using-tdeApp-sidebartagfilters">
         <title>Mærkefiltre</title>
            <para>Sidebjælken mærkefilter bruges til at ændre mængden af billeder som vises i hovedvinduets visning. Normalt bruger man venstre sidebjælke med dets album-, dato-. mærke-, og søgevisning. Hvis desuden en eller flere mærker er markerede i den højre sidebjælke med mærkefilter, vises kun tværsnittet af de to udvalg. Alle mærker som laves er tilgængelige. </para>
            <para>Antag for eksempel at du har et mærke som hedder 'offentlig' som bruges til alle billeder undtagen dine private. Så kan du markere mærket 'offentlig' i den højre sidebjælke for at skjule private billeder (alle de som ikke har mærket 'offentlige'). Hvilken visningstilstand du end vælger i venstre sidebjælke, så vises kun 'offentlige' billeder. Et andet typisk eksempel er at vælge en delmængde af mærker i et hierarkisk træ. Antag at du vil vis 'rød' og 'grøn' fra et mærketræ som indeholder syv forskellige farver som delmærker. Klik blot på mærket 'farve' i hovedvisningen og markér 'rød' og 'grøn' i højre sidebjælke. </para>
@@ -1088,16 +1088,16 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
     </sect1>
     
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>At bruge et digitalkamera med &digikam;</title>
     <anchor id="camerainterface.anchor"/>
 
         <sect2>
         <title>Indledning til kameragrænsefladen</title>
 
-            <para>Kameraværktøjet lader dig hente dine fotografier direkte fra kameraet til et album i &digikam;. Du kan få adgang til kameraværktøjet ved at klikke på menuen Kamera og vælge i listen over indstillede kameraer. Se afsnittet <link linkend="setupcamera">Indstil kamera</link> i håndbogen for instruktioner om hvordan du indstiller &digikam; til at virke med dit kamera. Hvis du vil have mere information om hvordan &digikam; understøtter digitalkameraer, så kig i <link linkend="using-kapp-camerasupport">dette afsnit</link>. </para>
+            <para>Kameraværktøjet lader dig hente dine fotografier direkte fra kameraet til et album i &digikam;. Du kan få adgang til kameraværktøjet ved at klikke på menuen Kamera og vælge i listen over indstillede kameraer. Se afsnittet <link linkend="setupcamera">Indstil kamera</link> i håndbogen for instruktioner om hvordan du indstiller &digikam; til at virke med dit kamera. Hvis du vil have mere information om hvordan &digikam; understøtter digitalkameraer, så kig i <link linkend="using-tdeApp-camerasupport">dette afsnit</link>. </para>
 
-            <para>Kameragrænsefladen er ikke den eneste måde at tilføje dine fotografier til &digikam;. Se afsnittet <link linkend="using-kapp-addphototoalbum">Tilføj et fotografi i et album</link> for en beskrivelse af hvordan man tilføjer fotografier som allerede findes på harddisken. Men kameragrænsefladen giver masse af avancerede indstillinger til at importere billeder ind i dit albums database. </para>
+            <para>Kameragrænsefladen er ikke den eneste måde at tilføje dine fotografier til &digikam;. Se afsnittet <link linkend="using-tdeApp-addphototoalbum">Tilføj et fotografi i et album</link> for en beskrivelse af hvordan man tilføjer fotografier som allerede findes på harddisken. Men kameragrænsefladen giver masse af avancerede indstillinger til at importere billeder ind i dit albums database. </para>
             
             <para>For at kunne bruge dit digitalkamera med &digikam; skal du forbinde kameraet til maskinen, skifte  kameraet til billedvisningstilstand og slå det til. Du finder en nærmere beskrivelse i manualen som hører til kameraet. </para>
         
@@ -1120,7 +1120,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
             <para>Fanebladet Egenskaber viser information om filegenskaber som bruges internt af kameraet til at opbevare punkter, og en sammenfatning af information om fotografiet for at beskrive hvordan billedet er taget med kameraet. Et flag angiver også om billedet ikke er overført til computeren. Bemærk at ikke al denne information måske er tilgængelig for visse digitalkameraer. </para>            
             
-            <para>Fanebladet Metadata viser interne metadata i billeder såsom EXIF, Makernotes, GPS, osv. Denne information er det samme som <link linkend="using-kapp-sidebarmetadata">sidebjælkens metadata</link> i &digikam;s hovedgrænseflade eller i billededitoren. Bemærk at ikke al denne information måske er tilgængelig for visse digitalkameraer. </para>            
+            <para>Fanebladet Metadata viser interne metadata i billeder såsom EXIF, Makernotes, GPS, osv. Denne information er det samme som <link linkend="using-tdeApp-sidebarmetadata">sidebjælkens metadata</link> i &digikam;s hovedgrænseflade eller i billededitoren. Bemærk at ikke al denne information måske er tilgængelig for visse digitalkameraer. </para>            
 
         </sect2>
         
@@ -1139,7 +1139,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
         <title>Vælg en målmappe</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>Ved brug af knapperne <guilabel>Hent alle</guilabel> eller <guilabel>Hent markerete</guilabel> kommer en dialog frem som lader dig vælge et målalbum dine fotografierne skal overføres til. Listen med eksisterende albummer vises, ordnede ifølge mappe (se <link linkend="using-kapp-myalbumsview">Mine albummer</link> for detaljer om at ordne albummer). Du kan vælge et målalbum i listen og derefter klikke på O.k. </para>
+            <para>Ved brug af knapperne <guilabel>Hent alle</guilabel> eller <guilabel>Hent markerete</guilabel> kommer en dialog frem som lader dig vælge et målalbum dine fotografierne skal overføres til. Listen med eksisterende albummer vises, ordnede ifølge mappe (se <link linkend="using-tdeApp-myalbumsview">Mine albummer</link> for detaljer om at ordne albummer). Du kan vælge et målalbum i listen og derefter klikke på O.k. </para>
         
             <example>   <title>Dialogen for valg af målalbum</title>
                 <screenshot><screeninfo>Dialogen for valg af målalbum</screeninfo><mediaobject><imageobject><imagedata fileref="cameratargetalbumdialog.png" format="PNG"/> </imageobject></mediaobject></screenshot> 
@@ -1164,7 +1164,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
         </sect2>
 
-        <sect2 id="using-kapp-cameraclientrenaming">
+        <sect2 id="using-tdeApp-cameraclientrenaming">
         <title>Automatisk navneskift</title>
 
             <para>Kameraer bruger ofte ikke særligt meningsfulde filnavne for fotografier. Filnavnene bruges ofte igen når fotografierne er fjernet fra kameraet. Dette kan forårsage filnavnekonflikter hvis du henter fotografier fra mange optagelser til samme album. Det kan også være nyttigt at inkludere dato og tid da et billede blev taget i filnavnet. </para>
@@ -1199,7 +1199,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
             <sect3>
             <title>Automatisk rotation</title>
 
-                <para>&digikam; kan bruge eventuel information om kameraets orientering da fotografiet blev taget til automatisk at rotere fotografiet når det overføres. Ikke alle kameraer inkluderer denne information. Se afsnittet <link linkend="using-kapp-sidebarmetadata">Sidebjælkens metadata</link> for yderligere detaljer om hvilken information som kameraet kan have tilføjet til dine fotografier. </para>
+                <para>&digikam; kan bruge eventuel information om kameraets orientering da fotografiet blev taget til automatisk at rotere fotografiet når det overføres. Ikke alle kameraer inkluderer denne information. Se afsnittet <link linkend="using-tdeApp-sidebarmetadata">Sidebjælkens metadata</link> for yderligere detaljer om hvilken information som kameraet kan have tilføjet til dine fotografier. </para>
 
                 <example> <title>Tilvalg for handlinger i farten</title>
                     <screenshot><screeninfo>Tilvalg for handlinger i farten</screeninfo><mediaobject><imageobject><imagedata fileref="cameraclientsetting3.png" format="PNG"/> </imageobject></mediaobject></screenshot>
@@ -1212,7 +1212,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
             <sect3>
             <title>Opret automatisk målalbum</title>
 
-                <para>Hvis dit kamera tilføjer information om dato når et fotografi tages, kan &digikam; bruge denne til automatisk at oprette undermapper i målalbummet når det overføres. Undermappernes navne baseres på billedernes dato. Alle billeder som er taget på samme dato overføres til  samme undermappe. Ikke alle kameraer inkluderer denne information. Se afsnittet <link linkend="using-kapp-sidebarmetadata">Sidebjælkens metadata</link> for yderligere detaljer om hvilken information som dit kamera kan have indlejret i dine fotografier. </para>
+                <para>Hvis dit kamera tilføjer information om dato når et fotografi tages, kan &digikam; bruge denne til automatisk at oprette undermapper i målalbummet når det overføres. Undermappernes navne baseres på billedernes dato. Alle billeder som er taget på samme dato overføres til  samme undermappe. Ikke alle kameraer inkluderer denne information. Se afsnittet <link linkend="using-tdeApp-sidebarmetadata">Sidebjælkens metadata</link> for yderligere detaljer om hvilken information som dit kamera kan have indlejret i dine fotografier. </para>
 
                 <example> <title>Tilvalg for at oprette albummer automatiskt</title>
                     <screenshot><screeninfo>Tilvalg for at oprette albummer automatiskt</screeninfo><mediaobject><imageobject><imagedata fileref="cameraclientsetting2.png" format="PNG"/> </imageobject></mediaobject></screenshot>
@@ -1239,7 +1239,7 @@ Ved at klikke gentagne gange på samme faneblad vise sidebjælken eller foldes s
 
         </sect2>
 
-        <sect2 id="using-kapp-gps">
+        <sect2 id="using-tdeApp-gps">
         <title>Hvordan får man fat på &digikam;</title>
             <note><para>
                     <inlinemediaobject>
@@ -1323,7 +1323,7 @@ fi                 </screen></blockquote>
 
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>&digikam;s billededitor</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -1433,13 +1433,13 @@ fi                 </screen></blockquote>
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Justér et fotografi</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Beskær et fotografi</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Manuel beskæring</title>
 
                     <para>At beskære et fotografi er ikke kun en almindelig handling, men også et ofte undervurderet værktøj for fotografen for at komponere et billede. Billededitoren gør dette meget nemt. Træk blot en rektangel henover billedet ved at holde venstre museknap nede og flytte musen for at beskære et billede. Du ser en trådramme som vises mens du flytter musen. </para>
@@ -1455,7 +1455,7 @@ fi                 </screen></blockquote>
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportionel beskæring</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -1523,7 +1523,7 @@ fi                 </screen></blockquote>
                                 
                 </sect4>
             
-                <sect4 id="using-kapp-compositionguides">
+                <sect4 id="using-tdeApp-compositionguides">
                 <title>Kompositionsguide</title>
 
                     <para>Når man først kigger på et billede, stopper betragterens øje sjældent i billedets centrum, men går i stedet fra øverste venstre hjørne mod højre, og derefter ned til venstre og til højre igen. Dette mønster er oftest ubevidst men dette er veldokumenteret. Det hører formodentlig sammen med det vestlige læsemønster. Ud fra fotografens synvinkel, bliver målet nu at lede betragterens blik til motivet, bevidst om den måde som mange opfatter et billede. </para>                                                                                
@@ -1622,7 +1622,7 @@ fi                 </screen></blockquote>
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Ændr størrelse på et fotografi</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -1637,7 +1637,7 @@ fi                 </screen></blockquote>
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Rotér eller flip et fotografi</title>
                 
                 <para>Hvis fotografiet har forkert orientering kan du <guilabel>Flippe</guilabel> eller <guilabel>Rotere</guilabel> det til den orientering du vil have ved at bruge værktøjerne Transformér Flip/Rotér tilgængelige i menuerne <menuchoice><guimenu>Transformér</guimenu> <guimenuitem>Rotér</guimenuitem></menuchoice> og <menuchoice><guimenu>Transformér</guimenu> <guimenuitem>Flip</guimenuitem></menuchoice>. </para>
@@ -1646,7 +1646,7 @@ fi                 </screen></blockquote>
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Ordn røde øjne i et fotografi</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1661,7 +1661,7 @@ fi                 </screen></blockquote>
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Justér skarphed</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1753,7 +1753,7 @@ fi                 </screen></blockquote>
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Korrigér farve</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1802,7 +1802,7 @@ fi                 </screen></blockquote>
             <para>Resultatet af eventuelle justeringer du gør bliver ikke husket førend du gemmer fotografiet. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Korrigér eksponering</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1971,7 +1971,7 @@ fi                 </screen></blockquote>
            <para>Du kan udskrive enkelte billeder eller hele sætaf billeder fra hovedvinduets visning. Hele sider med miniaturebilleder kan skrives ud ifølge din markering. Alt du behøver gøre er at markere billederne på almindelig vis og kalde <menuchoice><guimenu>Album</guimenu><guimenuitem>Eksportér</guimenuitem> <guimenuitem>Udskriftsguide</guimenuitem></menuchoice>. Følg derefter instruktionerne og valgene at gøre. </para>
         </sect2>
         
-        <sect2 id="using-kapp-iccprofile">
+        <sect2 id="using-tdeApp-iccprofile">
             <title>Håndtering af ICC-farveprofiler</title>
             
             <para>Hvorfor er håndteringen af ICC-farveprofiler så vigtig? En enkel forklaring er at det er som hifi stereo, hvor naturtro lyd efterstræbes fra kilde til højtaler, hvor det det passerer mikrofoner, indspilningsmedier, afspillere og forstærker. På stort set samme måde forsøger håndteringen af ICC-profiler at beholde naturtro farver fra det fotograferede motiv via kameraet til visningsmedierne skærm, udskrift, papir og projektor. Heldigvis har digital fotografering fjernet en af kilderne til forstyrrelse, nemlig opbevaringsmediet (ligesom cd-rom'en gjorde på lydsiden). </para>
@@ -2044,7 +2044,7 @@ fi                 </screen></blockquote>
     </sect1>  
 
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>Indstilling af &digikam;</title>
 
         <sect2 id="setupdialog">
@@ -2065,7 +2065,7 @@ fi                 </screen></blockquote>
                                     
                 <para><guilabel>Søgesti for albumbiblioteker</guilabel> er stedet på din harddisk hvor &digikam; opbevarer alle albummer. Hvis du ændrer stedet uden at  flytte alle albummer på harddisken manuelt, så tror &digikam; at der ikke findes nogen eksisterende albummer og laver en ny database på det nye sted. Dine gamle albummer ændres ikke, men du skal skifte søgestien for albumbibliotek tilbage til det gamle sted pladsen for at komme til dem. Hvis du ikke er sikker på hvad du gør er det bedst at ikke flytte søgestien. </para>            
                 
-                <para>Tilvalgene under <guilabel>Miniaturebilleder</guilabel> beskrives i afsnittet <link linkend="using-kapp-imageview">Billeder</link>. </para> 
+                <para>Tilvalgene under <guilabel>Miniaturebilleder</guilabel> beskrives i afsnittet <link linkend="using-tdeApp-imageview">Billeder</link>. </para> 
                 
                 <para>Øvrige indstillinger i dialogen er selvforklarende. </para> 
                             
@@ -2104,7 +2104,7 @@ fi                 </screen></blockquote>
             <sect3 id="authoridentity">
             <title>Standard IPTC-identitetsinformation</title>
 
-                <para>Denne opsætningsside tillader at standardidentitet og ophavsret angives, som vist på skærmaftrykket nedenfor. Informationen skrives automatisk i de respektive IPTC-datafelter, hvis det vælges når der overføres med <link linkend="using-kapp-cameraclientrenaming">kameragrænsefladen</link>. </para>
+                <para>Denne opsætningsside tillader at standardidentitet og ophavsret angives, som vist på skærmaftrykket nedenfor. Informationen skrives automatisk i de respektive IPTC-datafelter, hvis det vælges når der overføres med <link linkend="using-tdeApp-cameraclientrenaming">kameragrænsefladen</link>. </para>
 
                 <para>  
                     <inlinemediaobject><imageobject><imagedata fileref="cameraclientidentity.png" format="PNG"/> </imageobject></inlinemediaobject>
@@ -2115,7 +2115,7 @@ fi                 </screen></blockquote>
             <sect3 id="setupcollection">
             <title>Samlingsindstillinger</title>
     
-                <para>Denne dialog håndterer dine samlingstyper. Albumsamlinger beskrives i detalje i afsnittet <link linkend="using-kapp-myalbumsview">Mine albummer</link>. </para>
+                <para>Denne dialog håndterer dine samlingstyper. Albumsamlinger beskrives i detalje i afsnittet <link linkend="using-tdeApp-myalbumsview">Mine albummer</link>. </para>
     
                 <para> 
                     <inlinemediaobject><imageobject><imagedata fileref="setupcollections.png" format="PNG"/> </imageobject></inlinemediaobject>
@@ -2247,7 +2247,7 @@ fi                 </screen></blockquote>
             <sect3 id="setupmisc">
             <title>Diverse indstillinger</title>
     
-                <para>Her kan du kontrollere hvordan &digikam; opfører sig når du fjerner et fotografi eller et album. Se afsnittet <link linkend="using-kapp-deleteimage">Slet et fotografi</link> og <link linkend="using-kapp-deletealbum">Slet et album</link> for flere detaljer. </para>
+                <para>Her kan du kontrollere hvordan &digikam; opfører sig når du fjerner et fotografi eller et album. Se afsnittet <link linkend="using-tdeApp-deleteimage">Slet et fotografi</link> og <link linkend="using-tdeApp-deletealbum">Slet et album</link> for flere detaljer. </para>
                 
                 <para>Du kan også lukke af for visning af startskærmen når &digikam; indlæses. Det kan få &digikam;s starttid til at gå lidt hurtigere. </para>
     
@@ -3462,7 +3462,7 @@ fi                 </screen></blockquote>
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Hvordan får man fat på &digikam;</title>
 
 <para>Hjemmesiden for &digikam; findes på <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Kontrollér den regelmæssigt for at få de seneste nyheder om &digikam;. &digikam; kan fås på binær- og kildekodeform fra <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/da/showfoto/index.docbook b/doc/da/showfoto/index.docbook
index 6bf3bd71..ecbf1b04 100644
--- a/doc/da/showfoto/index.docbook
+++ b/doc/da/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Danish "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -68,10 +68,10 @@
 <chapter id="introduction">
 <title>Indledning</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Baggrund</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Om &showfoto;</title>
 
        <para>En hurtig billededitor med nogle grundlæggende værktøjer for billedredigering indgår i &showfoto;. Du kan bruge  billededitoren til at vise fotografier og udføre korrigeringer og ændringer. </para>
@@ -108,7 +108,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Billedfilformater som understøttes</title>
 
         <sect2>
@@ -155,7 +155,7 @@
                 
                 <para>Nogle, typisk dyrere, kameraer lader dig opbevare billeder i et ubehandlet format. Et ubehandlet format følger egentlig ikke nogen billedstandard i det hele taget. Det er forskellige for hvert kameramærke. Billeder med ubehandlet format indeholder al data som kommer direkte fra kameraets billedsensor inden programmellet i kameraet udfører behandling såsom hvidbalance, skærpning, &etc; Ved at opbevare fotografier i kameraets ubehandlede format kan du ændre indstillinger såsom hvidbalancen efter fotografiet er taget. De fleste professionelle fotografer bruger ubehandlet format eftersom det giver dem maksimal fleksibilitet. Bagdelen er at filer i ubehandlet format virkelig kan være meget store.  </para>
                 
-                <para> Hvis du vil lære dig mere om ubehandlede billedformater, så besøg guiderne <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">Luminous Landscape</ulink> og <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>, som kan være til stor hjælp. Du kan konvertere billeder med ubehandlet format til JPEG eller TIFF i &showfoto; ved at bruge <ulink url="help:/kipi-plugins/rawconverter.html">pluginnet for konvertering af ubehandlede billeder</ulink>. Se afsnittet <link linkend="using-kapp-setup">Indstilling</link> for mere information om brug af plugin med &showfoto;. </para>
+                <para> Hvis du vil lære dig mere om ubehandlede billedformater, så besøg guiderne <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">Luminous Landscape</ulink> og <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>, som kan være til stor hjælp. Du kan konvertere billeder med ubehandlet format til JPEG eller TIFF i &showfoto; ved at bruge <ulink url="help:/kipi-plugins/rawconverter.html">pluginnet for konvertering af ubehandlede billeder</ulink>. Se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link> for mere information om brug af plugin med &showfoto;. </para>
 
                 <para>&showfoto; understøtter kun indlæsning af ubehandlede billeder med understøttelse af programmet <ulink url="http://www.cybercom.net/~dcoffin/dcraw/">DCRAW</ulink>. De væsentligste ubehandlede filformater som understøttes af &showfoto; listes nedenfor: <informaltable><tgroup cols="2">
         
@@ -227,7 +227,7 @@
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Plugin som understøttes</title>
 
         <para>En af de bedste ting ved &showfoto; er hvor enkelt dets funktion kan udvides ved at bruge <emphasis>billededitorens plugin fra &digikam;</emphasis>: disse plugin tilføjer nye billedbehandlingsmuligheder. &showfoto; understøtter kernen for billedplugin som indgår i &digikam; (hvis det er installeret) til at udføre grundlæggende bildbehandling såsom korrektion af røde øjne, proportional beskæring, &etc; Andre plugin fra <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projektet DigikamImagePlugins</ulink> understøttes også. Dette er beregnet til at sørge for en samling avancerede billededitorværktøj. Indstilling af billededitorens plugin beskrives i følgende <link linkend="setupplugins">afsnit</link>. <inlinemediaobject>
@@ -244,10 +244,10 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Brug af &showfoto;</title>
            
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>Billededitoren</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -360,7 +360,7 @@
         <sect2>
         <title>Billedegenskaber</title>
             
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>Værktøj for EXIF-visning</title>
             
                 <anchor id="kexif.anchor"/>
@@ -408,7 +408,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Værktøj for filegenskaber</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -417,14 +417,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogramvisning</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Hvis du er interesseret i fotografiets detaljerede histogram, kan du kigge på det med <menuchoice><guimenu>Billede</guimenu> <guimenuitem>Egenskaber</guimenuitem></menuchoice> på siden <guilabel>Histogram</guilabel>. Et histogram for en billede viser mængden af hver farve som findes og deres forskellige amplituder i billedet. Hvis fotografiet har en farveforvrængning kan du måske hvad fejlen er ved at kigge på histogrammet. </para>
             
-                <para>Histogramvisningen angiver information om den statistiske fordeling af farveværdier i nuværende billede. Den er rent informativ, ingenting du gør med den forårsager nogen ændringer i billedet. Hvis du vil udføre histogrambaseret farvekorrigering, bruges billededitorens plugin Niveaujustering. Dette plugin er en del af <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projektet DigikamImagePlugins</ulink>. For mere information om at bruge plugin i &showfoto;, se afsnittet <link linkend="using-kapp-setup">Indstilling</link>. </para>
+                <para>Histogramvisningen angiver information om den statistiske fordeling af farveværdier i nuværende billede. Den er rent informativ, ingenting du gør med den forårsager nogen ændringer i billedet. Hvis du vil udføre histogrambaseret farvekorrigering, bruges billededitorens plugin Niveaujustering. Dette plugin er en del af <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projektet DigikamImagePlugins</ulink>. For mere information om at bruge plugin i &showfoto;, se afsnittet <link linkend="using-tdeApp-setup">Indstilling</link>. </para>
                                                 
                 <figure>
                     <title>Histogramvisningen i gang</title>
@@ -465,7 +465,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Hvordan man bruger et histogram</title>
                 
                 <para>Et histogram er en grafisk måde at evaluere nøjagtigheden af et billede som vises på skærmen. Grafen repræsenterer fotografiets tre områder af lysstyrke: <itemizedlist> <listitem><para> (1): skyggetonerne til venstre. </para></listitem> <listitem><para> (2): mellemtonerne i midten. </para></listitem> <listitem><para> (3): de fremhævede toner til højre. </para></listitem> </itemizedlist> <figure> <title>Histogrambeskrivelse</title> <graphic srccredit="The Histogram Description" fileref="editorhistogramdescription.png"/> </figure> Grafens fordeling, hvor toppene og bulerne er samlede, angiver om billedet er for mørkt, for lyst eller velafbalanceret. </para>
@@ -478,19 +478,19 @@
 
                 <para>Vigtigt: Alle fotografier behøver ikke at vise denne udbuling i den centrale del af histogrammet. Det afhænger meget af fotografiets motiv. I visse tilfælde kan det være passende at histogrammet viser en top i den ene eller anden ende, eller begge. </para>
                         
-                <para>Histogrammet er en tilforladelig måde at afgøre om et fotografi er rigtigt eksponeret eller ej. Skulle histogrammet vise en over- eller undereksponering, skal et <link linkend="using-kapp-correctingexposure">værktøj til at korrigere eksponering</link> bruges for at ordne fotografiet. </para>
+                <para>Histogrammet er en tilforladelig måde at afgøre om et fotografi er rigtigt eksponeret eller ej. Skulle histogrammet vise en over- eller undereksponering, skal et <link linkend="using-tdeApp-correctingexposure">værktøj til at korrigere eksponering</link> bruges for at ordne fotografiet. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Justér et fotografi</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Beskær et fotografi</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Manuel beskæring</title>
 
                     <para>At beskære et fotografi er ikke kun en almindelig handling, men også et ofte undervurderet værktøj for fotografen for at komponere et billede. Billededitoren gør dette meget nemt. Træk blot en rektangel henover billedet ved at holde venstre museknap nede og flytte musen for at beskære et billede. Du ser en trådramme som vises mens du flytter musen. </para>
@@ -507,7 +507,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportionel beskæring</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -576,7 +576,7 @@
                     
                 </sect4>
             
-                <sect4 id="using-kapp-compositionguides">
+                <sect4 id="using-tdeApp-compositionguides">
                 <title>Kompositionsguide</title>
                                 <para>Når man først kigger på et billede, stopper betragterens øje sjældent i billedets centrum, men går i stedet fra øverste venstre hjørne mod højre, og derefter ned til venstre og til højre igen. Dette mønster er oftest ubevidst men dette er veldokumenteret. Det hører formodentlig sammen med det vestlige læsemønster. Ud fra fotografens synvinkel, bliver målet nu at lede betragterens blik til motivet, bevidst om den måde som mange opfatter et billede. </para>                                                                                
                     
@@ -684,7 +684,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Ændr størrelse på et fotografi</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -700,7 +700,7 @@
                                 
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Rotér eller flip et fotografi</title>
                 
                 <para>Hvis fotografiet har forkert orientering kan du <guilabel>Flippe</guilabel> eller <guilabel>Rotere</guilabel> det til den orientering du vil have ved at bruge værktøjerne Transformér Flip/Rotér tilgængelige i menuerne <menuchoice><guimenu>Transformér</guimenu> <guimenuitem>Rotér</guimenuitem></menuchoice> og <menuchoice><guimenu>Transformér</guimenu> <guimenuitem>Flip</guimenuitem></menuchoice>. </para>
@@ -709,7 +709,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Ordn røde øjne i et fotografi</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -726,7 +726,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Justér skarphed</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -823,7 +823,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Korrigér farve</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -865,7 +865,7 @@
             <para>Resultatet af eventuelle justeringer du gør bliver ikke husket førend du gemmer fotografiet. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Korrigér eksponering</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1021,7 +1021,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>Indstilling af &showfoto;</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1720,7 +1720,7 @@
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Her kan du hente &showfoto;</title>
 
 <para>&showfoto;s er en del af &digikam;-projektet og hjemmesiden findes på <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Kontrollér den regelmæssigt for at få seneste nyheder om &showfoto;. &showfoto; kan hentes på binær- eller kildekodeform fra <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/de/digikam/credits-annex.docbook b/doc/de/digikam/credits-annex.docbook
index dd6dab38..a60ebccf 100644
--- a/doc/de/digikam/credits-annex.docbook
+++ b/doc/de/digikam/credits-annex.docbook
@@ -42,7 +42,7 @@
 
 <appendix id="installation">        <title>Installation</title>
 
-<sect1 id="getting-kapp">                <title>How to Obtain &digikam;</title>
+<sect1 id="getting-tdeApp">                <title>How to Obtain &digikam;</title>
 
 <para>
 The website for &digikam; is at <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Please check it regularly to get the latest news about &digikam;. &digikam; can be obtained in binary and source format from <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>.
diff --git a/doc/de/digikam/index.docbook b/doc/de/digikam/index.docbook
index 8e6f85c2..ce646a04 100644
--- a/doc/de/digikam/index.docbook
+++ b/doc/de/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % German "INCLUDE"><!-- change language only here -->
@@ -260,7 +260,7 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">       <title>&digikam; benutzen</title>
+<chapter id="using-tdeApp">       <title>&digikam; benutzen</title>
 
 
  <sect1 id="using-mainwindow">         <title>Das Hauptfenster von &digikam;</title>
diff --git a/doc/de/showfoto/index.docbook b/doc/de/showfoto/index.docbook
index 4d694425..e37e71ed 100644
--- a/doc/de/showfoto/index.docbook
+++ b/doc/de/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % German "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -81,9 +81,9 @@
 <chapter id="introduction">
   <title>Einführung</title>
 
-    <sect1 id="using-kapp-background">    <title>Hintergrund</title>
+    <sect1 id="using-tdeApp-background">    <title>Hintergrund</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Über &showfoto;</title>
 
        <para>&showfoto; ist eine schnelle Bildbearbeitung mit einigen mächtigen Basiswerkzeugen. Sie können es benutzen, um Ihre Fotos anzusehen und Korrekturen und Änderungen durchzuführen. </para>
@@ -145,7 +145,7 @@ Mehrfaches Klicken auf denn gleichen Reiter lässt die Seitenleiste erscheinen b
 
 </chapter>
 
-<chapter id="using-kapp">        <title>&showfoto; benutzen</title>
+<chapter id="using-tdeApp">        <title>&showfoto; benutzen</title>
 &doc-photo-editing; <sect1 id="using-setup">        <title>&showfoto; Einrichtung</title>
 
         <anchor id="setupdialog.anchor"/>
diff --git a/doc/en/digikam/credits-annex.docbook b/doc/en/digikam/credits-annex.docbook
index bf064d74..b95ff7b3 100644
--- a/doc/en/digikam/credits-annex.docbook
+++ b/doc/en/digikam/credits-annex.docbook
@@ -111,7 +111,7 @@ All Images copyrighted 2003-2007 by Gilles Caulier <email>caulier_dot_gilles_at_
 
 <appendix id="installation">        <title>Installation</title>
 
-<sect1 id="getting-kapp">                <title>How to Obtain &digikam;</title>
+<sect1 id="getting-tdeApp">                <title>How to Obtain &digikam;</title>
 
 <para>
 The website for &digikam; is at <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Please check it regularly to get the latest news about &digikam;. &digikam; can be obtained in binary and source format from <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>.
diff --git a/doc/en/digikam/index.docbook b/doc/en/digikam/index.docbook
index 5f2c7bb0..a615c7ae 100644
--- a/doc/en/digikam/index.docbook
+++ b/doc/en/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
@@ -353,7 +353,7 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">       <title>Using &digikam;</title>
+<chapter id="using-tdeApp">       <title>Using &digikam;</title>
 
 
  <sect1 id="using-mainwindow">         <title>The Main &digikam; Window</title>
diff --git a/doc/en/showfoto/index.docbook b/doc/en/showfoto/index.docbook
index f2e4496a..9e88c665 100644
--- a/doc/en/showfoto/index.docbook
+++ b/doc/en/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -87,9 +87,9 @@
 <chapter id="introduction">
   <title>Introduction</title>
 
-    <sect1 id="using-kapp-background">    <title>Background</title>
+    <sect1 id="using-tdeApp-background">    <title>Background</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>About &showfoto;</title>
 
        <para>
@@ -176,7 +176,7 @@
 
 </chapter>
 
-<chapter id="using-kapp">        <title>Using &showfoto;</title>
+<chapter id="using-tdeApp">        <title>Using &showfoto;</title>
 
   &doc-photo-editing;
 
diff --git a/doc/es/digikam/index.docbook b/doc/es/digikam/index.docbook
index 7251236b..8de97327 100644
--- a/doc/es/digikam/index.docbook
+++ b/doc/es/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Spanish "INCLUDE"><!-- change language only here -->
   <!ENTITY digikam '<application>digiKam</application>'>
@@ -85,10 +85,10 @@
 <chapter id="introduction">
 <title>Introducción</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Segundo plano</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Acerca de &digikam;</title>
 
        <para>&digikam; is an advanced digital photo management application for the &kde; desktop. It provides a simple interface which makes importing and organizing digital photographs a "snap". &digikam; enables you to manage large numbers of digital photographs in Albums and to organize these photographs for easy retrieval using Tags. It has many features for viewing, organizing, manipulating and sharing your pictures. </para>
@@ -129,7 +129,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Comenzando</title>
 
         <anchor id="firstrundialog.anchor"/>
@@ -154,15 +154,15 @@
 
         </para></note>
 
-        <para>Cuando utilice una carpeta con fotografías que ya exista, como carpeta de biblioteca de álbumes, se le avisará de que los álbumes en la lista Mi álbum no tienen icono para las fotografías. La primera vez que vea cada álbum &digikam; creará una miniatura a partir de la primera fotografía del álbum y la utilizará como icono del álbum. Vea la sección <link linkend="using-kapp-myalbumsview">Mi álbum</link> para obtener detalles sobre cómo cambiar el icono del álbum. </para>
+        <para>Cuando utilice una carpeta con fotografías que ya exista, como carpeta de biblioteca de álbumes, se le avisará de que los álbumes en la lista Mi álbum no tienen icono para las fotografías. La primera vez que vea cada álbum &digikam; creará una miniatura a partir de la primera fotografía del álbum y la utilizará como icono del álbum. Vea la sección <link linkend="using-tdeApp-myalbumsview">Mi álbum</link> para obtener detalles sobre cómo cambiar el icono del álbum. </para>
 
-        <para>Si ya había accedido anteriormente a su colección de fotografías con otra aplicación, que haya creado miniaturas en subcarpetas no estándar, &digikam; mostrará estas carpetas de miniaturas como álbumes separados. &digikam; sigue los estándares de <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> para las carpetas de miniaturas. No hay forma de ocultar las carpetas de miniaturas no estándar de la lista «Mi álbum». Si lo desea puede mantenerlos fuera creando una colección que contenga únicamente todas las carpetas con las miniaturas y ver sus álbumes ordenados por colección. Consulte la sección <link linkend="using-kapp-myalbumsview">Mi álbum</link> para obtener más detalles sobre las colecciones de álbumes. </para>
+        <para>Si ya había accedido anteriormente a su colección de fotografías con otra aplicación, que haya creado miniaturas en subcarpetas no estándar, &digikam; mostrará estas carpetas de miniaturas como álbumes separados. &digikam; sigue los estándares de <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> para las carpetas de miniaturas. No hay forma de ocultar las carpetas de miniaturas no estándar de la lista «Mi álbum». Si lo desea puede mantenerlos fuera creando una colección que contenga únicamente todas las carpetas con las miniaturas y ver sus álbumes ordenados por colección. Consulte la sección <link linkend="using-tdeApp-myalbumsview">Mi álbum</link> para obtener más detalles sobre las colecciones de álbumes. </para>
 
-        <para>Una vez que haya configurado la carpeta de biblioteca de álbum puede configurar &digikam; para que trabaje con su cámara digital. A continuación aprenda cómo utilizar <link linkend="using-kapp-myalbumsview">Mis álbumes</link> y <link linkend="using-kapp-mytagsview">Mis etiquetas</link> para ordenar sus álbumes de fotografías. </para> 
+        <para>Una vez que haya configurado la carpeta de biblioteca de álbum puede configurar &digikam; para que trabaje con su cámara digital. A continuación aprenda cómo utilizar <link linkend="using-tdeApp-myalbumsview">Mis álbumes</link> y <link linkend="using-tdeApp-mytagsview">Mis etiquetas</link> para ordenar sus álbumes de fotografías. </para> 
                         
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Formatos de archivos de imagen soportados</title>
 
         <sect2>
@@ -198,7 +198,7 @@
 
             <sect3>
             <title>PNG</title>
-                <para>PNG is an image format that was developed as a replacement for a number of older, in the 1990's widely used, image file formats. It is a lossless format like TIFF but it is much more compact and saves disk space. Although your camera is unlikely to support PNG, some people like to convert their photographs to PNG as soon as they get them on their computer. Unlike JPEG, PNG images do not loose quality every time you re-encode them after modification. &digikam; fully supports PNG images and the Batch Processing Images Plugin can convert a batch of images from any supported format to PNG in one step. See the <link linkend="using-kapp-setup">Configuration</link> section for information about using plugins with &digikam;. </para>
+                <para>PNG is an image format that was developed as a replacement for a number of older, in the 1990's widely used, image file formats. It is a lossless format like TIFF but it is much more compact and saves disk space. Although your camera is unlikely to support PNG, some people like to convert their photographs to PNG as soon as they get them on their computer. Unlike JPEG, PNG images do not loose quality every time you re-encode them after modification. &digikam; fully supports PNG images and the Batch Processing Images Plugin can convert a batch of images from any supported format to PNG in one step. See the <link linkend="using-tdeApp-setup">Configuration</link> section for information about using plugins with &digikam;. </para>
     
                 <para>PNG es un formato de archivo extensible para guardar imágenes sin pérdida y portable de imágenes de barrido. PNG proporciona un reemplazo libre de patentes para &GIF; y también puede reemplazar muchos de los usos comunes de TIFF. PNG está diseñado para trabajar en aplicaciones de visualización «en línea», como por ejemplo para la web, por tanto se puede transmitir perfectamente con una opción de visualización progresiva. De la misma forma, PNG puede guardar datos sobre la gamma y el cromatismo para mejorar la coincidencia de color en plataformas heterogéneas. PNG soporta 8 y 16 bits / colores / pixels de profundidad. Es el formato de archivo perfecto para guardar sus fotografías. Para obtener más información sobre el formato PNG consulte la <ulink url="http://www.libpng.org/pub/png/">página principal de PNG</ulink>. </para>
             
@@ -209,7 +209,7 @@
                 
                 <para>Algunas cámaras, normalmente muy caras, le permiten guardar sus imágenes en formato RAW. El formato RAW no es en absoluto una imagen estándar. Es diferente para cada cámara. Las imágenes en formato RAW contienen todos los datos tomados directamente del sensor de imágenes de la cámara antes de que la programación de la cámara aplique elementos tales como el balance de blancos, repujar, &etc;. Guardando las fotografías en uno de los formatos RAW de la cámara podrá modificar parámetros tales como el balance de blancos después de haber tomado la fotografía. La mayor parte de los fotógrafos profesionales utilizan el formato RAW, ya que les ofrece la máxima flexibilidad. La desventaja es que los archivos de imágenes RAW pueden ser muy grandes. </para>
                 
-                <para>Si desea aprender más sobre el formato de imagen RAW visite las guías prácticas de ayuda <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">«The Luminous Landscape»</ulink> (en inglés) y <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm"> «Cambridge in Colour»</ulink> (en inglés). Puede convertir imágenes de formato RAW a JPEG o TIFF en &digikam; utilizando la <ulink url="help:/kipi-plugins/rawconverter.html">extensión de conversión de imágen RAW</ulink>. Consulte la sección de <link linkend="using-kapp-setup">configuración</link> para obtener información sobre el uso de las extensiones con &digikam;. </para>
+                <para>Si desea aprender más sobre el formato de imagen RAW visite las guías prácticas de ayuda <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">«The Luminous Landscape»</ulink> (en inglés) y <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm"> «Cambridge in Colour»</ulink> (en inglés). Puede convertir imágenes de formato RAW a JPEG o TIFF en &digikam; utilizando la <ulink url="help:/kipi-plugins/rawconverter.html">extensión de conversión de imágen RAW</ulink>. Consulte la sección de <link linkend="using-tdeApp-setup">configuración</link> para obtener información sobre el uso de las extensiones con &digikam;. </para>
 
                 <para>&digikam; supports RAW image thumbnails creation only relying on the <ulink url="http://www.cybercom.net/~dcoffin/dcraw/"> DCRAW program</ulink> from the main window. RAW file support on image editor isn't yet implemented. The main Raw file formats supported by &digikam; are listed below: <informaltable><tgroup cols="2">
         
@@ -283,13 +283,13 @@
 
         <para>Esta dependencia de otras bibliotecas significa que no es posible dar una lista definitiva de todos los formatos disponibles en su sistema. Como mínimo estarán disponibles JPEG, PNG y TIFF. </para>
 
-        <para>&digikam; solo muestra los archivos que están en los formatos que puede entender. Hace ésto echando un vistazo a la extensión de los archivos y comprobando ésta en una lista predefinida. Si la extensión del archivo se encuentra en la lista &digikam; mostrará el archivo en la vista de imagen. Puede cambiar la lista de extensiones que &digikam; aceptará. Consulte la sección de <link linkend="using-kapp-setup">configuración</link> para obtener más detalles. </para>
+        <para>&digikam; solo muestra los archivos que están en los formatos que puede entender. Hace ésto echando un vistazo a la extensión de los archivos y comprobando ésta en una lista predefinida. Si la extensión del archivo se encuentra en la lista &digikam; mostrará el archivo en la vista de imagen. Puede cambiar la lista de extensiones que &digikam; aceptará. Consulte la sección de <link linkend="using-tdeApp-setup">configuración</link> para obtener más detalles. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Extensiones soportadas</title>
 
         <para>Una de las mejores cosas de &digikam; es lo fácil que se puede extender su funcionalidad utilizando extensiones. Están disponibles dos arquitecturas de extensiones: <itemizedlist>
@@ -310,7 +310,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camerasupport">
+    <sect1 id="using-tdeApp-camerasupport">
     <title>Cámaras digitales soportadas</title>
         
         <sect2>
@@ -378,14 +378,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Uso de &digikam;</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>La ventana principal de &digikam;</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Introducción a la ventana principal</title>
 
             <para>
@@ -439,28 +439,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>Vista «Mis álbumes»</title>
 
             <para>The "My Albums" list provides an organized view of your photograph albums. All photographs that are managed by &digikam; are stored in a single folder branch. The albums can be sorted by their folder layout on the hard disk, by the Collection name that has been set in the Album Properties or by the Date that the Albums were first created (this date can also be changed in the Properties of each Album). </para>
             
             <para>You can switch between these orderings using <guimenuitem>Sort Albums</guimenuitem> from the <guimenu>View</guimenu> menu. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Crear un nuevo álbum</title>
                 
                 <para>There are a number of ways to create a new Album. You can create a new Album when you upload new photographs from the Camera using the Camera Tool. You can also create a new empty Album by clicking the <menuchoice><guimenu>View</guimenu> </menuchoice> button on the Tool Bar. As an additional option, you can create a new Album by importing an existing folder of photographs from your hard disk, just select <menuchoice><guimenu>Album</guimenu> <guimenuitem>Import</guimenuitem> <guimenuitem>Import Folders</guimenuitem></menuchoice> from the Menu Bar and select the folder that you want to import. An Album will be created with the same name as the hard disk folder. You can use drag and drop to import a folder. Drag a folder icon, for example from a &konqueror; window. Than drop it on the album list on the left. A menu will appear that gives you the option to move or copy the folder into &digikam;. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Borrar un álbum</title>
                 
                 <para>Cuando borra un álbum de &digikam; se moverá a la papelera de &kde;. Puede cambiar este comportamiento, de forma que se borre el álbum y todas las fotografías que haya en él. Ésto se puede cambiar seleccionando <menuchoice><guimenu>Preferencias</guimenu><guimenuitem>Configurar &digikam;</guimenuitem></menuchoice> y a continuación la página Varios. En la parte superior de esta página se encuentran las configuraciones que controlan qué es lo que pasa cuando se borra una fotografía. Para borrar un álbum pulse con el botón derecho en el árbol «Mi álbum» y seleccione borrar álbum del disco duro en el menú contextual. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Añadir una fotografía a un álbum</title>
                 
                 <para>Most of the time you will create new Albums and populate them with photographs directly from your camera using the Camera Tool. However, sometimes you may want to add a photograph that you already have on your computer to an existing Album. To add a photograph to an Album, make sure that the Album is selected. Then, either click the <guilabel>Add Images</guilabel> icon in the Tool Bar or select <menuchoice><guimenu>Album</guimenu> <guimenuitem>Import</guimenuitem> <guimenuitem>Add Images</guimenuitem></menuchoice> from the Menu Bar. Select the photographs that you want to add from the file dialog and click <guilabel>Open</guilabel>. The photographs will be copied into the Album. Additionally, you can use drag and drop to import photographs. Drag the photographs icons, for example from a &konqueror; window. Than drop it on the image list on the right hand side. </para>
@@ -469,14 +469,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Mover o copiar fotografías entre álbumes</title>
                 
                 <para>Solo tiene que arrastrar la fotografía y soltarla en el álbum de destino para moverla o copiarla a otro álbum. Aparecerá un menú que le preguntará si desea <guilabel>Mover</guilabel> o <guilabel>Copiar</guilabel> la fotografía. Puede mover o copiar varias fotografías simultáneamente con tan solo seleccionar todas las fotografías que desee y arrastrarlas al álbum de destino. </para>
         
             </sect3>            
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Administrar álbumes</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -505,7 +505,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Configurar el icono del álbum</title>
                 
                 <para>La primera vez que ve un álbum, &digikam; selecciona la primera fotografía del álbum como icono para que se muestre en la lista «Mis álbumes». Algunas veces la primera fotografía del álbum no es la más representativa y puede desear seleccionar otra diferente como icono del álbum. </para> 
@@ -514,7 +514,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Notas sobre las colecciones de álbumes</title>
                 
                 <para>Un álbum solo puede encontrarse en una colección de álbumes y las colecciones de álbumes no pueden anidar. </para>
@@ -525,7 +525,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Vista de imágen</title>
 
             <sect3>
@@ -541,7 +541,7 @@
             
                 <para>La información sobre cada fotografía se muestra bajo cada miniatura. Puede controlar qué información se muestra desde el diálogo <menuchoice><guimenu>Preferencias</guimenu> <guimenuitem>Configurar &digikam;</guimenuitem> </menuchoice>. Seleccione la página Álbumes y eche un vistazo a la sección <guilabel>Información extra en la vista de miniaturas</guilabel>. </para> 
 
-                <para>Las miniaturas tienen ventanas informativas emergentes que aparecerán si se detiene un momento sobre la miniatura. Estas ventanas muestran las propiedades más importantes de la fotografía incluyendo cualquier etiqueta que se haya aplicado. La captura de pantalla de la parte superior de la sección <link linkend="using-kapp-mainwindow-intro">Introducción a la ventana principal</link> muestra una ventana informativa. </para>
+                <para>Las miniaturas tienen ventanas informativas emergentes que aparecerán si se detiene un momento sobre la miniatura. Estas ventanas muestran las propiedades más importantes de la fotografía incluyendo cualquier etiqueta que se haya aplicado. La captura de pantalla de la parte superior de la sección <link linkend="using-tdeApp-mainwindow-intro">Introducción a la ventana principal</link> muestra una ventana informativa. </para>
 
             </sect3>
 
@@ -552,14 +552,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Ver una fotografía</title>
              
-                <para>Puede abrir el editor de imágenes con una fotografía pulsando en la miniatura o con el botón derecho seleccionando <guilabel>Ver/Modificar</guilabel> en el menú contextual. Consulte la sección <link linkend="using-kapp-imageeditor">Editor de imágenes de &digikam;</link> para obtener instrucciones sobre cómo editar sus fotografías. </para>
+                <para>Puede abrir el editor de imágenes con una fotografía pulsando en la miniatura o con el botón derecho seleccionando <guilabel>Ver/Modificar</guilabel> en el menú contextual. Consulte la sección <link linkend="using-tdeApp-imageeditor">Editor de imágenes de &digikam;</link> para obtener instrucciones sobre cómo editar sus fotografías. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Ver o editar una fotografía con otra aplicación</title>
 
                 <para>Algunas veces &digikam; no puede proporcionar todas las capacidades que necesita. Puede abrir una fotografía en otra aplicación pulsando con el botón derecho sobre ella y seleccionando <guilabel>Abrir con</guilabel>. La lista de aplicaciones que aparecerá en este menú está controlada por las asociaciones estándar de archivo de &kde; para el tipo de formato de imagen de esta fotografía. Consulte el manual de &kde; para averiguar cómo cambiar estas asociaciones si la aplicación que precisa no está listada. </para>
@@ -568,7 +568,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Rotar una fotografía</title>
              
                 <note><para>You will need to have the Kipi JPEG Lossless Plugin installed for the rotation features. If you do not have this plugin installed you can still rotate your photographs, but you have to do so from the Image Editor inside. The Image Editor uses a different method of rotating an image, you may not notice any difference but the Image Editor method can cause some loss of quality in the photograph. The rotation methods described here use the Kipi JPEG Lossless Plugin and do not loose any quality in the original photograph. </para></note>
@@ -581,10 +581,10 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-imagemetadata">
+            <sect3 id="using-tdeApp-imagemetadata">
             <title>Photograph Meta-Data, Properties and Histogram</title>
 
-                <sect4 id="using-kapp-tagscommentsedit">
+                <sect4 id="using-tdeApp-tagscommentsedit">
                 <title>Editing Tags and Comments</title>
             
                     <anchor id="tagscommentsedit.anchor"/>
@@ -606,7 +606,7 @@
 
                 </sect4>                    
                 
-                <sect4 id="using-kapp-propertiesmetadatahistogram">
+                <sect4 id="using-tdeApp-propertiesmetadatahistogram">
                 <title>Displaying Properties, embedded Meta-Data, and Histogram</title>
             
                     <anchor id="propertiesmetadatahistogram.anchor"/>
@@ -621,7 +621,7 @@
                         fileref="maininterfaceimgproperties1.png"/>
                     </figure>
                 
-                    <para>This dialog will show you the same EXIF information provided in the EXIF Viewer dialog described in the <link linkend="using-kapp-exifviewertool"> EXIF Viewer section</link>. </para>
+                    <para>This dialog will show you the same EXIF information provided in the EXIF Viewer dialog described in the <link linkend="using-tdeApp-exifviewertool"> EXIF Viewer section</link>. </para>
                     
                     <figure>
                         <title>The Image Properties Dialog with EXIF Viewer in Action</title>
@@ -629,7 +629,7 @@
                         fileref="maininterfaceimgproperties2.png"/>
                     </figure>
                                     
-                    <para>This dialog shows the full set of image histograms. You can find more informations about histograms in the <link linkend="using-kapp-histogramviewer">Histogram Viewer</link> section. </para>
+                    <para>This dialog shows the full set of image histograms. You can find more informations about histograms in the <link linkend="using-tdeApp-histogramviewer">Histogram Viewer</link> section. </para>
                 
                     <figure>
                         <title>The Image Properties Dialog with Histogram Viewer in Action</title>
@@ -643,14 +643,14 @@
                                                                                                             
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Renombrar una fotografía</title>
              
                 <para>Puede cambiar el nombre del archivo de una fotografía pulsando con el botón derecho en una miniatura y seleccionando <guilabel>Renombrar</guilabel>. Recuerde mantener la extensión del archivo (.jpg, .tif, &etc;). </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Borrar una fotografía</title>
              
                 <para>Cuando borra una fotografía de &digikam; se moverá a la papelera de &kde;. Si prefiere borrar completamente la fotografía, puede elegir esta opción seleccionando <menuchoice><guimenu>Preferencias</guimenu> <guimenuitem>Configurar &digikam;</guimenuitem></menuchoice> y seleccionar la página <guilabel>Varios</guilabel>. En la parte superior de la página se encuentran las configuraciones que controlan qué es lo que sucede cuando se borra una fotografía. </para>
@@ -661,7 +661,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
         <title>Vista «Mis etiquetas»</title>
 
             <para>Etiquetar las fotografías proporciona una forma flexible y potente para organizar y catalogar sus fotografías. Las etiquetas son marcas que se aplican a las fotografías individuales. Una vez que se ha etiquetado una fotografía, ésta puede encontrarse nuevamente seleccionando la etiqueta. </para>
@@ -677,7 +677,7 @@
 
             <para>De forma predeterminada, cuando selecciona una etiqueta en el árbol y ésta contiene otras sub-etiquetas, &digikam; no mostrará las fotografías que estén etiquetadas con las sub-etiquetas. Puede cambiar este comportamiento, si prefiere que se muestren todas las fotografías marcadas con una sub-etiqueta de la etiqueta actual. Para establecer esta opción abra <menuchoice><guimenu>Preferencias</guimenu> <guimenuitem>Configurar &digikam;</guimenuitem></menuchoice> en la barra de menú principal, seleccione la página <guilabel>Álbumes</guilabel> y por último seleccione <guilabel>Mostrar elementos en sub-etiquetas</guilabel>. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
             <title>Administrar etiquetas</title>
              
                 <para>Podrá añadir etiquetas nuevas pulsando con el botón derecho en la etiqueta «Mis etiquetas» o sobre una etiqueta ya existente y pulsando a continuación <guilabel>Nueva etiqueta</guilabel>. Si añade una etiqueta nueva en una etiqueta existente, la nueva etiqueta se creará como una sub-etiqueta. </para>
@@ -692,7 +692,7 @@
                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
             <title>Etiquetar fotografías</title>
              
                 <para>Antes de que pueda sacar el máximo de las capacidades de &digikam; debería etiquetar sus fotografías. Existen dos métodos para etiquetar las fotografías. Una vez que haya identificado las fotografías que desea etiquetar puede arrastrarlas y soltarlas en la etiqueta del árbol «Mis etiquetas» o, pulsando el botón derecho de las fotografías seleccionadas en la ventana de la imagen, puede utilizar el menú <guilabel>Asignar etiqueta</guilabel> para seleccionar las etiquetas que desee establecer. </para>
@@ -712,7 +712,7 @@
                                 
         </sect2>
         
-        <sect2 id="using-kapp-mydatesview">
+        <sect2 id="using-tdeApp-mydatesview">
         <title>Vista «Mis fechas»</title>
 
             <figure>
@@ -726,7 +726,7 @@
             
         </sect2>
           
-        <sect2 id="using-kapp-mysearchesview">
+        <sect2 id="using-tdeApp-mysearchesview">
         <title>Vista «Mis búsquedas»</title>
 
             <sect3>
@@ -744,7 +744,7 @@
                 
                 <para>Cuando esté satisfecho con su selección, pulse en el botón <guilabel>Aceptar</guilabel>, y comenzará la búsqueda, mostrándose los resultados en la vista «Mi búsqueda» en la pantalla principal. El campo de texto <guilabel>Guardar búsqueda como</guilabel> se utilizará para dar nombre a la consulta en la lista «Mi búsqueda», solo tiene que pulsar en un elemento de la vista «Mi búsqueda» y seleccionar una opción del menú emergente. </para>
                 
-                <para>Si selecciona <guilabel>Editar búsqueda</guilabel>, el formulario de búsqueda volverá a aparecer conteniendo su información de búsqueda anterior. Si selecciona <guilabel>Editar como búsqueda avanzada</guilabel>, se iniciará el diálogo de la herramienta de búsqueda avanzada utilizando muchas más reglas. Consulte la sección de <link linkend="using-kapp-mainwindow-advancedsearchtool">la herramienta de búsqueda avanzada</link> para obtener más información. </para>
+                <para>Si selecciona <guilabel>Editar búsqueda</guilabel>, el formulario de búsqueda volverá a aparecer conteniendo su información de búsqueda anterior. Si selecciona <guilabel>Editar como búsqueda avanzada</guilabel>, se iniciará el diálogo de la herramienta de búsqueda avanzada utilizando muchas más reglas. Consulte la sección de <link linkend="using-tdeApp-mainwindow-advancedsearchtool">la herramienta de búsqueda avanzada</link> para obtener más información. </para>
                 
                 <para>Si desea eliminar una búsqueda existente de la lista, seleccione <guilabel>Borrar búsqueda</guilabel> en el menú emergente. </para>
     
@@ -755,7 +755,7 @@
 
             </sect3>            
             
-            <sect3 id="using-kapp-mainwindow-advancedsearchtool">
+            <sect3 id="using-tdeApp-mainwindow-advancedsearchtool">
             <title>La herramienta de búsqueda avanzada</title>
             <anchor id="advancedsearchtool.anchor"/>
             
@@ -816,7 +816,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-sidebar">
+    <sect1 id="using-tdeApp-sidebar">
     <title>&digikam; Side Bar</title>
     <anchor id="sidebar.anchor"/>
     
@@ -828,13 +828,13 @@
             
                 <listitem><para>Properties : File and image properties, key photographing parameters (exif data)</para></listitem>
 
-                <listitem><para><link linkend="using-kapp-sidebarmetadata">Metadata</link>: Exif, Makernotes, IPTC and GPS data</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarmetadata">Metadata</link>: Exif, Makernotes, IPTC and GPS data</para></listitem>
                    
-                <listitem><para><link linkend="using-kapp-sidebarcolors">Colores</link>: histogramas y perfiles ICC empotrados.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcolors">Colores</link>: histogramas y perfiles ICC empotrados.</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebarcommentstags">Comentarios y etiquetas</link>: etiquetas de los comentarios, configuración de fecha y hora, puntuación.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcommentstags">Comentarios y etiquetas</link>: etiquetas de los comentarios, configuración de fecha y hora, puntuación.</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebartagfilters">Filtros de etiquetas</link>; filtros de etiquetas aplicados a la selección de la ventana principal.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebartagfilters">Filtros de etiquetas</link>; filtros de etiquetas aplicados a la selección de la ventana principal.</para></listitem>
             
             </itemizedlist>
 Clicking successively onto the same tab will make the side bar pop up or fold back into the border. </para>
@@ -859,11 +859,11 @@ Clicking successively onto the same tab will make the side bar pop up or fold ba
            </para>
         </sect2>
 
-        <sect2 id="using-kapp-sidebarmetadata">
+        <sect2 id="using-tdeApp-sidebarmetadata">
         <title>Metadatos</title>
            <para>The metadata side bar is composed of four subtabs <guilabel>Exif, Makernotes, IPTC and GPS data</guilabel> </para>
 
-           <sect3 id="using-kapp-sidebarmetadataexif">
+           <sect3 id="using-tdeApp-sidebarmetadataexif">
            <title>TODO</title>
 
               <para>tbc </para>
@@ -871,21 +871,21 @@ Clicking successively onto the same tab will make the side bar pop up or fold ba
            </sect3>
 
 
-           <sect3 id="using-kapp-sidebarmetadatamakernote">
+           <sect3 id="using-tdeApp-sidebarmetadatamakernote">
            <title>TODO</title>
               <para>tbc </para>
            
            </sect3>
 
 
-           <sect3 id="using-kapp-sidebarmetadataiptc">
+           <sect3 id="using-tdeApp-sidebarmetadataiptc">
            <title>TODO</title>
               <para>tbc </para>
            
            </sect3>
 
 
-           <sect3 id="using-kapp-sidebarmetadatagps">
+           <sect3 id="using-tdeApp-sidebarmetadatagps">
            <title>TODO</title>
               <para>The positioning data shown in this tab are actually stored in the image (and not in the databse). That allows the location to read by anyone that has access to the image. </para>
               <figure>
@@ -896,7 +896,7 @@ Clicking successively onto the same tab will make the side bar pop up or fold ba
 
            </sect3>
 
-           <sect3 id="using-kapp-gps">
+           <sect3 id="using-tdeApp-gps">
            <title>Como utilizar un dispositivo GPS con &digikam;</title>
            <note><para>GPS (sistema de posicionamiento global, del inglés global positioning system) se utiliza como un término genérico que en este documento se refiere a la localización en las coordenadas de latitud y longitud global que pueden mostrarse en un mapa. La implementación técnica actual que proporciona los datos puede ser el americano GPS, el ruso GLONAS, el europeo GALILEO o cualquier otro sistema. </para></note>
 
@@ -936,13 +936,13 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
            </sect3>
 
         </sect2>
-        <sect2 id="using-kapp-sidebarcolors">
+        <sect2 id="using-tdeApp-sidebarcolors">
         <title>Colores</title>
            <para>The colors side bar has two subtabs <guilabel>Color and ICC Profile</guilabel> </para>
 
         </sect2>
 
-        <sect2 id="using-kapp-sidebarcommentstags">
+        <sect2 id="using-tdeApp-sidebarcommentstags">
         <title>Comentarios y etiquetas</title>
            <para>This side bar tab serves to apply and edit image attributes like comments, rating, date and tags. All attributes are stored in the associated database. The tags only are also written into the IPTC data fields and become part of the image. All attributes are accessible in one side bar view as shown in the screenshot below. This side bar has a first-previous-next-last arrow navigator field on top if shown in the main application. </para>
 
@@ -963,12 +963,12 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
            <para>The combo-box at the bottom is another ergonomical feature for easy tagging of an image series. As you apply different tags they will be memorized in this box for quick access. </para>
 
            <para>Otherwise tags are simply applied by checking the respective boxes in the tree. </para>
-           <note><para>In case you have selected a number of images in the main view and you check a tag in the tag tree, this one is only applied to the highlighted image, and not to the whole selection. If you want to tag selections, refer to the <link linkend="using-kapp-sidebartagfilters">Tagfilters</link> section. </para></note>
+           <note><para>In case you have selected a number of images in the main view and you check a tag in the tag tree, this one is only applied to the highlighted image, and not to the whole selection. If you want to tag selections, refer to the <link linkend="using-tdeApp-sidebartagfilters">Tagfilters</link> section. </para></note>
 
         </sect2>
 
 
-        <sect2 id="using-kapp-sidebartagfilters">
+        <sect2 id="using-tdeApp-sidebartagfilters">
         <title>Tagfilters</title>
            <para>The tag filter side bar is used to modify the set of images displayed in the main window view. Normally one uses the left side bar with its Album, Date, Tag and Searches view. When additionally one or more tags on right side bar tag filter is checked, only the cross-section of these two selections will be displayed. All ceated tags are available. </para>
            <para>To give an example, suppose you have a tag called 'public' which tagges all images except your private ones. Then you can check this 'public' tag in the right side bar to hide the private pictures (all htose not having 'public' tag). Whatever view mode you chose from the left side bar, 'public' only picture will be displayed. Another typical example is the selection of a subset of tags in a hierarchical tree. Suppose you want to display 'red' and 'green' from a tag tree containing 7 different colors as sub-tags. Simply click on the 'color' tag of the main view and check 'red' and 'green' from the right side bar. </para>
@@ -978,16 +978,16 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
 
     </sect1>
     
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>Usar una cámara digital con &digikam;</title>
     <anchor id="camerainterface.anchor"/>
 
         <sect2>
         <title>Introducción al interfaz de la cámara</title>
 
-            <para>La herramienta Cámara le permite descargar sus fotografías directamente desde su cámara a un álbum &digikam;. Puede acceder a la herramienta Cámara pulsando en el menú cámara y seleccionándolo de la lista de cámaras configuradas. Consulte la <link linkend="setupcamera">sección de configuración de la cámara</link> en el manual de instrucciones sobre cómo configurar &digikam; para que funcione con su cámara. Si desea tener más información sobre cómo soporta &digikam; las cámaras digitales, eche un vistazo a <link linkend="using-kapp-camerasupport">esta sección</link>. </para>
+            <para>La herramienta Cámara le permite descargar sus fotografías directamente desde su cámara a un álbum &digikam;. Puede acceder a la herramienta Cámara pulsando en el menú cámara y seleccionándolo de la lista de cámaras configuradas. Consulte la <link linkend="setupcamera">sección de configuración de la cámara</link> en el manual de instrucciones sobre cómo configurar &digikam; para que funcione con su cámara. Si desea tener más información sobre cómo soporta &digikam; las cámaras digitales, eche un vistazo a <link linkend="using-tdeApp-camerasupport">esta sección</link>. </para>
 
-            <para>The Camera Interface is not the only way to get your photographs into &digikam;. See the <link linkend="using-kapp-addphototoalbum">Adding a photograph to an Album</link> section for a description of how to add photographs that are already on your hard disk. </para>
+            <para>The Camera Interface is not the only way to get your photographs into &digikam;. See the <link linkend="using-tdeApp-addphototoalbum">Adding a photograph to an Album</link> section for a description of how to add photographs that are already on your hard disk. </para>
             
             <para>Para poder utilizar una cámara digital con &digikam;, conecte la cámara a su ordenador, cambie la cámara al modo mostrar imagen y enciéndala. Puede encontrar más ayuda en el manual que se incluye con su cámara. </para>
         
@@ -1029,7 +1029,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
         <title>Seleccionar un ábum de destino</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>Si utiliza los botones <guilabel>Descargar todo</guilabel> o <guilabel>Descargar seleccionadas</guilabel> aparecerá un diálogo que le permitirá seleccionar el álbum en el que se descargarán las fotografías. Se mostrará la lista de los álbumes existentes, ordenados por el método de la carpeta (consulte la <link linkend="using-kapp-myalbumsview">vista Mis álbumes</link> para obtener detalles sobre la ordenación de los álbumes). Puede seleccionar el álbum de destino desde esta lista y pulsar Aceptar. </para>
+            <para>Si utiliza los botones <guilabel>Descargar todo</guilabel> o <guilabel>Descargar seleccionadas</guilabel> aparecerá un diálogo que le permitirá seleccionar el álbum en el que se descargarán las fotografías. Se mostrará la lista de los álbumes existentes, ordenados por el método de la carpeta (consulte la <link linkend="using-tdeApp-myalbumsview">vista Mis álbumes</link> para obtener detalles sobre la ordenación de los álbumes). Puede seleccionar el álbum de destino desde esta lista y pulsar Aceptar. </para>
         
             <figure>
                 <title>The Target Album Selection Dialog</title>
@@ -1090,7 +1090,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             <sect3>
             <title>Rotación automática</title>
 
-                <para>&digikam; can use any information about the orientation of the camera in the moment the photograph was taken for automatic rotation of the photograph when it is downloaded. Not all cameras include this informations. See the <link linkend="using-kapp-sidebarmetadata">Photograph Meta-Data, Properties and Histogram</link> section for more detail about informations that your camera may have embedded in your photographs. </para>
+                <para>&digikam; can use any information about the orientation of the camera in the moment the photograph was taken for automatic rotation of the photograph when it is downloaded. Not all cameras include this informations. See the <link linkend="using-tdeApp-sidebarmetadata">Photograph Meta-Data, Properties and Histogram</link> section for more detail about informations that your camera may have embedded in your photographs. </para>
 
                 <para>This automatic rotation is switched on by default, and if your camera does not include the information, &digikam; will leave the photograph in its original orientation. If you would like to switch the automatic rotation off, click the <guilabel>Advanced</guilabel> button and deselect the <guilabel>Auto Orient</guilabel> option at the bottom of the window. </para>
             
@@ -1099,7 +1099,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             <sect3>
             <title>Creación automática de álbumes de destino</title>
                 
-                <para>If your camera provides information about the date of the photograph's taking, &digikam; can use this to automatically create sub-albums in the destination Album when it is downloaded. Sub-albums names will be based on image dates. All images which have the same date will be downloaded into the same sub-album. Not all cameras include this information. See the <link linkend="using-kapp-imagemetadata"> Photograph Meta-Data, Properties and Histogram</link> section for more detail about information your camera may have embedded in your photographs. </para>
+                <para>If your camera provides information about the date of the photograph's taking, &digikam; can use this to automatically create sub-albums in the destination Album when it is downloaded. Sub-albums names will be based on image dates. All images which have the same date will be downloaded into the same sub-album. Not all cameras include this information. See the <link linkend="using-tdeApp-imagemetadata"> Photograph Meta-Data, Properties and Histogram</link> section for more detail about information your camera may have embedded in your photographs. </para>
                 
                 <para>Esta opción está desactivada de forma predeterminada y en este caso &digikam; descargará las fotografías en la raíz de los álbumes de destino. Si desea activar esta opción pulse el botón <guilabel>Avanzada</guilabel> y seleccione la opción <guilabel>Descargar las fotos automáticamente</guilabel> en la parte inferior de la ventana. </para>
 
@@ -1109,7 +1109,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                                     
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>Editor de imágenes &digikam;</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -1218,16 +1218,16 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
         <sect2>
         <title>Image Properties</title>
             
-            <sect3 id="using-kapp-commentsedittool">
+            <sect3 id="using-tdeApp-commentsedittool">
             <title>Comments Editing Tool</title>
                 
                 <anchor id="commentsedittool.anchor"/>
 
-                <para>You can view some of the properties of your photograph by selecting the options in the <guilabel>Image</guilabel> menu. You can edit the comments set for this photograph using <menuchoice><guimenu>Image</guimenu><guimenuitem>Edit Comments and Tags</guimenuitem></menuchoice>. The new Comments and Tags will be remembered when you close the photograph, even if you do not save the photograph first. For more informations about Comments and Tags dialog, please see <link linkend="using-kapp-tagscommentsedit">Editing Tags and Comments</link> section. </para>
+                <para>You can view some of the properties of your photograph by selecting the options in the <guilabel>Image</guilabel> menu. You can edit the comments set for this photograph using <menuchoice><guimenu>Image</guimenu><guimenuitem>Edit Comments and Tags</guimenuitem></menuchoice>. The new Comments and Tags will be remembered when you close the photograph, even if you do not save the photograph first. For more informations about Comments and Tags dialog, please see <link linkend="using-tdeApp-tagscommentsedit">Editing Tags and Comments</link> section. </para>
             
             </sect3>
     
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>EXIF Viewer Tool</title>
             
                 <anchor id="kexif.anchor"/>
@@ -1235,7 +1235,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                 <sect4>
                 <title>¿Qué es EXIF?</title>
                     
-                    <para>EXIF stands for <emphasis>EXtended Interchange Format</emphasis>. It was designed specifically for digital cameras. It allows a large amount of information about the photograph to be stored. Those informations are describing the camera which took the image along with the settings (including date and time) in use when the picture was taken. Also it allows an inline thumbnail to be included. See the <link linkend="using-kapp-imagemetadata">Photograph Meta-Data and Properties</link> section for more detail about information embedded data in your photographs. </para>
+                    <para>EXIF stands for <emphasis>EXtended Interchange Format</emphasis>. It was designed specifically for digital cameras. It allows a large amount of information about the photograph to be stored. Those informations are describing the camera which took the image along with the settings (including date and time) in use when the picture was taken. Also it allows an inline thumbnail to be included. See the <link linkend="using-tdeApp-imagemetadata">Photograph Meta-Data and Properties</link> section for more detail about information embedded data in your photographs. </para>
 
                     <para>EXIF format contains different marker sections named <emphasis>Image File Directories</emphasis> (IFD). The sections likely to be found in a normal EXIF file are as follows: <itemizedlist>
             
@@ -1275,7 +1275,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>File Properties Tool</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -1284,14 +1284,14 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Visor del histograma</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>If you are interested in the detailed histogram of your photograph you can view it using <menuchoice><guimenu>Image</guimenu> <guimenuitem>Properties</guimenuitem></menuchoice> and <guilabel>Histogram</guilabel> page. The histogram for a image shows the amount of each color that is present and their different amplitudes within the image. If your photograph has a color cast you might be able to see what is wrong by looking at the histogram. </para>
             
-                <para>The Histogram Viewer shows you informations about the statistical distribution of color values in the current image. It is purely informational: nothing you do with it will cause any change to the image. If you want to perform a histogram-based color correction, use the Adjust Levels Image Editor plugin. This plugin is part of the <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigikamImagePlugins project</ulink>. For more information about using Plugins in &digikam; see the <link linkend="using-kapp-setup">Configuration</link> section. </para>
+                <para>The Histogram Viewer shows you informations about the statistical distribution of color values in the current image. It is purely informational: nothing you do with it will cause any change to the image. If you want to perform a histogram-based color correction, use the Adjust Levels Image Editor plugin. This plugin is part of the <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigikamImagePlugins project</ulink>. For more information about using Plugins in &digikam; see the <link linkend="using-tdeApp-setup">Configuration</link> section. </para>
                                                 
                 <figure>
                     <title>The Histogram Viewer in Action</title>
@@ -1332,7 +1332,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Cómo utilizar un histograma</title>
                 
                 <para>Histograms are a graphical means to assess the accuracy of an image shown on the screen. The graph represents the 3 regions of the photograph brightness: <itemizedlist> <listitem><para> (1) : the shadows-tone on the left. </para></listitem> <listitem><para> (2) : the middle-tone on the middle. </para></listitem> <listitem><para> (3) : the highlights-tone on the right. </para></listitem> </itemizedlist> <figure> <title>An Image Histogram in All Colors Mode</title> <graphic srccredit="An Image Histogram in All Colors Mode" fileref="editorhistogramdescription.png"/> </figure> The distribution of the graph, where the spikes and bulges are clustered, indicates whether the image is too dark, too bright, or well-balanced. </para>
@@ -1345,19 +1345,19 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
 
                 <para>Importante: no todas las fotografías han de tener este pico en la parte central de su histograma. En gran medida depende de lo que trate la fotografía. En algunos casos, puede ser correcto que el histograma tenga picos a uno u otro lado, o en ambos. </para>
                         
-                <para>El histograma es una forma fiable de decidir si una fotografía está o no correctamente expuesta. El histograma debería mostrar una sobre o subexposición, y podría utilizar una <link linkend="using-kapp-correctingexposure">herramienta de corrección de exposición</link> para corregir la fotografía. </para>
+                <para>El histograma es una forma fiable de decidir si una fotografía está o no correctamente expuesta. El histograma debería mostrar una sobre o subexposición, y podría utilizar una <link linkend="using-tdeApp-correctingexposure">herramienta de corrección de exposición</link> para corregir la fotografía. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Ajustar una fotografía</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Recortar una fotografía</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Recorte manual</title>
 
                     <para>Cropping a photograph is not only a common operation, but an often underestimated photographer's tool to compose an image. The Image Editor makes it very easy. To crop a photograph simply drag a rectangle over the image by holding down the left mouse button and moving the mouse. You will see a wire frame rectangle appear as you move the mouse. </para>
@@ -1374,7 +1374,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Recorte proporcional</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -1443,7 +1443,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                                 
                 </sect4>
             
-                <sect4 id="using-kapp-compositionguides">
+                <sect4 id="using-tdeApp-compositionguides">
                 <title>Consejos de composición</title>
 
                     <para>La primera que vez se observa una imagen, los ojos raramente se fijan en el centro de la imagen, moviéndose de la parte superior izquierda hacia la derecha y a continuación de la parte inferior izquierda a la derecha nuevamente. Este patrón es en su mayor parte inconsciente, pero está bien documentado. Probablemente esté asociado con el modelo de lectura occidental. Desde el punto de vista de los fotógrafos, el objetivo pasa por guiar la vista del observador, dando mayor importancia a la forma en que la gente percibe una imagen. </para>                                                                                
@@ -1552,7 +1552,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Redimensionar una fotografía</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -1568,7 +1568,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Rotar o invertir una fotografía</title>
                 
                 <para>Si la fotografía muestra una orientación incorrecta puede ser necesario <guilabel>Invertir</guilabel> o <guilabel>Rotar</guilabel> la imagen para corregir la orientación utilizando las opciones disponibles en el menú <menuchoice><guimenu>Transformar</guimenu> <guimenuitem>Rotar</guimenuitem></menuchoice> y <menuchoice><guimenu>Transformar</guimenu> <guimenuitem>Invertir</guimenuitem></menuchoice>. </para>
@@ -1577,7 +1577,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Corregir los ojos rojos en una fotografía</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1594,7 +1594,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Ajuste del enfoque</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1691,7 +1691,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Corrección de color</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1733,7 +1733,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             <para>No se recordarán los resultados de cualquier ajuste a menos que guarde su fotografía. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Corrección de la exposición</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1890,7 +1890,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>Configuración de &digikam;</title>
 
         <sect2 id="setupdialog">
@@ -1912,7 +1912,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
                                     
                 <para>La <guilabel>Ruta a la biblioteca de álbumes</guilabel> es la dirección de su disco duro donde &digikam; guardará todos los álbumes. Si cambia esta dirección sin mover manualmente todos los álbumes en el disco duro, &digikam; pensará que no hay álbumes y generará una nueva base de datos en la nueva dirección. Sus álbumes antiguos no sufrirán ninguna modificación pero necesitará cambiar la Ruta a la biblioteca de álbumes nuevamente a la antigua dirección para poder acceder a los mismos. Sino está seguro de lo que está haciendo es mejor que no cambie esta dirección. </para>            
                 
-                <para>La opción <guilabel>Miniaturas</guilabel> se describe en la sección <link linkend="using-kapp-imageview">Imágenes</link>. </para> 
+                <para>La opción <guilabel>Miniaturas</guilabel> se describe en la sección <link linkend="using-tdeApp-imageview">Imágenes</link>. </para> 
                 
                 <para>Las demás configuraciones de este diálogo son autoexplicativas. </para> 
                             
@@ -1941,7 +1941,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             <sect3 id="setupcollection">
             <title>Preferencias de las colecciones</title>
     
-                <para>Éste diálogo administra sus tipos de colección. Las colecciones de álbumes se describen con detalle en la sección <link linkend="using-kapp-myalbumsview">Mis álbumes</link>. </para>
+                <para>Éste diálogo administra sus tipos de colección. Las colecciones de álbumes se describen con detalle en la sección <link linkend="using-tdeApp-myalbumsview">Mis álbumes</link>. </para>
     
                 <figure>
                     <title>The Collection Settings</title>
@@ -2036,7 +2036,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
             <sect3 id="setupmisc">
             <title>Varias configuraciones</title>
     
-                <para>Aquí puede controlar cómo se comportará &digikam; cuando se borra una fotografía o un álbum. Consulte las secciones <link linkend="using-kapp-deleteimage">borrar una fotografía</link> y <link linkend="using-kapp-deletealbum">borrar un álbum</link> para obtener más detalles. </para>
+                <para>Aquí puede controlar cómo se comportará &digikam; cuando se borra una fotografía o un álbum. Consulte las secciones <link linkend="using-tdeApp-deleteimage">borrar una fotografía</link> y <link linkend="using-tdeApp-deletealbum">borrar un álbum</link> para obtener más detalles. </para>
                 
                 <para>También puede desactivar la aparición de la pantalla de inicio cuando se carga &digikam;. Puede reducir ligeramente el tiempo de carga de &digikam;. </para>
     
@@ -3242,7 +3242,7 @@ add Exif.GPSInfo.GPSTrackRef Ascii "Ta Phrom, Siem Reap, Cambodia"</screen></blo
 <appendix id="installation">
 <title>Instalación</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Cómo conseguir &digikam;</title>
 
 <para>El sitio web de &digikam; se encuentra en <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Visítelo periódicamente para obtener noticias sobre &digikam;. &digikam; se puede obtener en formatos binario y fuente de <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/et/digikam/index.docbook b/doc/et/digikam/index.docbook
index e402d989..a8565dfa 100644
--- a/doc/et/digikam/index.docbook
+++ b/doc/et/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Estonian  "INCLUDE"><!-- change language only here -->
   <!ENTITY digikam '<application>digiKam</application>'>
@@ -83,10 +83,10 @@
 <chapter id="introduction">
 <title>Sissejuhatus</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Taust</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>&digikam;i info</title>
 
        <para>&digikam; on KDE töölaua võimas digifotode haldamise rakendus. Selle lihtne liides muudab digifotode importimise ja korraldamise imelihtsaks. &digikam; võimaldab hallata ka väga paljusid digifotosid, paigutades need albumitesse, ning pilte korraldada, omistades neile sildid, mis muudab hiljem vajalike fotode leidmise väga lihtsaks. Piltide vaatamise, korraldamise ja jagamise kõrval saab neid ka mitmel moel töödelda. </para>
@@ -127,7 +127,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Alustamine</title>
 
         <anchor id="firstrundialog.anchor"/>
@@ -141,15 +141,15 @@
 
         <para>Kui sul on juba kõvakettal fotokogu olemas, võid antud kataloogi sisestada albumiteegi kataloogina. &digikam; käsitleb kõiki selle kataloogi alamkatalooge omaette albumitena. Ühtegi fotot sellega seoses ei muudeta. </para>
 
-        <para>Kui määrad albumiteegi kataloogiks olemasoleva fotode kataloogi, näed, et "Minu albumite" nimekirjas pole albumitel ikoonideks fotosid. Kui vaatad mõnda albumit esimest korda, loob &digikam; antud albumi esimese foto põhjal pisipildi ja kasutab seda edaspidi albumi ikoonina. Sellest, kuidas muuta albumi ikooni, räägib lähemalt osa <link linkend="using-kapp-myalbumsview">Minu album</link>. </para>
+        <para>Kui määrad albumiteegi kataloogiks olemasoleva fotode kataloogi, näed, et "Minu albumite" nimekirjas pole albumitel ikoonideks fotosid. Kui vaatad mõnda albumit esimest korda, loob &digikam; antud albumi esimese foto põhjal pisipildi ja kasutab seda edaspidi albumi ikoonina. Sellest, kuidas muuta albumi ikooni, räägib lähemalt osa <link linkend="using-tdeApp-myalbumsview">Minu album</link>. </para>
 
-        <para>Kui oled oma fotokogu varem kasutanud mõne muu rakendusega, mis on tekitanud pisipildid mittestandardsetesse alamkataloogidesse, näitab &digikam; neid pisipildikatalooge omaette albumitena. Pisipildikataloogide osas järgib &digikam; <ulink url="http://www.freedesktop.org/">freedesktop.org-i</ulink> standardit. Mittestandardset pisipildikataloogi ei saa "Minu albumite"nimekirjas kuidagi varjata. Kui soovid need säilitada, loo albumikogu, mis sisaldab kõiki pisipildikatalooge ning vaata seejärel oma albumeid kogude järgi sordituna. Albumikogudest räägib lähemalt osa <link linkend="using-kapp-myalbumsview">Minu album</link>. </para>
+        <para>Kui oled oma fotokogu varem kasutanud mõne muu rakendusega, mis on tekitanud pisipildid mittestandardsetesse alamkataloogidesse, näitab &digikam; neid pisipildikatalooge omaette albumitena. Pisipildikataloogide osas järgib &digikam; <ulink url="http://www.freedesktop.org/">freedesktop.org-i</ulink> standardit. Mittestandardset pisipildikataloogi ei saa "Minu albumite"nimekirjas kuidagi varjata. Kui soovid need säilitada, loo albumikogu, mis sisaldab kõiki pisipildikatalooge ning vaata seejärel oma albumeid kogude järgi sordituna. Albumikogudest räägib lähemalt osa <link linkend="using-tdeApp-myalbumsview">Minu album</link>. </para>
 
-        <para>Kui oled määranud albumiteegi kataloogi, saad panna &digikam;i kasutama ka oma digikaamerat. Seejärel tasuks selgeks teha, kuidas hallata oma fotoalbumeid võimalusi <link linkend="using-kapp-myalbumsview">Minu albumid</link> ja <link linkend="using-kapp-mytagsview">Minu sildid</link> kasutades. </para> 
+        <para>Kui oled määranud albumiteegi kataloogi, saad panna &digikam;i kasutama ka oma digikaamerat. Seejärel tasuks selgeks teha, kuidas hallata oma fotoalbumeid võimalusi <link linkend="using-tdeApp-myalbumsview">Minu albumid</link> ja <link linkend="using-tdeApp-mytagsview">Minu sildid</link> kasutades. </para> 
                         
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Toetatud pildifailide vormingud</title>
 
         <sect2>
@@ -157,9 +157,9 @@
 
         <para>Peaaegu kõik digikaamerad salvestavad fotod kas JPEG- või TIFF-vormingus. Paljud kaamerad lubavad sul endal valida, millist vormingut kasutada. JPEG on tihendatud vorming, milles faili väiksuse nimel on ohverdatud mõnevõrra pildi kvaliteeti. TIFF ei kasuta tihendust ning on väga kvaliteetne, kuid samas on failid üsna suured. Täpsemalt kirjeldab neid failivorminguid <ulink url="http://en.wikipedia.org/wiki/Graphics_file_format">Wikipedia</ulink>. &digikam; toetab mõlemat vormingut. </para>
 
-        <para>PNG-vorming töötati välja vanemate, 1990. aastatel veel laialdaselt kasutusel olnud pildifailivormingute asendamiseks. See on kadudeta nagu TIFF, kuid märksa kompaktsem ja väiksem. Kuigi sinu kaamera usutavasti PNG-d otseselt ei toeta, teisendavad paljud oma pildid PNG-vormingusse niipea, kui nad on fotod arvutisse tõmmanud. Erinevalt JPEG-piltidest ei kaota PNG-pildid kvaliteedis ka siis, kui neid muutmise järel uuesti kodeeritakse. &digikam; toetab täielikult PNG-pilte ning pakktöötluse pluginatega võib isegi väga erinevates vormingutes pilte ühekorraga PNG-vormingusse teisendada. Pluginate kasutamisest &digikam;is kõneleb lähemalt osa <link linkend="using-kapp-setup">Seadistamine</link>. PNG-vormingust räägib pikemalt <ulink url="http://www.libpng.org/pub/png/">PNG kodulehekülg</ulink>. </para>
+        <para>PNG-vorming töötati välja vanemate, 1990. aastatel veel laialdaselt kasutusel olnud pildifailivormingute asendamiseks. See on kadudeta nagu TIFF, kuid märksa kompaktsem ja väiksem. Kuigi sinu kaamera usutavasti PNG-d otseselt ei toeta, teisendavad paljud oma pildid PNG-vormingusse niipea, kui nad on fotod arvutisse tõmmanud. Erinevalt JPEG-piltidest ei kaota PNG-pildid kvaliteedis ka siis, kui neid muutmise järel uuesti kodeeritakse. &digikam; toetab täielikult PNG-pilte ning pakktöötluse pluginatega võib isegi väga erinevates vormingutes pilte ühekorraga PNG-vormingusse teisendada. Pluginate kasutamisest &digikam;is kõneleb lähemalt osa <link linkend="using-tdeApp-setup">Seadistamine</link>. PNG-vormingust räägib pikemalt <ulink url="http://www.libpng.org/pub/png/">PNG kodulehekülg</ulink>. </para>
 
-        <para>Mõned, enamasti kallimad kaamerad lubavad salvestada pilte toorvormingus (RAW). See ei ole õigupoolest standardne pildivorming ning võib kaamerati erineda. Toorvorming sisaldab kõiki kaamera pildisensorite andmeid enne seda, kui kaamera tarkvara hakkab neid töötlema, täpsustades valge tasakaalu ja muid seadistusi. Suur osa professionaalseid fotograafe kasutab toorpilte, sest need võimaldavad fotodega kõige rohkem manipuleerida. Toorpiltide miinuseks on aga nende tõesti väga suur suurus. Toorpildivormingust kõneleb lähemalt veebilehekülg <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml"> The Luminous Landscape</ulink>. Toorpilte saab &digikam;is teisendada JPEG- või TIFF-vormingusse toorpilti teisendamise pluginaga. Pluginate kasutamisest &digikam;is kõneleb lähemalt osa <link linkend="using-kapp-setup">Seadistamine</link>. </para>
+        <para>Mõned, enamasti kallimad kaamerad lubavad salvestada pilte toorvormingus (RAW). See ei ole õigupoolest standardne pildivorming ning võib kaamerati erineda. Toorvorming sisaldab kõiki kaamera pildisensorite andmeid enne seda, kui kaamera tarkvara hakkab neid töötlema, täpsustades valge tasakaalu ja muid seadistusi. Suur osa professionaalseid fotograafe kasutab toorpilte, sest need võimaldavad fotodega kõige rohkem manipuleerida. Toorpiltide miinuseks on aga nende tõesti väga suur suurus. Toorpildivormingust kõneleb lähemalt veebilehekülg <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml"> The Luminous Landscape</ulink>. Toorpilte saab &digikam;is teisendada JPEG- või TIFF-vormingusse toorpilti teisendamise pluginaga. Pluginate kasutamisest &digikam;is kõneleb lähemalt osa <link linkend="using-tdeApp-setup">Seadistamine</link>. </para>
 
         </sect2>
 
@@ -176,13 +176,13 @@
 
         <para>Sõltuvus teistest teekidest tähendab, et me ei saa anda täielikku nimekirja, millised pildivormingud on just sinu süsteemis toetatud. Üldiselt peaks olema alati toetatud vähemalt JPEG-, PNG- ja TIFF-vorming. </para>
 
-        <para>&digikam; näitab ainult selliseid faile, mille vorming on talle arusaadav. Selleks uuritakse faili laiendeid ja kontrollitakse neid etteantud nimekirjaga. Kui faililaiend on nimekirjas, näitab &digikam; vastavat faili pildivaates. Faililaiendite nimekirja, mida &digikam; kasutab, saab ka muuta - sellest kõneleb lähemalt osa <link linkend="using-kapp-setup">Seadistamine</link>. </para>
+        <para>&digikam; näitab ainult selliseid faile, mille vorming on talle arusaadav. Selleks uuritakse faili laiendeid ja kontrollitakse neid etteantud nimekirjaga. Kui faililaiend on nimekirjas, näitab &digikam; vastavat faili pildivaates. Faililaiendite nimekirja, mida &digikam; kasutab, saab ka muuta - sellest kõneleb lähemalt osa <link linkend="using-tdeApp-setup">Seadistamine</link>. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Toetatud pluginad</title>
 
         <para>Üks vahvamaid &digikam;i omadusi on selle hõlpus laiendamine pluginate abil. Praegu saab kasutada kaht pluginaarhitektuuri: <itemizedlist><listitem><para><emphasis>Kipi pluginad</emphasis>: <ulink url="http://extragear.kde.org/apps/kipi">KDE pildipluginate liidese projekt</ulink> kujutab endast katset töötada välja ühtne pluginastruktuur rakendustele &digikam;, <application>KimDaBa</application>, <application>ShowImg</application> ja <application>Gwenview</application>. Selle siht on luua kõigile graafikarakendustele ühised pildipluginad. Kipi pluginatest kõneleb lähemalt käsiraamatu <link linkend="setupkipi">vastav osa</link>.</para></listitem> <listitem><para><emphasis>Pildiredaktori pluginad</emphasis>: need pluginad lisavad töötlusvõimalusi &digikam;i pildiredaktorile. <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projekti</ulink> eesmärk on pakkuda välja valik tööriistu just redaktori tarbeks. Pildiredaktori pluginatest räägib lähemalt käsiraamatu <link linkend="setupeditor">vastav osa</link>. </para></listitem> </itemizedlist> Pluginad võimaldavad pildiga ette võtta peaaegu kõike, mis sul vähegi pähe tuleb. Nende eeliseks on asjaolu, et märksa lihtsam on &digikam;ile uusi võimalusi lisada pisikesi pluginaid kirjutades kui &digikam;i enda põhikoodi muutes. </para>
@@ -193,14 +193,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>&digikam;i kasutamine</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>&digikam;i peaaken</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Peaakna tutvustus</title>
 
             <para>
@@ -252,28 +252,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>"Minu albumid"</title>
 
             <para>Nimekiri "Minu albumid" näitab sinu pilte albumitesse korraldatult. Kõik pildid, millega &digikam; tegeleb, salvestatakse albumisse. Albumeid saab sortida nende aluseks oleva kataloogi, albumi omadustes määratud kogu nime või albumite loomisaja järgi (ka viimast omadust saab albumi omaduste dialoogis muuta). </para>
             
             <para>Sortimisjärjekorda saab muuta akna ülaosas paikneval tööriistaribal vastavat hüpiknimekirja kasutades. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Uue albumi loomine</title>
                 
                 <para>Uut albumit saab luua mitmel moel. Selle võib luua kaameraliideses, kui laadid kaamerast uusi fotosid. Sa võid luua ka tühja albumi, klõpsates tööriistaribal nupule <guilabel>Uus album</guilabel>. Lisaks võib uue albumi luua kõvakettal juba olemasolevat fotode kataloogi importides. Selleks vali menüükäsk <menuchoice><guimenu>Album</guimenu><guimenuitem>Impordi</guimenuitem><guimenuitem>Impordi kataloogid</guimenuitem></menuchoice> ning seejärel kataloog, mida soovid importida. Seejärel luuakse kataloogiga sama nime kandev album. Kataloogi võib importida ka lohistades. Selleks lohista kataloogi ikoon näiteks <application>Konqueror</application>ist albumite nimekirja. Seejärel ilmub menüü, kus saad valida, kas kataloog &digikam;i lihtsalt kopeerida või kogu täiega sinna liigutada. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Albumi kustutamine</title>
                 
                 <para>Kui kustutad &digikam;is albumi, visatakse see KDE prügikasti. Soovi korral võid seda muuta ning määrata, et kustutamisel hävitatakse kogu album ja selles olevad pildid kohe täielikult. Selleks vali menüükäsk <menuchoice><guimenu>Seadistused</guimenu><guimenuitem>&digikam;i seadistamine</guimenuitem></menuchoice> ning ilmuvas dialoogis kaart Muud. Selle ülaosas on valikud, millega saab määrata, mida võetakse ette foto kustutamisel. Albumi kustutamiseks klõpsa vaates "Minu album" hiire parema nupuga albumi nimele ja vali kontekstimenüüst käsk Kustuta album kõvakettalt. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Foto lisamine albumisse</title>
                 
                 <para>Tihtipeale luuakse uus album koos fotodega kaameraliideses vahetult digikaamerast pilte laadides. Kuid vahel võib tekkida vajadus või soov lisada olemasolevasse albumisse foto, mis asub kuskil mujal arvutis. Foto lisamiseks albumisse vali kõigepealt album. Seejärel klõpsa tööriistaribal nupule <guilabel>Lisa pildid</guilabel> või vali menüükäsk <menuchoice><guimenu>Album</guimenu><guimenuitem>Impordi</guimenuitem><guimenuitem>Lisa pildid</guimenuitem></menuchoice>. Vali failidialoogis vajalik pilt või pildid ning klõpsa nupule <guilabel>Ava</guilabel>. Fotod kopeeritakse albumisse. Soovi korral võib fotod albumisse ka lohistada. Selle lohista fotode ikoonid näiteks <application>Konqueror</application>ist paremal asuvasse piltide nimekirja. </para>
@@ -282,14 +282,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Fotode liigutamine või kopeerimine albumist albumisse</title>
                 
                 <para>Foto kopeerimiseks või liigutamiseks albumist albumisse lohista lihtsalt vajalik foto ühest albumist teise. Seejärel ilmub menüü, mis pakub välja foto <guilabel>liiguta</guilabel>mise või <guilabel>kopeeri</guilabel>mise. Samamoodi võib liigutada ka palju fotosid korraga: vali lihtsalt kõik fotod, mida soovid liigutada, ja lohista need sihtalbumisse. </para>
         
             </sect3>            
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Albumite haldamine</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -318,7 +318,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Albumi ikooni määramine</title>
                 
                 <para>Albumit esimest korda vaadates määrab &digikam; albumi esimese pildi esindama kogu albumit "Minu albumite" nimekirjas. See aitab sul paremini näha, millised fotod antud albumis leiduvad. Vahel ei pruugi aga albumi esimene foto just kõige paremini iseloomustada albumi sisu ning sa soovid valida albumile mõne muu ikooni. </para> 
@@ -327,7 +327,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Märkused albumikogude kohta</title>
                 
                 <para>Album saab paikneda ainult ühes albumikogus ning albumikogusid ei saa seada teiste albumikogude sisse. </para>
@@ -338,7 +338,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Pildivaade</title>
 
             <sect3>
@@ -354,7 +354,7 @@
             
                 <para>Infot piltide kohta näeb pisipiltide all. Seda, millist infot seal näidatakse, saad seadistustedialoogis (<menuchoice> <guimenu>Seadistused</guimenu> <guimenuitem>&digikam;i seadistamine</guimenuitem> </menuchoice>): vali albumite kaart, kus paikneb sektsioon <guilabel>Lisainfo pisipildivaates</guilabel>. </para> 
 
-                <para>Pisipiltidel on ka kohtspikrid, mida näeb siis, kui jätta hiir hetkeks pisipildi kohal seisma. Kohtspikrid annavad teada foto kõige olulisemad omadused, sealhulgas kõik selle sildid, mida sa oled määranud. Seda, milline kohtspikker võib välja näha, näitab pilt eespool osas <link linkend="using-kapp-mainwindow-intro">Peaakna tutvustus</link>. </para>
+                <para>Pisipiltidel on ka kohtspikrid, mida näeb siis, kui jätta hiir hetkeks pisipildi kohal seisma. Kohtspikrid annavad teada foto kõige olulisemad omadused, sealhulgas kõik selle sildid, mida sa oled määranud. Seda, milline kohtspikker võib välja näha, näitab pilt eespool osas <link linkend="using-tdeApp-mainwindow-intro">Peaakna tutvustus</link>. </para>
 
             </sect3>
 
@@ -365,14 +365,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Foto vaatamine</title>
              
-                <para>Pildiredaktori saab vajaliku fotoga avada foto pisipildil topeltklõpsu tehes või pisipildile hiire parema nupuga klõpsates ning kontekstimenüüst käsku <guilabel>Vaata/muuda</guilabel> valides. Fotode redigeerimisest kõneleb lähemalt osa <link linkend="using-kapp-imageeditor">&digikam;i pildiredaktor</link>. </para>
+                <para>Pildiredaktori saab vajaliku fotoga avada foto pisipildil topeltklõpsu tehes või pisipildile hiire parema nupuga klõpsates ning kontekstimenüüst käsku <guilabel>Vaata/muuda</guilabel> valides. Fotode redigeerimisest kõneleb lähemalt osa <link linkend="using-tdeApp-imageeditor">&digikam;i pildiredaktor</link>. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Foto vaatamine või redigeerimine mõnes muus rakenduses</title>
 
                 <para>Vahel ei pruugi &digikam; pakkuda kõiki võimalusi, mida sa vajad. Foto saab avada mõnes muus rakenduses, kui teha sellel klõps hiire parema nupuga ja valida kontekstimenüüst <guilabel>Ava kasutades</guilabel> alt vajalik rakendus. Rakenduste nimekirja selles alammenüüs kontrollib KDE standardsete failiseoste määratlus antud pildivormingu tüübi kohta. KDE käsiraamatus leiad täpsemad juhised, kuidas muuta failiseoseid, kui sulle vajalikku rakendust ei peaks alammenüüs leiduma. </para>
@@ -381,7 +381,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Foto pööramine</title>
              
                 <note><para>Pööramiseks on vajalik Kipi JPEG Lossless plugin. Kui see ei ole paigaldatud, saad muidugi fotosid pöörata, aga pead seda tegema pildiredaktoris. Pildiredaktor kasutab pööramiseks teistsugust meetodit ja kuigi sa ei pruugi erinevust tähele panna, võib teatud fotodel pildiredaktori meetodit kasutades tekkida kadusid. Siinkirjeldatud pööramismeetodi puhul kasutatakse Kipi JPEG Lossless pluginat, mille korral originaalpildis mingeid kadusid ei teki. </para></note>
@@ -394,10 +394,10 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-imagemetadata">
+            <sect3 id="using-tdeApp-imagemetadata">
             <title>Foto metaandmed, omadused ja histogramm</title>
 
-                <sect4 id="using-kapp-tagscommentsedit">
+                <sect4 id="using-tdeApp-tagscommentsedit">
                 <title>Siltide ja kommentaaride muutmine</title>
             
                     <anchor id="tagscommentsedit.anchor"/>
@@ -419,7 +419,7 @@
 
                 </sect4>                    
                 
-                <sect4 id="using-kapp-propertiesmetadatahistogram">
+                <sect4 id="using-tdeApp-propertiesmetadatahistogram">
                 <title>Omaduste, metaandmete ja histogrammi vaatamine</title>
             
                     <anchor id="propertiesmetadatahistogram.anchor"/>
@@ -434,7 +434,7 @@
                         fileref="imageproperties3.png"/>
                     </figure>
                 
-                    <para>Selles dialoogis näeb EXIF-näitaja pakutavat infot (EXIF-info näitajast räägib lähemalt <link linkend="using-kapp-exifviewertool">vastav osa</link>). </para>
+                    <para>Selles dialoogis näeb EXIF-näitaja pakutavat infot (EXIF-info näitajast räägib lähemalt <link linkend="using-tdeApp-exifviewertool">vastav osa</link>). </para>
                     
                     <figure>
                         <title>Pildi omaduste dialoog EXIF-infoga</title>
@@ -442,7 +442,7 @@
                         fileref="imageproperties2.png"/>
                     </figure>
                                     
-                    <para>Selles dialoogis näeb pildi histogrammi. Histogrammidest räägib lähemalt <link linkend="using-kapp-histogramviewer">vastav osa</link>. </para>
+                    <para>Selles dialoogis näeb pildi histogrammi. Histogrammidest räägib lähemalt <link linkend="using-tdeApp-histogramviewer">vastav osa</link>. </para>
                 
                     <figure>
                         <title>Pildi omaduste dialoog histogrammiga</title>
@@ -456,14 +456,14 @@
                                                                                                             
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Foto ümbernimetamine</title>
              
                 <para>Foto failinime saab muuta, kui klõpsata pisipildile hiire parema nupuga ja valida kontekstimenüüst <guilabel>Nimeta ümber</guilabel>. Pane tähele, et faililaiendit (.jpg, .tif jne.) ei tohiks muuta. </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Foto kustutamine</title>
              
                 <para>Foto kustutamisel viskab &digikam; selle KDE prügikasti. Kui soovid selle asemel foto kohe lõplikult hävitada, tuleb selline võimalus lubada. Selleks vali menüükäsk <menuchoice><guimenu>Seadistused</guimenu> <guimenuitem>&digikam;i seadistamine</guimenuitem></menuchoice> ning ilmuvas dialoogis kaart <guilabel>Muud</guilabel>. Kaardi ülaosas on valikud, millega saab määrata, kuidas ja mida tehakse foto kustutamisel. </para>
@@ -474,7 +474,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
         <title>"Minu sildid"</title>
 
             <para>Fotodee sildistamine on võimas ja paindlik viis oma fotosid korraldada ja katalogiseerida. Sildid on omamoodi pealkirjad, mida saab rakendada konkreetsetele fotodele. Kui fotole on silt lisatud, saab seda fotot leida vastavat silti valides. </para>
@@ -490,7 +490,7 @@
 
             <para>Kui valid puus sildi, mis sisaldab alamsilte, ei näita &digikam; vaikimisi alamsiltidega fotosid. Kui soovid, et näidatakse kõiki aktiivse sildi alamsiltidega tähistatud fotosid, võid seda käitumist muuta. Selleks vali menüükäsk <menuchoice><guimenu>Seadistused</guimenu><guimenuitem>&digikam;i seadistamine</guimenuitem></menuchoice>, ilmuvast dialoogist kaart <guilabel>Albumid</guilabel> ning märgi ära <guilabel>Elementide näitamine alamsiltides</guilabel>. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
             <title>Siltide haldamine</title>
              
                 <para>Uusi silte saab lisada kas hiire parema nupuga pealkirjale "Minu sildid" klõpsates või klõpsuga olemasolevale sildile. Mõlemal juhul tuleb kontekstimenüüst valida <guilabel>Uus silt</guilabel>. Kui klõpsad uue sildi lisamiseks olemasoleval sildil, lisatakse uus silt selle alamsildina. </para>
@@ -503,7 +503,7 @@
                                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
             <title>Fotode sildistamine</title>
              
                 <para>Enne seda, kui saad kasutada kõiki &digikam; avaraid võimalusi, mis kaasnevad sildistamise võimalusega, tuleb mõistagi fotod sildistada. Seda saab teha kahel viisil. Kui oled leidnud fotod, mida soovid sildistada, võid need lohistada vajalikule sildile nimekirjas "Minu sildid" või siis teha pildiaknas valitud fotodel klõps hiire parema nupuga ja valida kontekstimenüüst <guilabel>Omista silt</guilabel>. </para>
@@ -525,7 +525,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>Digikaamera kasutamine &digikam;iga</title>
     <anchor id="camerainterface.anchor"/>
 
@@ -534,7 +534,7 @@
 
             <para>Kaameraliides võimaldab laadida kaameral olevad fotod otse &digikam; albumisse. Kaameraliidese saab avada menüüst Kaamera seadistatud kaamerat valides. Seda, kuidas seadistada &digikam; kasutama oma kaamerat, tutvustab lähemalt osa <link linkend="setupcamera">Kaamera seadistamine</link>.kuni olgu Kaamera. </para>
 
-            <para>Kaameraliides ei ole siiski ainuke võimalus fotode lisamiseks &digikam;i. Seda, kuidas importida juba kõvakettal leiduvaid fotosid, tutvustab lähemalt osa <link linkend="using-kapp-addphototoalbum">Foto lisamine albumisse</link>. </para>
+            <para>Kaameraliides ei ole siiski ainuke võimalus fotode lisamiseks &digikam;i. Seda, kuidas importida juba kõvakettal leiduvaid fotosid, tutvustab lähemalt osa <link linkend="using-tdeApp-addphototoalbum">Foto lisamine albumisse</link>. </para>
             
             <para>Digikaamera kasutamiseks &digikam;iga ühenda kaamera arvutiga, vali kaameras piltide näitamise režiim ja lülita kaamera sisse. </para>
         
@@ -574,7 +574,7 @@
         <title>Sihtalbumi valimine</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>Nupud <guilabel>Laadi kõik alla</guilabel> või <guilabel>Laadi valitud alla</guilabel> avavad dialoogi, kus saab valida sihtalbumi, millesse fotod salvestatakse. Dialoogis näidatakse olemasolevate albumite nimekirja, mis on järjestatud kataloogide kaupa (albumite sortimisjärjekorrast räägib lähemalst osa <link linkend="using-kapp-myalbumsview">Minu albumid</link>). Vali nimekirjast album ja klõpsa OK. </para>
+            <para>Nupud <guilabel>Laadi kõik alla</guilabel> või <guilabel>Laadi valitud alla</guilabel> avavad dialoogi, kus saab valida sihtalbumi, millesse fotod salvestatakse. Dialoogis näidatakse olemasolevate albumite nimekirja, mis on järjestatud kataloogide kaupa (albumite sortimisjärjekorrast räägib lähemalst osa <link linkend="using-tdeApp-myalbumsview">Minu albumid</link>). Vali nimekirjast album ja klõpsa OK. </para>
         
             <figure>
                 <title>Sihtalbumi valimise dialoog</title>
@@ -623,7 +623,7 @@
             <sect3>
             <title>Automaatne pööramine</title>
 
-                <para>&digikam; suudab ära kasutada infot, mida kaamera foto tegemise ajal salvestab enda orientatsiooni kohta, ning pöörata automaatselt allalaaditav pilt õigesse asendisse. Sellist infot ei edasta siiski mitte kõik kaamerad. Täpsemalt räägib sellest, millist infot kaamerad fotodele lisavad, osa <link linkend="using-kapp-imagemetadata">Foto metaandmed, omadused ja histogramm</link>. </para>
+                <para>&digikam; suudab ära kasutada infot, mida kaamera foto tegemise ajal salvestab enda orientatsiooni kohta, ning pöörata automaatselt allalaaditav pilt õigesse asendisse. Sellist infot ei edasta siiski mitte kõik kaamerad. Täpsemalt räägib sellest, millist infot kaamerad fotodele lisavad, osa <link linkend="using-tdeApp-imagemetadata">Foto metaandmed, omadused ja histogramm</link>. </para>
 
                 <para>Automaatne pööramine on vaikimisi sisse lülitatud ning kui sinu kaamera vastavat infot ei edasta, jätab &digikam; foto esialgsesse asendisse, Kui soovid automaatse pööramise välja lülitada, klõpsa nupule <guilabel>Muud</guilabel> ja eemalda märge dialoogi allosas olevast kastikesest <guilabel>Automaatne pööramine</guilabel>. </para>
             
@@ -632,7 +632,7 @@
             <sect3>
             <title>Automaatne sihtalbumite loomine</title>
                 
-                <para>Kui kaamera edastab infot foto tegemise kuupäeva kohta, võib &digikam; selle põhjal allalaadimisel luua sihtalbumis automaatselt vastavad alamalbumid. Neile antakse nimeks vastavad kuupäevad. Kõik ühe kuupäevaga fotod salvestatakse ühte alamalbumisse. Sellist infot ei edasta siiski mitte kõik kaamerad. Täpsemalt räägib sellest, millist infot kaamerad fotodele lisavad, osa <link linkend="using-kapp-imagemetadata">Foto metaandmed, omadused ja histogramm</link>. </para>
+                <para>Kui kaamera edastab infot foto tegemise kuupäeva kohta, võib &digikam; selle põhjal allalaadimisel luua sihtalbumis automaatselt vastavad alamalbumid. Neile antakse nimeks vastavad kuupäevad. Kõik ühe kuupäevaga fotod salvestatakse ühte alamalbumisse. Sellist infot ei edasta siiski mitte kõik kaamerad. Täpsemalt räägib sellest, millist infot kaamerad fotodele lisavad, osa <link linkend="using-tdeApp-imagemetadata">Foto metaandmed, omadused ja histogramm</link>. </para>
                 
                 <para>Vaikimisi ei ole see võimalus sisse lülitatud ning &digikam; laadib pildid sinu valitud albumisse. Kui soovid aga seda võimalust kasutada, klõpsa nupule <guilabel>Muud</guilabel> ja märgi dialoogi allosas ära kastike <guilabel>Fotode allalaadimine automaatselt loodud alamalbumitesse</guilabel>. </para>
 
@@ -642,7 +642,7 @@
                                     
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>&digikam;i pildiredaktor</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -751,16 +751,16 @@
         <sect2>
         <title>Pildi omadused</title>
             
-            <sect3 id="using-kapp-commentsedittool">
+            <sect3 id="using-tdeApp-commentsedittool">
             <title>Kommentaaride redigeerimise tööriist</title>
                 
                 <anchor id="commentsedittool.anchor"/>
 
-                <para>Foto mõningaid omadusi saab vaadata vastavate kirjetega menüüs <guilabel>Pilt</guilabel>. Foto kommentaare saab redigeerida menüükäsuga <menuchoice><guimenu>Pilt</guimenu><guimenuitem>Muuda kommentaare ja silte</guimenuitem></menuchoice>. Uued kommentaarid ja sildid jäetakse foto sulgemise järel meelde ka siis, kui sa fotot ei salvesta. Täpsemalt räägib kommentaaride ja siltide dialoogist osa <link linkend="using-kapp-tagscommentsedit">Siltide ja kommentaaride redigeerimine</link>. </para>
+                <para>Foto mõningaid omadusi saab vaadata vastavate kirjetega menüüs <guilabel>Pilt</guilabel>. Foto kommentaare saab redigeerida menüükäsuga <menuchoice><guimenu>Pilt</guimenu><guimenuitem>Muuda kommentaare ja silte</guimenuitem></menuchoice>. Uued kommentaarid ja sildid jäetakse foto sulgemise järel meelde ka siis, kui sa fotot ei salvesta. Täpsemalt räägib kommentaaride ja siltide dialoogist osa <link linkend="using-tdeApp-tagscommentsedit">Siltide ja kommentaaride redigeerimine</link>. </para>
             
             </sect3>
     
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>EXIF-info näitaja</title>
             
                 <anchor id="kexif.anchor"/>
@@ -768,7 +768,7 @@
                 <sect4>
                 <title>Mis on EXIF?</title>
                     
-                    <para>EXIF tähendab laiendatud vahetusvormingut (<emphasis>EXtended Interchange Format</emphasis>). See loodi spetsiaalselt digikaamerate tarbeks. EXIF lubab salvestada foto kohta üsna palju infot, mis kirjeldab nii kaamerat, millega foto tehti, kui ka mitmeid foto tegemise ajal kehtinud seadistusi (muu hulgas ka kuupäev ja kellaaeg). Samuti saab sellesse lisada pisipildi. Täpsemalt räägib sellest, millist infot on võimalik pildile lisada, osa <link linkend="using-kapp-imagemetadata">Foto metaandmed ja omadused</link>. </para>
+                    <para>EXIF tähendab laiendatud vahetusvormingut (<emphasis>EXtended Interchange Format</emphasis>). See loodi spetsiaalselt digikaamerate tarbeks. EXIF lubab salvestada foto kohta üsna palju infot, mis kirjeldab nii kaamerat, millega foto tehti, kui ka mitmeid foto tegemise ajal kehtinud seadistusi (muu hulgas ka kuupäev ja kellaaeg). Samuti saab sellesse lisada pisipildi. Täpsemalt räägib sellest, millist infot on võimalik pildile lisada, osa <link linkend="using-tdeApp-imagemetadata">Foto metaandmed ja omadused</link>. </para>
 
                     <para>EXIF vorming koosneb mitmest niinimetatud pildifaili kataloogide sektsioonist (<emphasis>Image File Directories</emphasis>, IFD). Tavaliselt on sektsioonid järgmised: <itemizedlist>
             
@@ -808,7 +808,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Faili omaduste tööriist</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -817,14 +817,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogrammi näitaja</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Kui sind huvitab foto üksikasjalik histogramm, saab seda näha menüükäsuga <menuchoice><guimenu>Pilt</guimenu> <guimenuitem>Omadused</guimenuitem></menuchoice> ja kaarti <guilabel>Histogramm</guilabel> valides. Foto histogramm näitab iga värvi kogust fotol ning nende erinevat amplituudi. Kui sulle tundub, et värvid sinu fotol pole päris paigas, aitab histogramm selgusele jõuda, kus ja mis on valesti. </para>
             
-                <para>Histogrammi näitaja näitab infot aktiivse pildi värviväärtuste statistilise jaotuse kohta. See on puhtinformatiivne, dialoogis ei saa kuidagi fotot mõjutada. Kui soovid histogrammi põhjal fotot korrigeerida, tuleb kasutada värvitasemete kohendamise pluginat. See plugin on osa <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projektist</ulink>. Täpsemalt räägib pluginate kasutamisest &digikam;is osa <link linkend="using-kapp-setup">Seadistamine</link>. </para>
+                <para>Histogrammi näitaja näitab infot aktiivse pildi värviväärtuste statistilise jaotuse kohta. See on puhtinformatiivne, dialoogis ei saa kuidagi fotot mõjutada. Kui soovid histogrammi põhjal fotot korrigeerida, tuleb kasutada värvitasemete kohendamise pluginat. See plugin on osa <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projektist</ulink>. Täpsemalt räägib pluginate kasutamisest &digikam;is osa <link linkend="using-tdeApp-setup">Seadistamine</link>. </para>
                                                 
                 <figure>
                     <title>Histogrammi näitaja</title>
@@ -865,7 +865,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Histogrammi kasutamine</title>
                 
                 <para>Histogramm kujutab endast graafilist abivahendit ekraanil näidatava pildi täpsuse hindamiseks. Graafik esindab foto heleduse kolme regiooni: <itemizedlist> <listitem><para> (1): vasakul asuvad tumedad toonid. </para></listitem> <listitem><para> (2): keskel asuvad keskmised toonid. </para></listitem> <listitem><para> (3): paremal asuvad heledad toonid. </para></listitem> </itemizedlist> <figure> <title>Histogrammi kirjeldus</title> <graphic srccredit="Histogrammi kirjeldus" fileref="histogramdescription.png"/> </figure> Graafiku jaotus kõigi oma tippudega näitab, kas pilt on liiga tume, liiga hele või korralikult tasakaalus. </para>
@@ -878,19 +878,19 @@
 
                 <para>Oluline: mitte kõigil fotodel ei pruugi heledus koonduda histogrammi keskossa. Väga suurel määral sõltub see sellest, mida on fotol kujutatud. Vahel võib tipu sattumine histogrammi ühte või ka mõlemasse serva olla just õige ja vajalik. </para>
                         
-                <para>Histogrammi põhjal saab üpris usaldusväärselt otsustada, kas foto on korralikult säritatud või mitte. Kui histogramm näitab ala- või ülesäritust, saab foto parandamiseks kasutada <link linkend="using-kapp-correctingexposure">särituse korrigeerimise tööriista</link>. </para>
+                <para>Histogrammi põhjal saab üpris usaldusväärselt otsustada, kas foto on korralikult säritatud või mitte. Kui histogramm näitab ala- või ülesäritust, saab foto parandamiseks kasutada <link linkend="using-tdeApp-correctingexposure">särituse korrigeerimise tööriista</link>. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Foto kohendamine</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Foto kärpimine</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Kärpimine käsitsi</title>
 
                     <para>Foto kärpimine on väga levinud toiming ning pildiredaktoris on see imelihtne. Foto kärpimiseks joonista lihtsalt hiire vasakut nuppu all hoides vajaliku kujuga ristklik näidatavale fotole. Hiirt liigutades tekib valikut tähistav punktiirjoon. </para>
@@ -907,7 +907,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportsionaalne kärpimine</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -984,7 +984,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Foto suuruse muutmine</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -1000,7 +1000,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Foto pööramine või peegeldamine</title>
                 
                 <para>Kui foto orientatsioon pole õige, on seda võimalik <guilabel>peegelda</guilabel>da või <guilabel>pööra</guilabel>ta õigesse asendisse vastava tööriistaga, mida saab kasutada menüükäskudega <menuchoice><guimenu>Teisendus</guimenu> <guimenuitem>Pööra</guimenuitem></menuchoice> ja <menuchoice><guimenu>Teisendus</guimenu> <guimenuitem>Peegelda</guimenuitem></menuchoice>. </para>
@@ -1009,7 +1009,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Foto punasilmsuse korrigeerimine</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1026,7 +1026,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Teravuse kohendamine</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1079,7 +1079,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Värvikorrektsioon</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1119,7 +1119,7 @@
             <para>Mis tahes muudatusi ei rakendata lõplikult enne seda, kui sa foto salvestad. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Särituse korrigeerimine</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1275,7 +1275,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>&digikam;i seadistamine</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1294,9 +1294,9 @@
                                 
             <para><guilabel>Albumiteegi asukoht</guilabel> on asukoht kõvakettal, kuhu &digikam; salvestab kõik albumid. Kui muudad seda, aga ei liiguta albumeid kõvakettal uude asukohta, arvab &digikam;, et albumeid polegi ning loob uuele asukohale uue andmebaasi. Vanu albumeid ei muudeta, aga kui sa neid kasutada tahad, pead albumiteegi asukoha uuesti vanaks tagasi muutma. Kui sa ei ole just päris kindel, ei tasuks alguses määratud asukohta muutma hakata. </para>            
             
-            <para><guilabel>Sildi seadistusi</guilabel> selgitab täpsemalt osa <link linkend="using-kapp-mytagsview">Minu sildid</link>. </para> 
+            <para><guilabel>Sildi seadistusi</guilabel> selgitab täpsemalt osa <link linkend="using-tdeApp-mytagsview">Minu sildid</link>. </para> 
 
-            <para><guilabel>Pisipildivaate lisainfo </guilabel> valikuid kirjeldab täpsemalt osa <link linkend="using-kapp-imageview">Pildid</link>. </para> 
+            <para><guilabel>Pisipildivaate lisainfo </guilabel> valikuid kirjeldab täpsemalt osa <link linkend="using-tdeApp-imageview">Pildid</link>. </para> 
             
             <para>Dialoogi muud valikud peaks olema enesestmõistetavad. </para> 
                         
@@ -1325,7 +1325,7 @@
         <sect2 id="setupcollection">
         <title>Kogude seadistused</title>
 
-            <para>Selles dialoogis saab hallata oma kogude tüüpe. Albumikogusid kirjeldab täpsemalt osa <link linkend="using-kapp-myalbumsview">Minu albumid</link>. </para>
+            <para>Selles dialoogis saab hallata oma kogude tüüpe. Albumikogusid kirjeldab täpsemalt osa <link linkend="using-tdeApp-myalbumsview">Minu albumid</link>. </para>
 
             <figure>
                 <title>Kogude seadistused</title>
@@ -1419,7 +1419,7 @@
         <sect2 id="setupmisc">
         <title>Muud seadistused</title>
 
-            <para>Siin saab määrata digiKami käitumise juhul, kui kustutad foto või albumi. Täpsemalt räägivad sellest osad <link linkend="using-kapp-deleteimage">Foto kustutamine</link> ja <link linkend="using-kapp-deletealbum">Albumi kustutamine</link>. </para>
+            <para>Siin saab määrata digiKami käitumise juhul, kui kustutad foto või albumi. Täpsemalt räägivad sellest osad <link linkend="using-tdeApp-deleteimage">Foto kustutamine</link> ja <link linkend="using-tdeApp-deletealbum">Albumi kustutamine</link>. </para>
             
             <para>Samuti saab siin välja lülitada käivituslogo näitamise digiKami käivitamise ajal. See võib natuke parandada digiKami käivitamise kiirust. </para>
 
@@ -2517,7 +2517,7 @@
 <appendix id="installation">
 <title>Paigaldamine</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>&digikam;i hankimine</title>
 
 <para>&digikam;i veebilehekülg on <ulink url="http://digikam.sourceforge.net">http://digikam.sourceforge.net</ulink>. Palun külasta seda sageli, kui soovid saada pidevalt uudiseid &digikam;i kohta. &digikam;i võib hankida nii binaarfailina kui lähtetekstina aadressilt <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/et/showfoto/index.docbook b/doc/et/showfoto/index.docbook
index d8153e64..aaf0e90b 100644
--- a/doc/et/showfoto/index.docbook
+++ b/doc/et/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Estonian  "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -67,10 +67,10 @@
 <chapter id="introduction">
 <title>Sissejuhatus</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Taust</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>&showfoto; info</title>
 
        <para>&showfoto; on kiire pildiredaktor mitme lihtsa, kuid võimsa pilditöötlemisvahendiga. See võimaldab sul vaadata oma fotosid ning neid parandada ja muuta. </para>
@@ -107,7 +107,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Toetatud pildifailide vormingud</title>
 
         <sect2>
@@ -130,7 +130,7 @@
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Toetatud pluginad</title>
 
         <para>Üks vahvamaid &showfoto;i omadusi on selle hõlpus laiendamine pluginate, täpsemalt <emphasis>digiKami pildiredaktori pluginate</emphasis> abil, mis lisavad rakendusele uusi pilditöötluse võimalusi. <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projekti</ulink> eesmärk on pakkuda välja valik tööriistu just redaktori tarbeks. Pildiredaktori pluginatest räägib lähemalt käsiraamatu <link linkend="setupplugins">vastav osa</link>. </para>
@@ -144,10 +144,10 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>&showfoto; kasutamine</title>
            
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>Pildiredaktor &showfoto;</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -256,7 +256,7 @@
         <sect2>
         <title>Pildi omadused</title>
             
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>EXIF-info näitaja</title>
             
                 <anchor id="kexif.anchor"/>
@@ -304,7 +304,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Faili omaduste tööriist</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -313,14 +313,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogrammi näitaja</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Kui sind huvitab foto üksikasjalik histogramm, saab seda näha menüükäsuga <menuchoice><guimenu>Pilt</guimenu> <guimenuitem>Omadused</guimenuitem></menuchoice> ja kaarti <guilabel>Histogramm</guilabel> valides. Foto histogramm näitab iga värvi kogust fotol ning nende erinevat amplituudi. Kui sulle tundub, et värvid sinu fotol pole päris paigas, aitab histogramm selgusele jõuda, kus ja mis on valesti. </para>
             
-                <para>Histogrammi näitaja näitab infot aktiivse pildi värviväärtuste statistilise jaotuse kohta. See on puhtinformatiivne, dialoogis ei saa kuidagi fotot mõjutada. Kui soovid histogrammi põhjal fotot korrigeerida, tuleb kasutada värvitasemete kohendamise pluginat. See plugin on osa <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projektist</ulink>. Täpsemalt räägib pluginate kasutamisest &showfoto;s osa <link linkend="using-kapp-setup">Seadistamine</link>. </para>
+                <para>Histogrammi näitaja näitab infot aktiivse pildi värviväärtuste statistilise jaotuse kohta. See on puhtinformatiivne, dialoogis ei saa kuidagi fotot mõjutada. Kui soovid histogrammi põhjal fotot korrigeerida, tuleb kasutada värvitasemete kohendamise pluginat. See plugin on osa <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigiKami pildipluginate projektist</ulink>. Täpsemalt räägib pluginate kasutamisest &showfoto;s osa <link linkend="using-tdeApp-setup">Seadistamine</link>. </para>
                                                 
                 <figure>
                     <title>Histogrammi näitaja</title>
@@ -361,7 +361,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Histogrammi kasutamine</title>
                 
                 <para>Histogramm kujutab endast graafilist abivahendit ekraanil näidatava pildi täpsuse hindamiseks. Graafik esindab foto heleduse kolme regiooni: <itemizedlist> <listitem><para> (1): vasakul asuvad tumedad toonid. </para></listitem> <listitem><para> (2): keskel asuvad keskmised toonid. </para></listitem> <listitem><para> (3): paremal asuvad heledad toonid. </para></listitem> </itemizedlist> <figure> <title>Histogrammi kirjeldus</title> <graphic srccredit="Histogrammi kirjeldus" fileref="histogramdescription.png"/> </figure> Graafiku jaotus kõigi oma tippudega näitab, kas pilt on liiga tume, liiga hele või korralikult tasakaalus. </para>
@@ -374,19 +374,19 @@
 
                 <para>Oluline: mitte kõigil fotodel ei pruugi heledus koonduda histogrammi keskossa. Väga suurel määral sõltub see sellest, mida on fotol kujutatud. Vahel võib tipu sattumine histogrammi ühte või ka mõlemasse serva olla just õige ja vajalik. </para>
                         
-                <para>Histogrammi põhjal saab üpris usaldusväärselt otsustada, kas foto on korralikult säritatud või mitte. Kui histogramm näitab ala- või ülesäritust, saab foto parandamiseks kasutada <link linkend="using-kapp-correctingexposure">särituse korrigeerimise tööriista</link>. </para>
+                <para>Histogrammi põhjal saab üpris usaldusväärselt otsustada, kas foto on korralikult säritatud või mitte. Kui histogramm näitab ala- või ülesäritust, saab foto parandamiseks kasutada <link linkend="using-tdeApp-correctingexposure">särituse korrigeerimise tööriista</link>. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Foto kohendamine</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Foto kärpimine</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Kärpimine käsitsi</title>
 
                     <para>Foto kärpimine on väga levinud toiming ning &showfoto;s on see imelihtne. Foto kärpimiseks joonista lihtsalt hiire vasakut nuppu all hoides vajaliku kujuga ristklik näidatavale fotole. Hiirt liigutades tekib valikut tähistav punktiirjoon. </para>
@@ -403,7 +403,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportsionaalne kärpimine</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -480,7 +480,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Foto suuruse muutmine</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -496,7 +496,7 @@
                                 
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Foto pööramine või peegeldamine</title>
                 
                 <para>Kui foto orientatsioon pole õige, on seda võimalik <guilabel>peegelda</guilabel>da või <guilabel>pööra</guilabel>ta õigesse asendisse vastava tööriistaga, mida saab kasutada menüükäskudega <menuchoice><guimenu>Teisendus</guimenu> <guimenuitem>Pööra</guimenuitem></menuchoice> ja <menuchoice><guimenu>Teisendus</guimenu> <guimenuitem>Peegelda</guimenuitem></menuchoice>. </para>
@@ -505,7 +505,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Foto punasilmsuse korrigeerimine</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -522,7 +522,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Teravuse kohendamine</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -575,7 +575,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Värvikorrektsioon</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -615,7 +615,7 @@
             <para>Mis tahes muudatusi ei rakendata lõplikult enne seda, kui sa foto salvestad. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Särituse korrigeerimine</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -771,7 +771,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>&showfoto; seadistamine</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1421,7 +1421,7 @@
 <appendix id="installation">
 <title>Paigaldamine</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>&showfoto; hankimine</title>
 
 <para>&showfoto; veebilehekülg on <ulink url="http://digikam.sourceforge.net">http://digikam.sourceforge.net</ulink>. Palun külasta seda sageli, kui soovid saada pidevalt uudiseid &showfoto; kohta. &showfoto; võib hankida nii binaarfailina kui lähtetekstina aadressilt <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/it/digikam/credits-annex.docbook b/doc/it/digikam/credits-annex.docbook
index c4c00ecf..5ddf53b1 100644
--- a/doc/it/digikam/credits-annex.docbook
+++ b/doc/it/digikam/credits-annex.docbook
@@ -42,7 +42,7 @@
 
 <appendix id="installation">        <title>Installation</title>
 
-<sect1 id="getting-kapp">                <title>How to Obtain &digikam;</title>
+<sect1 id="getting-tdeApp">                <title>How to Obtain &digikam;</title>
 
 <para>
 The website for &digikam; is at <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Please check it regularly to get the latest news about &digikam;. &digikam; can be obtained in binary and source format from <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>.
diff --git a/doc/it/digikam/index.docbook b/doc/it/digikam/index.docbook
index 62aedf58..c390c2d0 100644
--- a/doc/it/digikam/index.docbook
+++ b/doc/it/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Italian "INCLUDE"><!-- change language only here -->
@@ -264,7 +264,7 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">       <title>Usare &digikam;</title>
+<chapter id="using-tdeApp">       <title>Usare &digikam;</title>
 
 
  <sect1 id="using-mainwindow">         <title>La finestra principale di &digikam;</title>
diff --git a/doc/it/showfoto/index.docbook b/doc/it/showfoto/index.docbook
index a096442e..a69db440 100644
--- a/doc/it/showfoto/index.docbook
+++ b/doc/it/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Italian "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -81,9 +81,9 @@
 <chapter id="introduction">
   <title>Introduzione</title>
 
-    <sect1 id="using-kapp-background">    <title>Sfondo</title>
+    <sect1 id="using-tdeApp-background">    <title>Sfondo</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Informazioni su &showfoto;</title>
 
        <para>&showfoto; è un veloce editor di immagini con potenti strumenti di modifica delle immagini. Puoi usarlo per visualizzare le tue fotografie e migliorarle. </para>
@@ -145,7 +145,7 @@ Fare clic più volte sulla stessa linguetta farà apparire o riavvolgere la barr
 
 </chapter>
 
-<chapter id="using-kapp">        <title>Usare &showfoto;</title>
+<chapter id="using-tdeApp">        <title>Usare &showfoto;</title>
 &doc-photo-editing; <sect1 id="using-setup">        <title>Configurazione di &showfoto;</title>
 
         <anchor id="setupdialog.anchor"/>
diff --git a/doc/nl/digikam/index.docbook b/doc/nl/digikam/index.docbook
index 691198ef..fdee5cbe 100644
--- a/doc/nl/digikam/index.docbook
+++ b/doc/nl/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Dutch "INCLUDE"><!-- change language only here -->
   <!ENTITY digikam '<application>digiKam</application>'>
@@ -83,10 +83,10 @@
 <chapter id="introduction">
 <title>Inleiding</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Achtergrond</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Informatie over &digikam;</title>
 
        <para>&digikam; is een geavanceerde digitale fotobeheerder voor de KDE-desktop. &digikam; levert een eenvoudige interface die het importeren en organiseren van digitale foto's tot een koud kunstje maakt. &digikam; stelt u in staat om grote aantallen digitale foto's in albums te beheren en deze foto's te organiseren aan de hand van zogenaamde 'Tags', waarmee u snel kunt zoeken naar de juiste foto. &digikam; heeft vele functies voor het bekijken, organiseren, manipuleren en delen van uw afbeeldingen. </para>
@@ -127,7 +127,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Grondbeginselen</title>
 
         <anchor id="firstrundialog.anchor"/>
@@ -141,15 +141,15 @@
 
         <para>Als u al een verzameling foto's op uw harde schijf hebt staan, dan kunt u de bovenste map opgeven als albumverzameling. &digikam; zal alle submappen van deze map gebruiken als album. De foto's zelf zullen niet worden gewijzigd. </para>
 
-        <para>Als u een bestaande map met foto's gebruikt, dan zult u zien dat de albums in de lijst 'Mijn albums' geen foto hebben als pictogram. De eerste keer dat u een album opent zal &digikam; een miniatuur aanmaken van de eerste foto in dat album. Deze wordt dan gebruikt als albumpictogram. Zie de sectie <link linkend="using-kapp-myalbumsview">Mijn albums</link> voor een uitleg hoe u het albumpictogram kunt wijzigen. </para>
+        <para>Als u een bestaande map met foto's gebruikt, dan zult u zien dat de albums in de lijst 'Mijn albums' geen foto hebben als pictogram. De eerste keer dat u een album opent zal &digikam; een miniatuur aanmaken van de eerste foto in dat album. Deze wordt dan gebruikt als albumpictogram. Zie de sectie <link linkend="using-tdeApp-myalbumsview">Mijn albums</link> voor een uitleg hoe u het albumpictogram kunt wijzigen. </para>
 
-        <para>Als u uw fotoverzameling eerder hebt bekeken met een ander programma, en dat programma heeft miniaturen aangemaakt in niet-standaard submappen, dan zal &digikam; deze minituurmappen tonen als aparte albums. &digikam; volgt de standaarden van <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> voor miniatuurmappen. U kunt deze niet-standaard miniatuurmappen niet verbergen in deze lijst. Als u de mappen wilt behouden, dan kunt u een albumverzameling aanmaken die alle miniatuurmappen bevat en uw albums sorteren op verzameling. Zie de sectie <link linkend="using-kapp-myalbumsview">Mijn albums</link> voor meer informatie hierover. </para>
+        <para>Als u uw fotoverzameling eerder hebt bekeken met een ander programma, en dat programma heeft miniaturen aangemaakt in niet-standaard submappen, dan zal &digikam; deze minituurmappen tonen als aparte albums. &digikam; volgt de standaarden van <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> voor miniatuurmappen. U kunt deze niet-standaard miniatuurmappen niet verbergen in deze lijst. Als u de mappen wilt behouden, dan kunt u een albumverzameling aanmaken die alle miniatuurmappen bevat en uw albums sorteren op verzameling. Zie de sectie <link linkend="using-tdeApp-myalbumsview">Mijn albums</link> voor meer informatie hierover. </para>
 
-        <para>Zodra u de albumverzamelingmap hebt ingesteld kunt u &digikam; instellen op uw digitale camera. Daarna leert u om te gaan met <link linkend="using-kapp-myalbumsview">Mijn albums</link> en <link linkend="using-kapp-mytagsview">Mijn tags</link> om uw fotoalbums te beheren. </para> 
+        <para>Zodra u de albumverzamelingmap hebt ingesteld kunt u &digikam; instellen op uw digitale camera. Daarna leert u om te gaan met <link linkend="using-tdeApp-myalbumsview">Mijn albums</link> en <link linkend="using-tdeApp-mytagsview">Mijn tags</link> om uw fotoalbums te beheren. </para> 
                         
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Ondersteunde afbeeldingsformaten</title>
 
         <sect2>
@@ -157,9 +157,9 @@
 
         <para>Bijna alle digitale camera's slaan de foto's op in een van deze twee formaten: JPEG of TIFF. Bij veel typen camera's kunt u selecteren welke van de twee u wilt gebruiken. JPEG is een gecomprimeerd formaat dat een klein deel van de afbeeldingkwaliteit verloren laat gaan ten gunste van kleine bestandsformaten. TIFF kent geen compressie. De kwaliteit ervan is beter, maar de bestanden zijn ook veel groter. Een volledige beschrijving van deze formaten kunt u vinden in de <ulink url="http://en.wikipedia.org/wiki/Graphics_file_format">Wikipedia</ulink>. &digikam; ondersteunt beide formaten. </para>
 
-        <para>PNG is een afbeeldingsformaat dat is ontwikkeld als een vervanging van een aantal oudere afbeeldingsformaten die veelvuldig werden gebruikt in de jaren '90. Het is een verliesloos (lossless) formaat, net als TIFF, maar veel compacter, wat de nodige schijfruimte kan schelen. Alhoewel uw camera zeer waarschijnlijk geen PNG-ondersteuning biedt zetten sommige gebruikers hun foto's om in PNG zodra ze op hun pc staan. Anders dan JPEG hebt u bij PNG niet te maken met kwaliteitsverlies als u de afbeeldingen opnieuw codeert of bewerkt. &digikam; biedt volledige ondersteuning voor PNG-afbeeldingen en kan een reeks afbeeldingen in een enkele stap omzetten naar PNG. Zie de sectie <link linkend="using-kapp-setup">&digikam; instellen</link> voor informatie over plugins in &digikam;. Voor meer informatie over PNG kunt u terecht op diens <ulink url="http://www.libpng.org/pub/png/">website</ulink>. </para>
+        <para>PNG is een afbeeldingsformaat dat is ontwikkeld als een vervanging van een aantal oudere afbeeldingsformaten die veelvuldig werden gebruikt in de jaren '90. Het is een verliesloos (lossless) formaat, net als TIFF, maar veel compacter, wat de nodige schijfruimte kan schelen. Alhoewel uw camera zeer waarschijnlijk geen PNG-ondersteuning biedt zetten sommige gebruikers hun foto's om in PNG zodra ze op hun pc staan. Anders dan JPEG hebt u bij PNG niet te maken met kwaliteitsverlies als u de afbeeldingen opnieuw codeert of bewerkt. &digikam; biedt volledige ondersteuning voor PNG-afbeeldingen en kan een reeks afbeeldingen in een enkele stap omzetten naar PNG. Zie de sectie <link linkend="using-tdeApp-setup">&digikam; instellen</link> voor informatie over plugins in &digikam;. Voor meer informatie over PNG kunt u terecht op diens <ulink url="http://www.libpng.org/pub/png/">website</ulink>. </para>
 
-        <para>Sommige, meestal dure, camera's bieden de mogelijkheid om de afbeeldingen in een rauw formaat (RAW format) op te slaan. RAW is niet een afbeeldingsstandaard. Elke camera heeft zijn eigen opmaak. Rauwe afbeeldingen bevatten alle gegevens die direct zijn genomen van de afbeeldingsensor van de camera, voordat de software in de camera filters toepast, zoals balans, scherpheid, etc. Door afbeeldingen in een rauw formaat op te slaan kunt u achteraf de instellingen, zoals de witbalans, wijzigen. De meeste professionele fotografen gebruiken rauwe afbeeldingen omdat deze hun de meeste flexibiliteit bieden. Het nadeel is dat dit soort afbeeldingen erg groot zijn. Voor meer informatie over rauwe afbeeldingen staat er op internet een zeer bruikbare gids: <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">The Luminous Landscape</ulink>. Met de conversieplugin voor rauwe afbeeldingen kunt u dit soort afbeeldingen converteren naar JPEG of TIFF. Zie de sectie <link linkend="using-kapp-setup">&digikam; instellen</link> voor meer informatie over het gebruik van deze plugin in &digikam;. </para>
+        <para>Sommige, meestal dure, camera's bieden de mogelijkheid om de afbeeldingen in een rauw formaat (RAW format) op te slaan. RAW is niet een afbeeldingsstandaard. Elke camera heeft zijn eigen opmaak. Rauwe afbeeldingen bevatten alle gegevens die direct zijn genomen van de afbeeldingsensor van de camera, voordat de software in de camera filters toepast, zoals balans, scherpheid, etc. Door afbeeldingen in een rauw formaat op te slaan kunt u achteraf de instellingen, zoals de witbalans, wijzigen. De meeste professionele fotografen gebruiken rauwe afbeeldingen omdat deze hun de meeste flexibiliteit bieden. Het nadeel is dat dit soort afbeeldingen erg groot zijn. Voor meer informatie over rauwe afbeeldingen staat er op internet een zeer bruikbare gids: <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">The Luminous Landscape</ulink>. Met de conversieplugin voor rauwe afbeeldingen kunt u dit soort afbeeldingen converteren naar JPEG of TIFF. Zie de sectie <link linkend="using-tdeApp-setup">&digikam; instellen</link> voor meer informatie over het gebruik van deze plugin in &digikam;. </para>
 
         </sect2>
 
@@ -176,13 +176,13 @@
 
         <para>De afhankelijkheid van andere bibliotheken betekent dat het voor ons niet mogelijk is om een definitieve lijst van alle formaten te geven die op uw computer beschikbaar zijn. Tenminste JPEG, PNG en TIFF zullen beschikbaar zijn. </para>
 
-        <para>&digikam; zal alleen bestanden tonen in de formaten die het programma kan openen. Dit wordt bepaald aan de hand van de bestandsextensies die worden vergeleken met een voorgedefinieerde lijst. Als de bestandsextensie in de lijst voorkomt zal &digikam; het bestand in de afbeeldingsbewerker tonen. U kunt de lijst met geaccepteerde afbeeldingsextensies wijzigen. Zie sectie <link linkend="using-kapp-setup">&digikam; instellen</link> voor meer details. </para>
+        <para>&digikam; zal alleen bestanden tonen in de formaten die het programma kan openen. Dit wordt bepaald aan de hand van de bestandsextensies die worden vergeleken met een voorgedefinieerde lijst. Als de bestandsextensie in de lijst voorkomt zal &digikam; het bestand in de afbeeldingsbewerker tonen. U kunt de lijst met geaccepteerde afbeeldingsextensies wijzigen. Zie sectie <link linkend="using-tdeApp-setup">&digikam; instellen</link> voor meer details. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Ondersteunde plugins</title>
 
         <para>Een van de pluspunten aan &digikam; is de eenvoud waarop de functionaliteit ervan kan worden uitgebreid, dmv plugins. Er zijn twee pluginarchitecturen beschikbaar: <itemizedlist><listitem><para><emphasis>Kipi-plugins</emphasis>. Het <ulink url="http://extragear.kde.org/apps/kipi.php">Kde Image Plugins Interface-project</ulink> is een project dat een algemene pluginstructuur voor &digikam;, <application>KimDaBa</application>, <application>Showimg</application> en <application>Gwenview</application> ontwikkelt. Het doel van het project is om afbeeldingsplugins tussen deze programma's te delen. De instelling van de Kipi-plugins wordt beschreven in deze <link linkend="setupkipi">sectie</link>.</para></listitem> <listitem><para><emphasis>Afbeeldingsbewerker-plugins</emphasis>: deze structuur voegt nieuwe mogelijkheden om afbeeldingen te manipuleren toe aan de afbeeldingsbewerker van &digikam;. Het project <ulink url="http://extragear.kde.org/apps/digikamimageplugins.php">DigikamImagePlugins</ulink> heeft zich toegewijd om een verzameling van hulpmiddelen via deze architectuur aan te leveren. Deze plugins worden beschreven in deze <link linkend="setupeditor">sectie</link>. </para></listitem> </itemizedlist> Plugins kunnen afbeeldingen manipuleren op bijna alle manieren die een gebruiker nodig heeft. Hun voordeel is dat ze het de gebruiker veel eenvoudiger maken om nieuwe functionaliteit toevoegen aan &digikam; in de vorm van een kleine plugin, in plaats van het programma &digikam; zelf te hoeven veranderen. </para>
@@ -193,14 +193,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Het gebruik van &digikam;</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>Het hoofdscherm van &digikam;</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Inleiding tot het hoofdvenster</title>
 
             <para>
@@ -252,28 +252,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>De lijst "Mijn albums"</title>
 
             <para>De lijst "Mijn albums" toont een geordende weergave van uw fotoalbums. Alle foto's die door &digikam; worden beheerd zijn opgeslagen albums. Deze albums kunnen worden gesorteerd op hun mapindeling op de harde schijf, op de verzamelingsnaam die is ingesteld in de albumeigenschappen, of op de datum dat het album is aangemaakt. (Deze datum kunt u veranderen in de albumeigenschappen). </para>
             
             <para>Via het uitvouwmenu in de werkbalk vlak boven de lijst kunt u de manier van ordenen aanpassen. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Een nieuw album aanmaken</title>
                 
                 <para>U kunt op verschillende manieren een nieuw album aanmaken. U kunt een nieuw album aanmaken op het moment dat u nieuwe foto's vanuit uw camera downloadt. En u kunt een nieuw leeg album aanmaken door te klikken op de knop <guilabel>Nieuw album</guilabel> in de werkbalk. Tevens kunt u een nieuw album aanmaken door een bestaande map te importeren van uw harde schijf. Selecteer hiervoor menuoptie  <menuchoice><guimenu>Album</guimenu> <guimenuitem>Importeren</guimenuitem> <guimenuitem>Mappen importeren...</guimenuitem></menuchoice>, en kies de map die u wilt importeren. Er wordt dan een nieuw album aangemaakt met dezelfde naam als de map die u hebt opgegeven. Tot slot kunt u ook een map importeren door deze vanuit een ander programma, zoals <application>Konqueror</application>, naar &digikam; te slepen. Sleep het pictogram van de map naar de albumlijst aan de linkerkant van het venster. U zult dan gevraagd worden of u de map naar &digikam; wilt kopiëren of verplaatsen. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Een album verwijderen</title>
                 
                 <para>Als u een album uit &digikam; verwijdert, dan wordt deze in de prullenbak van KDE geplaatst. Als u liever de albums onmiddellijk van de schijf laat verwijderen, dan kunt u dit in &digikam; instellen. Selecteer menuoptie <menuchoice><guimenu>Instellingen</guimenu> <guimenuitem>&digikam; instellen...</guimenuitem></menuchoice> en klik op de sectie 'Diversen'. Hier kunt u bepalen wat er gebeurt als u een foto uit &digikam; verwijdert. U kunt een album verwijderen door met de rechtermuisknop op het bijhorende pictogram in de lijst te klikken en menuoptie <menuchoice><guimenuitem>Album van de harde schijf verwijderen</guimenuitem></menuchoice> te kiezen in het contextmenu. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Een foto toevoegen aan een album</title>
                 
                 <para>In de meeste gevallen zult u uw albums vullen door vanuit de camera afbeeldingen te downloaden. Maar u kunt natuurlijk ook losse afbeeldingen toevoegen die al op uw computer staan. Om een foto toe te voegen aan een album, zorg ervoor dat het album is geselecteerd. Klik vervolgens op het pictogram <guilabel>Afbeeldingen toevoegen</guilabel> in de werkbalk, of selecteer menuoptie <menuchoice><guimenu>Album</guimenu> <guimenuitem>Importeren</guimenuitem> <guimenuitem>Afbeeldingen toevoegen</guimenuitem></menuchoice>. Blader naar de foto's die u wilt toevoegen en klik op de knop <guilabel>Openen</guilabel>. De foto's zullen worden gekopieerd naar het album. U kunt ook afbeeldingen naar het album toe slepen. Versleep vanuit <application>Konqueror</application> het pictogram van de afbeelding naar het rechter gedeelte van het &digikam;-venster. Als u een scanner hebt aangesloten kunt u uw gescande foto's rechtstreeks aan een album in &digikam; toevoegen. </para>
@@ -282,14 +282,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Foto's kopiëren en verplaatsen tussen albums</title>
                 
                 <para>Om een afbeelding van het ene album naar het andere te kopiëren of verplaatsen, versleep eenvoudigweg de afbeelding naar het pictogram van het doelalbum. U wordt dan gevraagd of u de foto wilt <guilabel>kopiëren</guilabel> of <guilabel>verplaatsen</guilabel>. Op dezelfde manier kunt u ook meerdere afbeeldingen kopiëren en verplaatsen. Selecteer alle afbeeldingen die u wilt verplaatsen en versleep ze naar het doelalbum. </para>
         
             </sect3>            
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Albums beheren</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -318,7 +318,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Het albumpictogram instellen</title>
                 
                 <para>Als u voor het eerst een album opent, dan maakt &digikam; aan de hand van de eerste foto in het album een pictogram aan in de albumlijst. Dit pictogram kan u helpen bij het onthouden welke foto's in het album staan. Echter, soms is de eerste foto in een album niet geschikt voor deze functie en wilt u een andere kiezen. </para> 
@@ -327,7 +327,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Enkele wenken betreffende albumverzamelingen</title>
                 
                 <para>Een album kan alleen één albumverzameling voorkomen, en albumverzamelingen zijn niet genest. </para>
@@ -338,7 +338,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Het weergavegedeelte</title>
 
             <sect3>
@@ -354,7 +354,7 @@
             
                 <para>Informatie over elke foto wordt onder het bijhorende miniatuur weergegeven. In de configuratiedialoog van &digikam; kunt u aangeven welke informatie getoond wordt . Ga hiervoor naar menuoptie <menuchoice><guimenu>Instellingen</guimenu> <guimenuitem>&digikam; instellen</guimenuitem></menuchoice>, sectie <guilabel>Albums</guilabel>. Onderaan deze sectie ziet u een vak met diverse keuzevakjes voor het aan- en uitzetten van de <guilabel> Extra informatie in de miniatuurweergave</guilabel>. </para> 
 
-                <para>Als u de muisaanwijzer op een miniatuur plaatst, dan ziet u een tekstballon verschijnen. Deze tekstballon bevat de meest belangrijke eigenschappen van de foto, inclusief de tags die u hebt toegewezen. In de schermafdruk bovenaan de sectie <link linkend="using-kapp-mainwindow-intro">Inleiding tot het hoofdvenster</link> ziet u zo'n tekstballon. </para>
+                <para>Als u de muisaanwijzer op een miniatuur plaatst, dan ziet u een tekstballon verschijnen. Deze tekstballon bevat de meest belangrijke eigenschappen van de foto, inclusief de tags die u hebt toegewezen. In de schermafdruk bovenaan de sectie <link linkend="using-tdeApp-mainwindow-intro">Inleiding tot het hoofdvenster</link> ziet u zo'n tekstballon. </para>
 
             </sect3>
 
@@ -365,14 +365,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Een foto bekijken</title>
              
-                <para>U kunt de afbeeldingsbewerker openen door te dubbelklikken op een miniatuur, of er met de rechter muisknop op te klikken en <guilabel>Tonen/bewerken</guilabel> te selecteren in het contextmenu. Zie ook de sectie <link linkend="using-kapp-imageeditor">&digikam;-afbeeldingsbewerker</link> voor een uitleg over hoe u uw afbeeldingen kunt bewerken. </para>
+                <para>U kunt de afbeeldingsbewerker openen door te dubbelklikken op een miniatuur, of er met de rechter muisknop op te klikken en <guilabel>Tonen/bewerken</guilabel> te selecteren in het contextmenu. Zie ook de sectie <link linkend="using-tdeApp-imageeditor">&digikam;-afbeeldingsbewerker</link> voor een uitleg over hoe u uw afbeeldingen kunt bewerken. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Foto's bekijken en bewerken met een ander programma</title>
 
                 <para>Soms biedt &digikam; niet alle mogelijkheden die u nodig hebt. U kunt dan een foto in een ander programma openen door met de rechter muisknop op de miniatuur te klikken en <guilabel>Openen met</guilabel> te selecteren in het submenu. De lijst met programma's die dan getoond wordt bevat alle programma's die bij &kde; zijn gekoppeld aan het bestandstype van de foto. Mocht het programma dat u wilt gebruiken niet voorkomen in deze lijst, lees dan het handboek van &kde; voor meer informatie over hoe u de bestandsassociaties kunt wijzigen. </para>
@@ -381,7 +381,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Een foto draaien</title>
              
                 <note><para>Hiervoor dient de plugin Kipi JPEG Lossless (Kipi-plugin voor lossless JPEG) te zijn geïnstalleerd. Mocht u deze plugin niet hebben, dan kunt u de afbeeldingen alleen draaien vanuit de afbeeldingsbewerker. In de afbeeldingsbewerker wordt een andere manier gebruikt om de foto te draaien. U ziet misschien geen verschil, maar het draaien van een afbeelding in de afbeeldingsbewerker kan tot een klein beetje kwaliteitsverlies leiden. De draaimethode die we hier omschrijven gebruikt de speciaal hiervoor bestemde Kipi-plugin voor lossless JPEG, welke er voor zorgt dat de kwaliteit van de oorspronkelijke afbeelding behouden blijft. </para></note>
@@ -394,10 +394,10 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-imagemetadata">
+            <sect3 id="using-tdeApp-imagemetadata">
             <title>Foto-metadata, eigenschappen en histogram</title>
 
-                <sect4 id="using-kapp-tagscommentsedit">
+                <sect4 id="using-tdeApp-tagscommentsedit">
                 <title>Tags en commentaren bewerken</title>
             
                     <anchor id="tagscommentsedit.anchor"/>
@@ -419,7 +419,7 @@
 
                 </sect4>                    
                 
-                <sect4 id="using-kapp-propertiesmetadatahistogram">
+                <sect4 id="using-tdeApp-propertiesmetadatahistogram">
                 <title>Eigenschappen, ingebedde metadata en histogram bekijken</title>
             
                     <anchor id="propertiesmetadatahistogram.anchor"/>
@@ -434,7 +434,7 @@
                         fileref="imageproperties3.png"/>
                     </figure>
                 
-                    <para>Dit tabblad toont u dezelfde Exif-informatie als de EXIF-weergavedialoog die  beschreven wordt in de sectie <link linkend="using-kapp-exifviewertool">EXIF-weergave</link>. </para>
+                    <para>Dit tabblad toont u dezelfde Exif-informatie als de EXIF-weergavedialoog die  beschreven wordt in de sectie <link linkend="using-tdeApp-exifviewertool">EXIF-weergave</link>. </para>
                     
                     <figure>
                         <title>Tabblad EXIF van de eigenschappendialoog</title>
@@ -442,7 +442,7 @@
                         fileref="imageproperties2.png"/>
                     </figure>
                                     
-                    <para>Dit tabblad toont de volledige afbeeldingshistogrammen. U kunt meer informatie over histogrammen vinden in de sectie <link linkend="using-kapp-histogramviewer">Histogramweergave</link>. </para>
+                    <para>Dit tabblad toont de volledige afbeeldingshistogrammen. U kunt meer informatie over histogrammen vinden in de sectie <link linkend="using-tdeApp-histogramviewer">Histogramweergave</link>. </para>
                 
                     <figure>
                         <title>Tabblad histogram van de eigenschappendialoog</title>
@@ -456,14 +456,14 @@
                                                                                                             
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Een foto hernoemen</title>
              
                 <para>U kunt de bestandsnaam van een foto hernoemen door met de rechter muisknop op de miniatuur te klikken en <guilabel>Hernoemen</guilabel> te selecteren in het contextmenu. Let erop dat u de bestandsextensie niet wijzigt (.jpg, .tif, etc.). </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Een foto verwijderen</title>
              
                 <para>Als u een album uit &digikam; verwijdert, dan wordt deze in de prullenbak van KDE geplaatst. Als u liever de albums onmiddellijk van de schijf laat verwijderen, dan kunt u dit in &digikam; instellen. Selecteer menuoptie <menuchoice><guimenu>Instellingen</guimenu> <guimenuitem>&digikam; instellen...</guimenuitem></menuchoice> en klik op de sectie <guilabel>Diversen</guilabel>. Hier kunt u bepalen wat er gebeurt als u een foto uit &digikam; verwijdert. </para>
@@ -474,7 +474,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
         <title>De weergave "Mijn tags" </title>
 
             <para>Door tags toe te voegen aan foto's kunt u op een flexibele manier uw foto's organiseren en catalogiseren. De tags zijn etiketten die u kunt toevoegen aan individuele foto's. Zodra u een tag hebt toegevoegd aan een afbeelding kunt u deze terugvinden door de tag in de lijst te selecteren. </para>
@@ -490,7 +490,7 @@
 
             <para>Als u in de boomstructuur een tag selecteert die subtags bevat, dan zal &digikam; standaard niet de foto's tonen die gemarkeerd zijn met de subtags. Als u wel wilt dat alle foto's die gemarkeerd zijn met een subtag van de huidige tag worden weergegeven, dan kunt u dat instellen. Ga hiervoor naar menuitem <menuchoice><guimenu>Instellingen</guimenu> <guimenuitem>&digikam; instellen...</guimenuitem></menuchoice>, selecteer de sectie <guilabel>Albums</guilabel> en zet het keuzevakje <guilabel>Items in subtags tonen</guilabel> aan. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
             <title>Tags beheren</title>
              
                 <para>U kunt een nieuwe tag toevoegen door met de rechter muisknop te klikken op de tekst <guilabel>Mijn tags</guilabel> en vervolgens <guilabel>Nieuw tag</guilabel> te selecteren in het contextmenu. Als u een nieuwe tag aanmaakt door met de rechter muisknop te klikken op een bestaande tag, dan zal de nieuwe tag worden aangemaakt als een subtag. </para>
@@ -503,7 +503,7 @@
                                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
             <title>Tags toevoegen aan foto's</title>
              
                 <para>Voordat u gebruik kunt maken van &digikam; tag-faciliteiten dient u tags toe te voegen aan uw foto's. Dat kan op twee manieren. U kunt de foto's in de weergavelijst selecteren en vervolgens naar de juiste tag slepen in de lijst "Mijn tags". En u kunt de foto's selecteren en vervolgens met de rechter muisknop klikken op de selectie. Kies in het contextmenu de juiste tag onder menuoptie <guilabel>Tag toewijzen</guilabel>. </para>
@@ -525,7 +525,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>Een digitale camera gebruiken met &digikam;</title>
     <anchor id="camerainterface.anchor"/>
 
@@ -534,7 +534,7 @@
 
             <para>Met het cameravenster kunt u uw foto's direct van uw camera naar een &digikam;-album downloaden. U kunt het cameravenster openen door te klikken op het Camera-menu en het toestel te kiezen in de lijst met ingestelde camera's. Zie de sectie <link linkend="setupcamera">Camera's</link> voor meer informatie over hoe u uw camera kunt instellen in &digikam;. </para>
 
-            <para>Het cameravenster is niet de enige manier waarop u uw foto's in &digikam; kunt krijgen. Zie de sectie <link linkend="using-kapp-addphototoalbum">Een foto toevoegen aan een album</link> voor meer informatie over hoe u foto's van uw harde schijf of een ander medium kunt toevoegen aan een van uw albums. </para>
+            <para>Het cameravenster is niet de enige manier waarop u uw foto's in &digikam; kunt krijgen. Zie de sectie <link linkend="using-tdeApp-addphototoalbum">Een foto toevoegen aan een album</link> voor meer informatie over hoe u foto's van uw harde schijf of een ander medium kunt toevoegen aan een van uw albums. </para>
             
             <para>Om uw camera te kunnen benaderen met &digikam; sluit u het toestel aan op uw computer, en zet u de camera aan in de image-display-modus. </para>
         
@@ -574,7 +574,7 @@
         <title>Het doelalbum selecteren</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>Als u op knop <guilabel>Alles downloaden</guilabel> of <guilabel>Selectie downloaden</guilabel> klikt wordt er een dialoog geopend waarin u een doelalbum kunt selecteren. Dit is het album waarin de foto's zullen worden opgeslagen. Er wordt een lijst met albums getoond, gesorteerd volgens uw albuminstellingen (zie de sectie <link linkend="using-kapp-myalbumsview">Mijn albums</link> voor meer over albumsortering). U kunt het doelalbum in deze lijst selecteren en dan op OK klikken. </para>
+            <para>Als u op knop <guilabel>Alles downloaden</guilabel> of <guilabel>Selectie downloaden</guilabel> klikt wordt er een dialoog geopend waarin u een doelalbum kunt selecteren. Dit is het album waarin de foto's zullen worden opgeslagen. Er wordt een lijst met albums getoond, gesorteerd volgens uw albuminstellingen (zie de sectie <link linkend="using-tdeApp-myalbumsview">Mijn albums</link> voor meer over albumsortering). U kunt het doelalbum in deze lijst selecteren en dan op OK klikken. </para>
         
             <figure>
                 <title>De dialoog Doelalbum selecteren</title>
@@ -623,7 +623,7 @@
             <sect3>
             <title>Automatisch draaien</title>
 
-                <para>Als uw camera informatie insluit over de oriëntatie van de camera op het moment dat de foto genomen is, dan kan &digikam; die gebruiken om de afbeelding automatisch te draaien tijdens het downloaden. Niet alle camera's sluiten deze informatie in. Zie de sectie <link linkend="using-kapp-imagemetadata">Foto-metadata -eigenschappen en -histogram</link> voor meer over de informatie die uw camera in uw foto's kan opslaan. </para>
+                <para>Als uw camera informatie insluit over de oriëntatie van de camera op het moment dat de foto genomen is, dan kan &digikam; die gebruiken om de afbeelding automatisch te draaien tijdens het downloaden. Niet alle camera's sluiten deze informatie in. Zie de sectie <link linkend="using-tdeApp-imagemetadata">Foto-metadata -eigenschappen en -histogram</link> voor meer over de informatie die uw camera in uw foto's kan opslaan. </para>
 
                 <para>Het automatisch draaien is standaard aangezet, en als uw camera deze informatie niet insluit laat &digikam; de foto's in hun oorspronkelijke oriëntatie staan. Als u het automatisch draaien wilt uitzetten, klik dan op de knop <guilabel>Uitgebreid</guilabel> en zet het keuzevakje bij <guilabel>Automatisch roteren/omkeren aan de hand van de door de camera geleverde Exif-informatie</guilabel> uit. </para>
             
@@ -632,7 +632,7 @@
             <sect3>
             <title>Automatisch doelalbums aanmaken</title>
                 
-                <para>Als uw camera informatie levert over de datum waarop een foto is genomen, dan kan &digikam; die gebruiken om automatisch subalbums aan te maken in het doelalbum. De namen van de subalbums zullen worden gebaseerd op de datum van de foto's. Alle foto's met dezelfde datum zullen in hetzelfde subalbum worden geplaatst. Niet alle camera's leveren deze informatie. Zie de sectie <link linkend="using-kapp-imagemetadata">Foto-metadata -eigenschappen en -histogram</link> voor meer details over de informatie die uw camera in foto's heeft gesloten. </para>
+                <para>Als uw camera informatie levert over de datum waarop een foto is genomen, dan kan &digikam; die gebruiken om automatisch subalbums aan te maken in het doelalbum. De namen van de subalbums zullen worden gebaseerd op de datum van de foto's. Alle foto's met dezelfde datum zullen in hetzelfde subalbum worden geplaatst. Niet alle camera's leveren deze informatie. Zie de sectie <link linkend="using-tdeApp-imagemetadata">Foto-metadata -eigenschappen en -histogram</link> voor meer details over de informatie die uw camera in foto's heeft gesloten. </para>
                 
                 <para>Deze optie is standaard uitgezet. &digikam; zal de foto's in de doelalbums zelf downloaden. Als u deze optie wilt aanzetten, klik op de knop <guilabel>Uitgebreid</guilabel> en selecteer het keuzevakje <guilabel>Foto's plaatsen in automatisch aangemaakte op datum gebaseerde subalbums van doelalbum</guilabel> onderin het venster. </para>
 
@@ -642,7 +642,7 @@
                                     
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>&digikam; afbeeldingsbewerker</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -751,7 +751,7 @@
         <sect2>
         <title>Afbeeldingseigenschappen</title>
             
-            <sect3 id="using-kapp-commentsedittool">
+            <sect3 id="using-tdeApp-commentsedittool">
             <title>Commentaren bewerken</title>
                 
                 <anchor id="commentsedittool.anchor"/>
@@ -760,7 +760,7 @@
             
             </sect3>
     
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>EXIF-weergave</title>
             
                 <anchor id="kexif.anchor"/>
@@ -768,7 +768,7 @@
                 <sect4>
                 <title>Wat is EXIF?</title>
                     
-                    <para>EXIF staat voor <emphasis>EXtended Interchange Format</emphasis>. Het is specifiek ontworpen voor digitale camera's. Het maakt het mogelijk om een grote hoeveelheid informatie over de foto, zoals de camera die de foto nam en alle camera-instellingen (incl. datum en tijd) van het moment dat de foto is genomen in de afbeelding te bewaren. Er kan ook een miniatuur van de afbeelding worden ingesloten. Kijk bij de sectie <link linkend="using-kapp-imagemetadata">Foto-metadata, eigenschappen en histogram</link> voor meer details over informatie die in uw foto's is ingesloten. </para>
+                    <para>EXIF staat voor <emphasis>EXtended Interchange Format</emphasis>. Het is specifiek ontworpen voor digitale camera's. Het maakt het mogelijk om een grote hoeveelheid informatie over de foto, zoals de camera die de foto nam en alle camera-instellingen (incl. datum en tijd) van het moment dat de foto is genomen in de afbeelding te bewaren. Er kan ook een miniatuur van de afbeelding worden ingesloten. Kijk bij de sectie <link linkend="using-tdeApp-imagemetadata">Foto-metadata, eigenschappen en histogram</link> voor meer details over informatie die in uw foto's is ingesloten. </para>
 
                     <para>Het EXIF-formaat kent verschillende markeersecties genaamd <emphasis>Image File Directories</emphasis> (IFD). Deze secties zijn als volgt in een normaal EXIF-bestand te vinden: <itemizedlist>
             
@@ -808,7 +808,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Bestandseigenschappen</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -817,14 +817,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogramweergave</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Als u geïnteresseerd bent in de gedetailleerde histogram van uw foto, dan kunt u deze bekijken via <menuchoice><guimenu>Afbeelding</guimenu> <guimenuitem>Eigenschappen</guimenuitem></menuchoice>, tabblad <guilabel>Histogram</guilabel>. De histogram van een afbeelding toont de hoeveelheid van elke aanwezige kleur en de verschillende versterkingen ervan binnen de afbeelding. Als uw foto een bepaalde verkleuring heeft, dan kunt u met behulp van de histogram misschien achterhalen wat er mis is. </para>
             
-                <para>De histogramweergave toont u informatie over de statistische distributie van de kleurwaarden in de huidige afbeelding. De histogramweergave is puur ter informatie: u kunt er geen wijzigingen in de afbeelding zelf mee aanbrengen. Als u een histogram-gebaseerde kleurcorrectie wilt uitvoeren, gebruik dan de plugin "Niveaus aanpassen". Deze plugin is onderdeel van het <ulink url="http://extragear.kde.org/apps/digikamimageplugins.php">DigikamImagePlugins</ulink>-project. Meer informatie over het gebruik van plugins in &digikam; vindt u in de sectie <link linkend="using-kapp-setup">&digikam; instellen</link>. </para>
+                <para>De histogramweergave toont u informatie over de statistische distributie van de kleurwaarden in de huidige afbeelding. De histogramweergave is puur ter informatie: u kunt er geen wijzigingen in de afbeelding zelf mee aanbrengen. Als u een histogram-gebaseerde kleurcorrectie wilt uitvoeren, gebruik dan de plugin "Niveaus aanpassen". Deze plugin is onderdeel van het <ulink url="http://extragear.kde.org/apps/digikamimageplugins.php">DigikamImagePlugins</ulink>-project. Meer informatie over het gebruik van plugins in &digikam; vindt u in de sectie <link linkend="using-tdeApp-setup">&digikam; instellen</link>. </para>
                                                 
                 <figure>
                     <title>De histogramweergave</title>
@@ -865,7 +865,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Werken met histogrammen</title>
                 
                 <para>Histogrammen zijn een grafische manier om de accuratie van de afbeelding die op het scherm wordt weergegeven te achterhalen. De grafiek bestaat uit drie regio's van de helderheid van de foto: <itemizedlist><listitem><para> (1): de schaduwtoon links. </para></listitem> <listitem><para> (2): de middeltoon in het midden. </para></listitem> <listitem><para> (3): de oplichttoon rechts. </para></listitem> </itemizedlist> <figure> <title>De histogrambeschrijving</title> <graphic srccredit="The Histogram Description" fileref="histogramdescription.png"/> </figure> De distributie van de grafiek, waarbij de pieken en ? geclusterd zijn, geeft aan of de afbeelding te donker, te licht of goed in balans is. </para>
@@ -878,19 +878,19 @@
 
                 <para>Belangrijk: niet alle afbeeldingen hoeven deze uitstulping in het midden van hun histogram te hebben. Dit is sterk afhankelijk van het onderwerp van de foto. In sommige gevallen zal de histogram een piek aan de linker/rechter zijde of aan beide zijden tonen. </para>
                         
-                <para>De histogram biedt een betrouwbare manier om te bepalen of een foto goed is belicht. Mocht de foto onder- of overbelicht zijn, dan kunt u met behulp van <link linkend="using-kapp-correctingexposure">belichtingscorrectie</link> de foto repareren. </para>
+                <para>De histogram biedt een betrouwbare manier om te bepalen of een foto goed is belicht. Mocht de foto onder- of overbelicht zijn, dan kunt u met behulp van <link linkend="using-tdeApp-correctingexposure">belichtingscorrectie</link> de foto repareren. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Een foto aanpassen</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Een foto bijsnijden</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Handmatig bijsnijden</title>
 
                     <para>Het bijsnijden van een afbeelding is met de Afbeeldingsbewerker een peulenschil. Om een afbeelding bij te snijden trekt u er met de muisaanwijzer een rechthoek over heen terwijl u de linker muisknop ingedrukt houdt. U ziet dan een draadframe die over het geselecteerde gebied wordt gespannen. </para>
@@ -907,7 +907,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportioneel bijsnijden</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -984,7 +984,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Afbeeldinggrootte veranderen</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -1000,7 +1000,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Foto's draaien of spiegelen</title>
                 
                 <para>Als de oriëntatie van een foto onjuist is, dan kunt u deze <guilabel>spiegelen</guilabel> of <guilabel>roteren</guilabel>. Gebruik hiervoor de roteer-/spiegelhulpmiddelen bij de menuopties <menuchoice><guimenu>Transformeren</guimenu> <guimenuitem>Roteren</guimenuitem></menuchoice> en <menuchoice><guimenu>Transformeren</guimenu> <guimenuitem>Spiegelen</guimenuitem></menuchoice>. </para>
@@ -1009,7 +1009,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Rode ogen corrigeren</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1026,7 +1026,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Scherpheid aanpassen</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1079,7 +1079,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Kleur corrigeren</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1119,7 +1119,7 @@
             <para>Het resultaat van de aanpassingen die u hebt gemaakt zullen pas worden onthouden als u uw foto hebt opgeslagen. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Belichting aanpassen</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1275,7 +1275,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>&digikam; instellen</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1294,9 +1294,9 @@
                                 
             <para>De <guilabel>Locatie van albumverzamelingen</guilabel> is de plek op uw harde schijf waar &digikam; alle albums zal opslaan. Als u deze locatie veranderd zonder dat u alle albums op de harde schijf naar deze nieuwe plek verhuist, dan gaat &digikam; er van uit dat er geen albums zijn en zal het programma een nieuwe database op de nieuwe locatie aanmaken. Uw oude albums worden niet gewijzigd, maar u dient deze instelling terug te zetten naar de oude locatie om de albums te kunnen openen. Als u niet zeker weet wat u moet doen kunt u het beste deze instelling ongewijzigd laten. </para>            
             
-            <para>De <guilabel>tag-instellingen</guilabel> worden uitgelegd in de sectie <link linkend="using-kapp-mytagsview">Mijn tags</link>. </para> 
+            <para>De <guilabel>tag-instellingen</guilabel> worden uitgelegd in de sectie <link linkend="using-tdeApp-mytagsview">Mijn tags</link>. </para> 
 
-            <para>De opties voor <guilabel>miniaturen</guilabel> worden beschreven in de sectie <link linkend="using-kapp-imageview">Afbeeldingen</link>. </para> 
+            <para>De opties voor <guilabel>miniaturen</guilabel> worden beschreven in de sectie <link linkend="using-tdeApp-imageview">Afbeeldingen</link>. </para> 
             
             <para>De overige instellingen in dit dialoog spreken voor zich. </para> 
                         
@@ -1325,7 +1325,7 @@
         <sect2 id="setupcollection">
         <title>Verzamelingen</title>
 
-            <para>Hier kunt u de typen albumverzamelingen beheren. Deze verzamelingen worden beschreven in de sectie <link linkend="using-kapp-myalbumsview">Mijn albums</link>. </para>
+            <para>Hier kunt u de typen albumverzamelingen beheren. Deze verzamelingen worden beschreven in de sectie <link linkend="using-tdeApp-myalbumsview">Mijn albums</link>. </para>
 
             <figure>
                 <title>De instellingen voor verzamelingen</title>
@@ -1419,7 +1419,7 @@
         <sect2 id="setupmisc">
         <title>Diverse instellingen</title>
 
-            <para>Hier kunt u bepalen wat &digikam; doet als u een foto of album verwijdert. Zie de secties <link linkend="using-kapp-deleteimage">Een foto verwijderen</link> en <link linkend="using-kapp-deletealbum">Een album verwijderen</link> voor meer informatie. </para>
+            <para>Hier kunt u bepalen wat &digikam; doet als u een foto of album verwijdert. Zie de secties <link linkend="using-tdeApp-deleteimage">Een foto verwijderen</link> en <link linkend="using-tdeApp-deletealbum">Een album verwijderen</link> voor meer informatie. </para>
             
             <para>U kunt hier ook het opstartscherm dat wordt getoond als &digikam; wordt geladen uitschakelen. Dit kan de opstarttijd van het programma iets verminderen. </para>
 
@@ -2517,7 +2517,7 @@
 <appendix id="installation">
 <title>Installatie</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Hoe &digikam; te verkrijgen</title>
 
 <para>De website van &digikam; kunt u vinden op <ulink url="http://digikam.sourceforge.net">http://digikam.sourceforge.net</ulink>. U kunt hier regelmatig kijken voor het laatste nieuws over &digikam;. U kunt &digikam; verkrijgen in binair formaat en als broncode op <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/nl/showfoto/index.docbook b/doc/nl/showfoto/index.docbook
index 024793e9..d6b130d9 100644
--- a/doc/nl/showfoto/index.docbook
+++ b/doc/nl/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Dutch "INCLUDE"><!-- change language only here -->
   <!ENTITY showfoto '<application>Showfoto</application>'>
@@ -67,10 +67,10 @@
 <chapter id="introduction">
 <title>Inleiding</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Achtergrond</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Informatie over &showfoto;</title>
 
        <para>&showfoto; is een snelle afbeeldingsbewerker met enkele krachtige gereedschappen voor het manipuleren van foto's. U kunt het gebruiken om uw foto's te bekijken en correcties en wijzigingen aan te brengen. </para>
@@ -107,7 +107,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Ondersteunde afbeeldingsformaten</title>
 
         <sect2>
@@ -130,7 +130,7 @@
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Ondersteunde plugins</title>
 
         <para>Een van de bijzondere eigenschapen van &showfoto; is de eenvoud waarmee het programma kan worden uitgebreid, door middel van <emphasis>Digikam Image Editor Plugins</emphasis>: deze digiKam-plugins voegen nieuwe opties aan het programma toe voor het manipuleren van afbeeldingen. Het <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigikamImage-project</ulink> is verantwoordelijk voor het aanleveren van een verzameling hulpprogramma's die gebruik maken van deze architectuur. Het instellen van de digiKam-plugins wordt beschreven in deze <link linkend="setupplugins">sectie</link>. </para>
@@ -144,10 +144,10 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>&showfoto; gebruiken</title>
            
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>&showfoto;-afbeeldingsbewerker</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -256,7 +256,7 @@
         <sect2>
         <title>Afbeeldingseigenschappen</title>
             
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>EXIF-weergave</title>
             
                 <anchor id="kexif.anchor"/>
@@ -304,7 +304,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Bestandseigenschappen</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -313,14 +313,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Histogramweergave</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Als u geïnteresseerd bent in de gedetailleerde histogram van uw foto, dan kunt u deze bekijken via <menuchoice><guimenu>Afbeelding</guimenu> <guimenuitem>Eigenschappen</guimenuitem></menuchoice>, tabblad <guilabel>Histogram</guilabel>. De histogram van een afbeelding toont de hoeveelheid van elke aanwezige kleur en de verschillende versterkingen ervan binnen de afbeelding. Als uw foto een bepaalde verkleuring heeft, dan kunt u met behulp van de histogram misschien achterhalen wat er mis is. </para>
             
-                <para>De histogramweergave toont u informatie over de statistische distributie van de kleurwaarden in de huidige afbeelding. De histogramweergave is puur ter informatie: u kunt er geen wijzigingen in de afbeelding zelf mee aanbrengen. Als u een histogram-gebaseerde kleurcorrectie wilt uitvoeren, gebruik dan de plugin "Niveaus aanpassen". Deze plugin is onderdeel van het <ulink url="http://extragear.kde.org/apps/digikamimageplugins.php">DigikamImagePlugins</ulink>-project. Meer informatie over het gebruik van plugins in &showfoto; vindt u in de sectie <link linkend="using-kapp-setup">Configuratie</link>. </para>
+                <para>De histogramweergave toont u informatie over de statistische distributie van de kleurwaarden in de huidige afbeelding. De histogramweergave is puur ter informatie: u kunt er geen wijzigingen in de afbeelding zelf mee aanbrengen. Als u een histogram-gebaseerde kleurcorrectie wilt uitvoeren, gebruik dan de plugin "Niveaus aanpassen". Deze plugin is onderdeel van het <ulink url="http://extragear.kde.org/apps/digikamimageplugins.php">DigikamImagePlugins</ulink>-project. Meer informatie over het gebruik van plugins in &showfoto; vindt u in de sectie <link linkend="using-tdeApp-setup">Configuratie</link>. </para>
                                                 
                 <figure>
                     <title>De histogramweergave</title>
@@ -361,7 +361,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Werken met histogrammen</title>
                 
                 <para>Histogrammen zijn een grafische manier om de accuratie van de afbeelding die op het scherm wordt weergegeven te achterhalen. De grafiek bestaat uit drie regio's van de helderheid van de foto: <itemizedlist><listitem><para> (1): de schaduwtoon links. </para></listitem> <listitem><para> (2): de middeltoon in het midden. </para></listitem> <listitem><para> (3): de oplichttoon rechts. </para></listitem> </itemizedlist> <figure> <title>De histogrambeschrijving</title> <graphic srccredit="The Histogram Description" fileref="histogramdescription.png"/> </figure> De distributie van de grafiek, waarbij de pieken en ? geclusterd zijn, geeft aan of de afbeelding te donker, te licht of goed in balans is. </para>
@@ -374,19 +374,19 @@
 
                 <para>Belangrijk: niet alle afbeeldingen hoeven deze uitstulping in het midden van hun histogram te hebben. Dit is sterk afhankelijk van het onderwerp van de foto. In sommige gevallen zal de histogram een piek aan de linker/rechter zijde of aan beide zijden tonen. </para>
                         
-                <para>De histogram biedt een betrouwbare manier om te bepalen of een foto goed is belicht. Mocht de foto onder- of overbelicht zijn, dan kunt u met behulp van <link linkend="using-kapp-correctingexposure">belichtingscorrectie</link> de foto repareren. </para>
+                <para>De histogram biedt een betrouwbare manier om te bepalen of een foto goed is belicht. Mocht de foto onder- of overbelicht zijn, dan kunt u met behulp van <link linkend="using-tdeApp-correctingexposure">belichtingscorrectie</link> de foto repareren. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Een foto aanpassen</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Een foto bijsnijden</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Handmatig bijsnijden</title>
 
                     <para>Het bijsnijden van een afbeelding is met &showfoto; een peulenschil. Om een afbeelding bij te snijden trekt u er met de muisaanwijzer een rechthoek over heen terwijl u de linker muisknop ingedrukt houdt. U ziet dan een draadframe die over het geselecteerde gebied wordt gespannen. </para>
@@ -403,7 +403,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Proportioneel bijsnijden</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -480,7 +480,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Afbeeldinggrootte veranderen</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -496,7 +496,7 @@
                                 
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Foto's draaien of spiegelen</title>
                 
                 <para>Als de oriëntatie van een foto onjuist is, dan kunt u deze <guilabel>spiegelen</guilabel> of <guilabel>roteren</guilabel>. Gebruik hiervoor de roteer-/spiegelhulpmiddelen bij de menuopties <menuchoice><guimenu>Transformeren</guimenu> <guimenuitem>Roteren</guimenuitem></menuchoice> en <menuchoice><guimenu>Transformeren</guimenu> <guimenuitem>Spiegelen</guimenuitem></menuchoice>. </para>
@@ -505,7 +505,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Rode ogen corrigeren</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -522,7 +522,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Scherpheid aanpassen</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -575,7 +575,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Kleur corrigeren</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -615,7 +615,7 @@
             <para>Het resultaat van de aanpassingen die u hebt gemaakt zullen pas worden onthouden als u uw foto hebt opgeslagen. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Belichting aanpassen</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -771,7 +771,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>&showfoto; instellen</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1421,7 +1421,7 @@
 <appendix id="installation">
 <title>Installatie</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Hoe &showfoto; te verkrijgen</title>
 
 <para>De website van &showfoto; kunt u vinden op <ulink url="http://digikam.sourceforge.net">http://digikam.sourceforge.net</ulink>. U kunt hier regelmatig kijken voor het laatste nieuws over &showfoto;. U kunt &showfoto; verkrijgen in binair formaat en als broncode op <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>. </para>
diff --git a/doc/pt_BR/digikam/index.docbook b/doc/pt_BR/digikam/index.docbook
index 45f28f14..78c78fd7 100644
--- a/doc/pt_BR/digikam/index.docbook
+++ b/doc/pt_BR/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Brazilian-Portuguese "INCLUDE"><!-- change language only here -->
   <!ENTITY digikam '<application>digiKam</application>'>
@@ -83,10 +83,10 @@
 <chapter id="introduction">
 <title>Introdução</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Fundo</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Sobre o &digikam;</title>
 
        <para>O &digikam; é um avançado aplicativo de gerenciamento de fotos digitais para o ambiente de trabalho KDE. Ele fornece uma interface simples que faz a importação e organização de fotografias digitais num "pulo". O &digikam; lhe permite gerenciar grandes quantidades de fotografias digitais em Álbuns e organizar estas fotografias para fácil acesso usando Marcas. Ele possui muitos recursos para visualizar, organizar, manipular e compartilhar suas fotos. </para>
@@ -127,7 +127,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Começando</title>
 
         <anchor id="firstrundialog.anchor"/>
@@ -141,15 +141,15 @@
 
         <para>Se você já possui uma coleção de fotografias em seu disco rígido você pode inserir a pasta de nível superior que contém estas fotografias como a pasta de Biblioteca de Álbuns. O &digikam; tratará cada sub-pasta da pasta que inserir como um Álbum. Nenhuma fotografia será alterada. </para>
 
-        <para>Quando você usar uma pasta de fotografias existente como pasta da Biblioteca de Álbuns perceberá que os Álbuns na lista Meu Álbum não possuem fotografias como ícones de Álbum. Na primeira vez que você visualizar cada Álbum o &digikam; criará uma miniatura a partir da primeira fotografia do Álbum e usará esta miniatura como ícone do Álbum. Veja a seção <link linkend="using-kapp-myalbumsview">Meu Álbum</link> para detalhes de como mudar o ícone do Álbum. </para>
+        <para>Quando você usar uma pasta de fotografias existente como pasta da Biblioteca de Álbuns perceberá que os Álbuns na lista Meu Álbum não possuem fotografias como ícones de Álbum. Na primeira vez que você visualizar cada Álbum o &digikam; criará uma miniatura a partir da primeira fotografia do Álbum e usará esta miniatura como ícone do Álbum. Veja a seção <link linkend="using-tdeApp-myalbumsview">Meu Álbum</link> para detalhes de como mudar o ícone do Álbum. </para>
 
-        <para>Se você tiver acessado anteriormente sua coleção de fotografias com outro aplicativo que tenha criado miniaturas em sub-pastas não padrão, o &digikam; mostrará estas pastas de miniaturas como Álbuns separados. O &digikam; segue os padrões do <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> para pastas de miniaturas. Não existe maneira de ocultar as pastas de miniaturas não-padrão da lista do "Meu Álbum". Se você deseja mantê-las você pode criar uma Coleção de Álbum que contenham todas as Pastas de miniaturas e então visualizar seus Álbuns ordenados Por Coleção. Veja a seção <link linkend="using-kapp-myalbumsview">Meu Álbum</link> para mais detalhes sobre Coleções de Álbum. </para>
+        <para>Se você tiver acessado anteriormente sua coleção de fotografias com outro aplicativo que tenha criado miniaturas em sub-pastas não padrão, o &digikam; mostrará estas pastas de miniaturas como Álbuns separados. O &digikam; segue os padrões do <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink> para pastas de miniaturas. Não existe maneira de ocultar as pastas de miniaturas não-padrão da lista do "Meu Álbum". Se você deseja mantê-las você pode criar uma Coleção de Álbum que contenham todas as Pastas de miniaturas e então visualizar seus Álbuns ordenados Por Coleção. Veja a seção <link linkend="using-tdeApp-myalbumsview">Meu Álbum</link> para mais detalhes sobre Coleções de Álbum. </para>
 
-        <para>Uma vez que você tenha configurado a Pasta de Biblioteca de Álbuns você pode configurar o &digikam; para trabalhar com sua câmera digital. Então aprenda como usar o <link linkend="using-kapp-myalbumsview">Meus Álbuns</link> e <link linkend="using-kapp-mytagsview">Minhas Marcas</link> para organizar seus Álbuns de fotografias. </para> 
+        <para>Uma vez que você tenha configurado a Pasta de Biblioteca de Álbuns você pode configurar o &digikam; para trabalhar com sua câmera digital. Então aprenda como usar o <link linkend="using-tdeApp-myalbumsview">Meus Álbuns</link> e <link linkend="using-tdeApp-mytagsview">Minhas Marcas</link> para organizar seus Álbuns de fotografias. </para> 
                         
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Formatos de Arquivo de Imagem Suportados</title>
 
         <sect2>
@@ -157,9 +157,9 @@
 
         <para>Quase todas as câmeras digitais armazenam suas fotografias em um de dois formatos: JPEG ou TIFF. Muitas câmeras permitem que você selecione qual destes formatos usar. O JPEG é um formato comprimido que negocia um pouco da qualidade da imagem para manter o tamanho do arquivo pequeno. O TIFF não é um formato comprimido, e ele mantém alta qualidade de imagem mas gerando arquivos muito grandes. Uma descrição completa destes formatos pode ser encontrada na <ulink url="http://en.wikipedia.org/wiki/Graphics_file_format">Wikipedia</ulink>. O &digikam; suporta os dois formatos. </para>
 
-        <para>O PNG é um formato de imagem que foi desenvolvido como um substituto para um determinado número de formatos de arquivo de imagem antigos que eram usados largamente nos anos 90. Ele é um formato sem perda de qualidade como o TIFF mas um pouco mais compacto e pode economizar espaço em disco. Apesar de sua câmera provavelmente não suportar o PNG, algumas pessoas gostam de converter suas fotografias para o PNG tão logo elas sejam baixadas para o computador. Diferente do JPEG, imagens PNG não perdem qualidade cada vez que são re-codificadas após uma alteração. O &digikam; possui suporte completo a imagens PNG e o Plugin de Processamento de Imagens em Lote pode converter lotes de imagem de qualquer formato suportado para o PNG de uma vez só. Veja a seção <link linkend="using-kapp-setup">Configuração</link> para informações sobre o uso de plugins com o &digikam;. Para mais informações sobre o formato PNG veja a <ulink url="http://www.libpng.org/pub/png/">página pessoal do PNG</ulink>. </para>
+        <para>O PNG é um formato de imagem que foi desenvolvido como um substituto para um determinado número de formatos de arquivo de imagem antigos que eram usados largamente nos anos 90. Ele é um formato sem perda de qualidade como o TIFF mas um pouco mais compacto e pode economizar espaço em disco. Apesar de sua câmera provavelmente não suportar o PNG, algumas pessoas gostam de converter suas fotografias para o PNG tão logo elas sejam baixadas para o computador. Diferente do JPEG, imagens PNG não perdem qualidade cada vez que são re-codificadas após uma alteração. O &digikam; possui suporte completo a imagens PNG e o Plugin de Processamento de Imagens em Lote pode converter lotes de imagem de qualquer formato suportado para o PNG de uma vez só. Veja a seção <link linkend="using-tdeApp-setup">Configuração</link> para informações sobre o uso de plugins com o &digikam;. Para mais informações sobre o formato PNG veja a <ulink url="http://www.libpng.org/pub/png/">página pessoal do PNG</ulink>. </para>
 
-        <para>Algumas câmeras, normalmente as mais caras, permitem armazenar imagens no formato RAW. O formato RAW não é realmente um padrão somente de imagem. Ele é diferente para cada tipo de câmera. Imagens no formato RAW contém todos os dados que são obtidos diretamente do sensor de imagem da câmera antes do programa da câmera aplicar coisas como balanço, nitidez, etc. Armazenar fotografias no formato RAW da câmera permite alterar ajustes, como balanço do branco, após a fotografia ter sido tirada. A maioria dos fotógrafos profissionais usam o formato RAW porque ele oferece o máximo da flexibilidade. O lado negativo sobre o formato de imagem RAW é que ele pode ser muito grande. Se você deseja aprender mais sobre o formato de imagem RAW visite o guia muito útil <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml"> A Paisagem Luminosa</ulink>. Você pode converter o formato RAW para JPEG ou TIFF no &digikam; usando o plugin Conversor de Imagem RAW. Veja a seção <link linkend="using-kapp-setup">Configuração</link> para informações sobre o uso de plugins com o &digikam;. </para>
+        <para>Algumas câmeras, normalmente as mais caras, permitem armazenar imagens no formato RAW. O formato RAW não é realmente um padrão somente de imagem. Ele é diferente para cada tipo de câmera. Imagens no formato RAW contém todos os dados que são obtidos diretamente do sensor de imagem da câmera antes do programa da câmera aplicar coisas como balanço, nitidez, etc. Armazenar fotografias no formato RAW da câmera permite alterar ajustes, como balanço do branco, após a fotografia ter sido tirada. A maioria dos fotógrafos profissionais usam o formato RAW porque ele oferece o máximo da flexibilidade. O lado negativo sobre o formato de imagem RAW é que ele pode ser muito grande. Se você deseja aprender mais sobre o formato de imagem RAW visite o guia muito útil <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml"> A Paisagem Luminosa</ulink>. Você pode converter o formato RAW para JPEG ou TIFF no &digikam; usando o plugin Conversor de Imagem RAW. Veja a seção <link linkend="using-tdeApp-setup">Configuração</link> para informações sobre o uso de plugins com o &digikam;. </para>
 
         </sect2>
 
@@ -176,13 +176,13 @@
 
         <para>Esta dependência de outras bibliotecas significa que não é possível fornecer uma lista definitiva de todos os formatos que estarão disponíveis em seu sistema. Pelo menos o JPEG e o TIFF estarão disponíveis. </para>
 
-        <para>O &digikam; somente exibe arquivos que estão nos formatos que ele compreende. Isto é feito observando a extensão do arquivo e comparando-a com uma lista pré-definida. Se a extensão do arquivo estiver na lista o &digikam; mostrará o arquivo na Visão de Imagem. Você pode mudar a lista de extensões de arquivos que o &digikam; não aceitará, veja a seção de <link linkend="using-kapp-setup">Configuração</link> para mais detalhes. </para>
+        <para>O &digikam; somente exibe arquivos que estão nos formatos que ele compreende. Isto é feito observando a extensão do arquivo e comparando-a com uma lista pré-definida. Se a extensão do arquivo estiver na lista o &digikam; mostrará o arquivo na Visão de Imagem. Você pode mudar a lista de extensões de arquivos que o &digikam; não aceitará, veja a seção de <link linkend="using-tdeApp-setup">Configuração</link> para mais detalhes. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Plugins Suportados</title>
 
         <para>Uma das melhores coisas sobre o &digikam; é como seus recursos podem ser facilmente extendidos usando plugins. Duas arquiteturas de plugins estão disponíveis: <itemizedlist> <listitem><para><emphasis>Plugins do Kipi</emphasis>: o <ulink url="http://extragear.kde.org/apps/kipi">projeto de Interface de Plugins de Imagem do KDe</ulink> é um esforço para desenvolver uma estrutura de plugin comum para o &digikam;, <application>KinDaBa</application>, <application>Showimg</application> e o <application>Gwenview</application>. Seu objetivo é compartilhar os plugins de imagem entre todos os aplicativos gráficos. A configuração de Plugins do Kipi é descrita nesta <link linkend="setupkipi">seção</link>.</para></listitem> <listitem><para><emphasis>Plugins do Editor de Imagem</emphasis>: estes plugins adicionam novas opções de manipulação de imagem no Editor de Imagem do &digikam;. O <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projeto de Plugins de Imagem do Digikam</ulink> é dedicado a fornecer uma coleção de ferramentas usando esta arquitetura. A configuração de Plugins do Editor de Imagem é descrita nesta <link linkend="setupeditor">seção</link>.</para></listitem> </itemizedlist> Os plugins podem manipular imagens quase da mesma maneira que o usuário poderia. Sua vantajem é que é muito mais fácil adicionar uma capacidade ao &digikam; escrevendo um pequeno plugin do que modificando o código do &digikam;. </para>
@@ -193,14 +193,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Usando o &digikam;</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>A Janela Principal do &digikam;</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Introdução à Janela Principal</title>
 
             <para>
@@ -252,28 +252,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>Visão "Meus Álbuns"</title>
 
             <para>A lista "Meus Álbuns" oferece uma vista organizada dos seus álbuns de fotografias. Todas as fotografias que são gerenciadas pelo &digikam; são guardadas num único Álbum. Estes álbuns podem ser ordenados pela sua disposição de Pasta (diretório) no disco rígido, pelo nome da Coleção que foi definido nas Propriedades do Álbum ou pela data em que o Álbum foi criado pela primeira vez (esta data pode também ser alterada nas Propriedades de cada Álbum). </para>
             
             <para>Você poderá mudar entre estas ordenações usando a lista suspensa na Barra de Ferramentas no topo da janela. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Criando um Novo Álbum</title>
                 
                 <para>Existem diversas maneiras de criar novo Álbum. Você poderá criar um novo Álbum quando baixar novas fotografias novas da Câmera digital com a Ferramenta da Câmera. Poderá criar um Álbum vazio clicando no botão <guilabel>Novo Álbum</guilabel> na barra de ferramentas. Como uma opção adicional, você poderá criar um novo Álbum, importando uma pasta (diretório) existente com fotografias a partir do seu disco rígido, bastando para isso selecionar a opção <menuchoice><guimenu>Álbum-</guimenu> <guimenuitem>Importar</guimenuitem> <guimenuitem>Importar Pastas</guimenuitem></menuchoice> na barra de menu e selecionando a pasta que deseja importar. Um Álbum será criado com o mesmo nome que a pasta do disco rígido. Você pode usar o arrastar e soltar para importar uma pasta. Arraste um ícone de diretório, por exemplo de uma janela do <application>Konqueror</application>. Então solte-o na lista de álbum à esquerda. Um menu aparecerá fornecendo a opção de mover ou copiar a pasta para o &digikam;. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Excluindo um Álbum</title>
                 
                 <para>Quando você excluir um álbum no &digikam; ele será movido para a Lixeira do KDE. Como opção você pode mudar este comportamento, de modo que ele relamente exclua o Álbum e todas as fotografias nele. Isto pode ser mudado selecionando <menuchoice><guimenu>Configurações</guimenu> <guimenuitem>Configurar o &digikam;</guimenuitem></menuchoice> e selecionando a página Diversos. No topo desta página estão as opções que controlam o que acontece quando é excluída uma fotografia. Para excluir um Álbum, clique com o botão direito no Álbum na árvore "Meu Álbum" e selecione a opção Excluir Álbum do Disco no menu de contexto. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Adicionando uma Fotografia a um Álbum</title>
                 
                 <para>Na maioria das vezes você irá criar Álbuns novos e preenchê-los com fotografias diretamente da sua máquina digital com a Ferramenta de Câmera. Contudo, algumas vezes você poderá desejar adicionar uma fotografia que já esteja no seu computador num Álbum existente. Para adicionar uma fotografia a um Álbum, certifique-se que o Álbum está selecionado. Então clique no ícone para <guilabel>Adicionar Imagens</guilabel> na barra de ferramentas ou selecione a opção <menuchoice><guimenu>Álbum</guimenu> <guimenuitem>Importar</guimenuitem> <guimenuitem>Adicionar Imagens</guimenuitem></menuchoice> da barra de menu. Selecione as fotografias que deseja adicionar na janela de arquivos e clique em <guilabel>Abrir</guilabel>. As fotografias serão copiadas para o Álbum. Além disso, você pode usar o arrastar e soltar para importar fotografias. Arraste o ícone da fotografia, por exemplo de uma janela do <application>Konqueror</application>. Então solte-o na lista de imagens no lado direito. </para>
@@ -282,14 +282,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Movendo ou Copiando Fotografias Entre Álbuns</title>
                 
                 <para>Simplesmente arraste a fotografia e solte-a no Álbum destino para movê-la ou copiá-las de um Álbum para outro. Irá aparecer um menu que lhe dá a opção de <guilabel>Mover</guilabel> ou <guilabel>Copiar</guilabel> a fotografia. Você poderá mover ou copiar várias fotografias da mesma maneira, bastando para isso selecionar todas as fotografias que deseja mover e arrastá-las para o Álbum de destino. </para>
         
             </sect3>            
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Gerenciando Álbuns</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -316,7 +316,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Configurando o Ícone do Álbum</title>
                 
                 <para>Quando você vê pela primeira vez um Álbum, o &digikam; irá selecionar a primeira fotografia do álbum como ícone a ser exibido na lista "Meu Álbum". Isto o ajuda a recordar que tipo de fotografias estão contidas num Álbum. Algumas vezes, a primeira fotografia não é a mais representativa e você irá desejar selecionar uma diferente como ícone do Álbum. </para> 
@@ -325,7 +325,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Notas Sobre Coleções de Álbuns</title>
                 
                 <para>Um Álbum só poderá estar em uma Coleção de Álbuns e as Coleções de Álbuns não podem ser encadeadas. </para>
@@ -336,7 +336,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Visualizador de Imagem</title>
 
             <sect3>
@@ -352,7 +352,7 @@
             
                 <para>As informações sobre cada fotografia é apresentada abaixo de cada miniatura. Você poderá controlar as informações que são apresentadas no diálogo em <menuchoice><guimenu>Configurações</guimenu> <guimenuitem>Configurar o &digikam;</guimenuitem></menuchoice>. Selecione a página de Álbuns e procure pela seção <guilabel>Informações Extra na Visão das Miniaturas</guilabel>. </para> 
 
-                <para>As miniaturas possuem Dicas que aparecerão se você permanecer com o ponteiro do mouse sobre elas por algum tempo. A Dica mostra as propriedades mais importantes da fotografia incluindo qualquer Marca que você tenha aplicado. A captura de tela no topo da seção <link linkend="using-kapp-mainwindow-intro">Introdução à Janela Principal</link> mostra uma Dica sendo exibida. </para>
+                <para>As miniaturas possuem Dicas que aparecerão se você permanecer com o ponteiro do mouse sobre elas por algum tempo. A Dica mostra as propriedades mais importantes da fotografia incluindo qualquer Marca que você tenha aplicado. A captura de tela no topo da seção <link linkend="using-tdeApp-mainwindow-intro">Introdução à Janela Principal</link> mostra uma Dica sendo exibida. </para>
 
             </sect3>
 
@@ -363,14 +363,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Vendo uma Fotografia</title>
              
-                <para>Você pode abrir o Editor de Imagem numa fotografia, bastando para isso fazer um duplo-clique sobre a miniatura ou clicando com o botão direito e selecionando a opção <guilabel>Ver/Editar</guilabel> no menu de contexto. Veja a seção do <link linkend="using-kapp-imageeditor">Editor de Imagem do &digikam;</link> para instruções sobre como editar suas fotografias. </para>
+                <para>Você pode abrir o Editor de Imagem numa fotografia, bastando para isso fazer um duplo-clique sobre a miniatura ou clicando com o botão direito e selecionando a opção <guilabel>Ver/Editar</guilabel> no menu de contexto. Veja a seção do <link linkend="using-tdeApp-imageeditor">Editor de Imagem do &digikam;</link> para instruções sobre como editar suas fotografias. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Vendo ou Editando uma Fotografia Com Outro Aplicativo</title>
 
                 <para>Algumas vezes o &digikam; pode não fornecer todos os recursos de que você precisa. Você pode abrir uma fotografia em outro aplicativo através de um clique direito nela e selecionando a partir do sub-menu <guilabel>Abri Com</guilabel>. A lista de aplicativos que aparece neste menu é controlada pela associação de arquivos padrão do KDE para o tipo de imagem da fotografia. Dê uma olhada no manual do KDE para instruções sobre como mudar estas associações de arquivos se o aplicativo que você precisa não estiver listado. </para>
@@ -379,7 +379,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Rodando uma Fotografia</title>
              
                 <note><para>Você terá que possuir o Plugin Sem Perdas no JPEG do KIPI instalado para estes recursos de rotação. Se você não tiver este plugin instalado você ainda poderá rodar sua fotografia, mas você terá que fazer isso de dentro do Editor de Imagem. O Editor de Imagem usa um método diferente para rodar uma imagem, e você pode não notar nenhuma diferença mas o método do Editor de Imagem pode causar alguma perda de qualidade na fotografia. Os métodos de rotação descritos aqui usam o Plugin Sem Perdas no JPEG do KIPI e não causam nenhuma perda de qualidade na fotografia original. </para></note>
@@ -392,10 +392,10 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-imagemetadata">
+            <sect3 id="using-tdeApp-imagemetadata">
             <title>Propriedades, Meta-Dados e Histograma de uma Fotografia</title>
 
-                <sect4 id="using-kapp-tagscommentsedit">
+                <sect4 id="using-tdeApp-tagscommentsedit">
                 <title>Editando as Marcas e Comentários</title>
             
                     <anchor id="tagscommentsedit.anchor"/>
@@ -417,7 +417,7 @@
 
                 </sect4>                    
                 
-                <sect4 id="using-kapp-propertiesmetadatahistogram">
+                <sect4 id="using-tdeApp-propertiesmetadatahistogram">
                 <title>Exibindo Propriedades, Meta-dados embutidos e Histograma</title>
             
                     <anchor id="propertiesmetadatahistogram.anchor"/>
@@ -432,7 +432,7 @@
                         fileref="imageproperties3.png"/>
                     </figure>
                 
-                    <para>Este diálogo mostra as mesmas informações EXIF fornecidas pelo diálogo do Visualizador EXIF descrito na <link linkend="using-kapp-exifviewertool">seção do Visualizador EXIF</link>. </para>
+                    <para>Este diálogo mostra as mesmas informações EXIF fornecidas pelo diálogo do Visualizador EXIF descrito na <link linkend="using-tdeApp-exifviewertool">seção do Visualizador EXIF</link>. </para>
                     
                     <figure>
                         <title>O Diálogo de Propriedades da Imagem com o Visualizador EXIF em Ação</title>
@@ -440,7 +440,7 @@
                         fileref="imageproperties2.png"/>
                     </figure>
                                     
-                    <para>Este diálogo mostra um histograma completo da imagem. Você pode encontrar mais informações sobre histogramas na seção do <link linkend="using-kapp-histogramviewer">Visualizador de Histograma</link>. </para>
+                    <para>Este diálogo mostra um histograma completo da imagem. Você pode encontrar mais informações sobre histogramas na seção do <link linkend="using-tdeApp-histogramviewer">Visualizador de Histograma</link>. </para>
                 
                     <figure>
                         <title>O Diálogo de Propriedades de Imagem com o Visualizador de Histograma em Ação</title>
@@ -454,14 +454,14 @@
                                                                                                             
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Renomeando uma Fotografia</title>
              
                 <para>Você pode alterar o nome do arquivo de uma fotografia se clicar com o botão direito numa miniatura e selecionar a opção <guilabel>Renomear</guilabel>. Lembre-se de manter a extensão do arquivo (.jpg, .tif, etc.). </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Excluindo uma Fotografia</title>
              
                 <para>Quando você excluir uma fotografia no &digikam; ela será movida para a Lixeira do KDE. Se você preferir que o Remover realmente exclua a fotografia, então você poderá configurar esta opção selecionando <menuchoice><guimenu>Configurações</guimenu> <guimenuitem>Configurar o &digikam;</guimenuitem></menuchoice> e selecionando a página <guilabel>Diversos</guilabel>. No topo desta página estão as opções que controlam o que acontece quando é excluída uma fotografia. </para>
@@ -472,7 +472,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
         <title>Visão "Minhas Marcas"</title>
 
             <para>A marcação de fotografias oferece uma forma flexível e poderosa de organizar e catalogar as suas fotografias. As marcas são legendas que poderão ser aplicadas às fotografias individuais. Logo que uma Marca seja configurada em uma fotografia, ela poderá ser encontrada novamente selecionando a Marca. </para>
@@ -488,7 +488,7 @@
 
             <para>Por padrão, quando você seleciona uma Marca na árvore que contenha outras sub-Marcas, o &digikam; não irá mostrar as fotografias que estejam legendadas com as sub-Marcas. Você pode alterar este comportamento, se preferir que todas as fotografias marcadas com uma sub-Marca da Marca atual sejam exibidas. Para alterar esta opção, acesse a opção <menuchoice><guimenu>Configurações</guimenu> <guimenuitem>Configurar o &digikam;</guimenuitem></menuchoice> na barra de menu, selecione a página <guilabel>Álbuns</guilabel> e selecione então a opção <guilabel>Mostrar Itens nas Sub-Marcas</guilabel>. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
             <title>Gerenciando Marcas</title>
              
                 <para>Você pode adicionar novas Marcas clicando com o botão direito na lista "Minhas Marcas" ou numa marca existente e selecionando <guilabel>Nova Marca</guilabel>. Se você adicionar uma nova Marca ao clicar com o botão direito numa Marca existente, a sua Marca nova será criada como sub-Marca. </para>
@@ -501,7 +501,7 @@
                                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
             <title>Marcando Fotografias</title>
              
                 <para>Antes de poder tirar o máximo proveito das capacidades de Marcação do &digikam;, você precisa primeiro marcar suas fotografias. Existem dois métodos para marcar as fotografias. Logo que tenha identificado as fotografias que deseja marcar, você poderá tanto arrastá-las e soltá-las na Marca na árvore "Minhas Marcas" ou, clicando com o botão direito nas fotografias selecionadas na Janela da Imagem, você pode usar o menu <guilabel>Atribuir Marca</guilabel>, de modo a poder selecionar as Marcas que deseja atribuir. </para>
@@ -523,7 +523,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>Usando uma Câmera Digital Com o &digikam;</title>
     <anchor id="camerainterface.anchor"/>
 
@@ -532,7 +532,7 @@
 
             <para>A Ferramenta Câmera permite que você transfira suas fotografias diretamente de sua câmera para um Álbum do &digikam;. Você pode acessar a Ferramenta Câmera clicando no menu Câmera e selecionando a partir da lista de Câmeras configuradas. Veja a <link linkend="setupcamera">Seção de Configuração de Câmera</link> do manual para instruções sobre como configurar o &digikam; para trabalhar com sua Câmera. </para>
 
-            <para>A Interface com a Câmera não é a única maneira de obter suas fotografias para o &digikam;. Veha a seção <link linkend="using-kapp-addphototoalbum">Adicionando uma fotografia a um Álbum</link> para uma descrição sobre como adicionar fotografias que já se encontram no seu disco rígido. </para>
+            <para>A Interface com a Câmera não é a única maneira de obter suas fotografias para o &digikam;. Veha a seção <link linkend="using-tdeApp-addphototoalbum">Adicionando uma fotografia a um Álbum</link> para uma descrição sobre como adicionar fotografias que já se encontram no seu disco rígido. </para>
             
             <para>Para ser capaz de usar sua câmera digital com o &digikam;, conecte a câmera ao seu computador, alterne a câmera para o modo de exibição de imagens e ligue-a. </para>
         
@@ -558,7 +558,7 @@
         <title>Selecionando um Álbum Alvo</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>Usando os botões <guilabel>Transferir Tudo</guilabel> ou <guilabel>Transferir Selecionados</guilabel> aparecerá um diálogo que permite que você selecione um Álbum alvo no qual as fotgrafias serão transferidas. A lista de Álbuns existentes é exibida, ordenada pelo método de Pasta (veja a <link linkend="using-kapp-myalbumsview">Visão Meus Álbuns</link> para detalhes sobre ordenação de Álbuns). Você pode selecionar o Álbum alvo a partir desta lista e então clicar OK. </para>
+            <para>Usando os botões <guilabel>Transferir Tudo</guilabel> ou <guilabel>Transferir Selecionados</guilabel> aparecerá um diálogo que permite que você selecione um Álbum alvo no qual as fotgrafias serão transferidas. A lista de Álbuns existentes é exibida, ordenada pelo método de Pasta (veja a <link linkend="using-tdeApp-myalbumsview">Visão Meus Álbuns</link> para detalhes sobre ordenação de Álbuns). Você pode selecionar o Álbum alvo a partir desta lista e então clicar OK. </para>
         
             <figure>
                 <title>O Diálogo de Seleção de Álbum Alvo</title>
@@ -607,7 +607,7 @@
             <sect3>
             <title>Rotação Automática</title>
 
-                <para>O &digikam; pode usar qualquer informação sobre a orientação da câmera no momento em que a fotografia foi tirada para automaticamente rodar a fotografia quando ela é transferida. Nem todas as câmeras incluem esta informação. Veja a seção <link linkend="using-kapp-imagemetadata">Propriedades, Meta-Dados e Histograma da Fotografia</link> para mais detalhes sobre informações que sua câmera pode embutir em suas fotografias. </para>
+                <para>O &digikam; pode usar qualquer informação sobre a orientação da câmera no momento em que a fotografia foi tirada para automaticamente rodar a fotografia quando ela é transferida. Nem todas as câmeras incluem esta informação. Veja a seção <link linkend="using-tdeApp-imagemetadata">Propriedades, Meta-Dados e Histograma da Fotografia</link> para mais detalhes sobre informações que sua câmera pode embutir em suas fotografias. </para>
 
                 <para>Esta rotação automática é ligada por padrão, e se sua câmera não incluir as informações o &digikam; deixará a fotografia na sua orientação original. Se você deseja desligar a rotação automática clique o botão <guilabel>Avançado</guilabel> e desselecione a opção <guilabel>Auto Orientação</guilabel> na base da janela. </para>
             
@@ -616,7 +616,7 @@
             <sect3>
             <title>Criação Automática de Álbuns de Destino</title>
                 
-                <para>Se sua câmera fornecer informações sobre a data em que a fotografia foi tirada, o &digikam; pode usar isto automaticamente para criar sub-álbuns no Álbum destio quando ela for transferida. Nomes de sub-álbuns são baseados nas datas das imagens. Todas as imagens que possuírem a mesma data serão transferidas para o mesmo sub-álbum. Nem todas as câmeras incluem esta informação. Veja a seção de <link linkend="using-kapp-imagemetadata">Meta-Dados, Propriedades e Histograma das Fotografias</link> para mais detalhes sobre as informações que a sua câmera poderá embutir nas suas fotografias. </para>
+                <para>Se sua câmera fornecer informações sobre a data em que a fotografia foi tirada, o &digikam; pode usar isto automaticamente para criar sub-álbuns no Álbum destio quando ela for transferida. Nomes de sub-álbuns são baseados nas datas das imagens. Todas as imagens que possuírem a mesma data serão transferidas para o mesmo sub-álbum. Nem todas as câmeras incluem esta informação. Veja a seção de <link linkend="using-tdeApp-imagemetadata">Meta-Dados, Propriedades e Histograma das Fotografias</link> para mais detalhes sobre as informações que a sua câmera poderá embutir nas suas fotografias. </para>
                 
                 <para>Esta opção é desligada por padrão e neste caso o &digikam; trasnferirá as fotografias para a raiz do Álbum. Se você desejar habilitar esta opção clique o botão <guilabel>Avançado</guilabel> e selecione a opção <guilabel>Transferir foto automaticamente em</guilabel> na base da janela. </para>
 
@@ -626,7 +626,7 @@
                                     
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>Editor de Imagem do &digikam;</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -731,16 +731,16 @@
         <sect2>
         <title>Propriedades da Imagem</title>
             
-            <sect3 id="using-kapp-commentsedittool">
+            <sect3 id="using-tdeApp-commentsedittool">
             <title>Ferramenta de Edição de Comentários</title>
                 
                 <anchor id="commentsedittool.anchor"/>
 
-                <para>Você pode ver algumas das propriedades de sua fotografia selecionando as opções no menu <guilabel>Imagem</guilabel>. Você pode editar os comentários inseridos para esta fotografia usando <menuchoice><guimenu>Imagem</guimenu><guimenuitem>Editar Comentários e Marcas da Imagem</guimenuitem></menuchoice>. Os novos Comentários e Marcas serão lembrados quando você fechar a fotografia, mesmo se você não salvar a fotografia primeiro. Para mais informações sobre o diálogo Comentários e Marcas, por favor veja a seção <link linkend="using-kapp-tagscommentsedit">Editando Marcas e Comentários</link>. </para>
+                <para>Você pode ver algumas das propriedades de sua fotografia selecionando as opções no menu <guilabel>Imagem</guilabel>. Você pode editar os comentários inseridos para esta fotografia usando <menuchoice><guimenu>Imagem</guimenu><guimenuitem>Editar Comentários e Marcas da Imagem</guimenuitem></menuchoice>. Os novos Comentários e Marcas serão lembrados quando você fechar a fotografia, mesmo se você não salvar a fotografia primeiro. Para mais informações sobre o diálogo Comentários e Marcas, por favor veja a seção <link linkend="using-tdeApp-tagscommentsedit">Editando Marcas e Comentários</link>. </para>
             
             </sect3>
     
-            <sect3 id="using-kapp-exifviewertool">
+            <sect3 id="using-tdeApp-exifviewertool">
             <title>Ferramenta de Visualizador EXIF</title>
             
                 <anchor id="kexif.anchor"/>
@@ -748,7 +748,7 @@
                 <sect4>
                 <title>O que é EXIF?</title>
                     
-                    <para>EXIF é a abrevitaura, do inglês, para <emphasis>Formato de Intercâmbio Extendido</emphasis>. Ele foi desenhado especificamente para câmeras digitais. Ele permite que uma grande quantidade de informação sobre a fotografia seja guardada. Estas informações descrevem a câmera que obteve a foto com as configurações (incluindo data e hora) em uso quando a foto foi tirada. Ele também permite que uma miniatura embutida seja incluída. Veja a seção <link linkend="using-kapp-imagemetadata">Propriedades e Meta-Dados da Fotografia</link> para mais detalhes sobre as informações embutidas em suas fotografias. </para>
+                    <para>EXIF é a abrevitaura, do inglês, para <emphasis>Formato de Intercâmbio Extendido</emphasis>. Ele foi desenhado especificamente para câmeras digitais. Ele permite que uma grande quantidade de informação sobre a fotografia seja guardada. Estas informações descrevem a câmera que obteve a foto com as configurações (incluindo data e hora) em uso quando a foto foi tirada. Ele também permite que uma miniatura embutida seja incluída. Veja a seção <link linkend="using-tdeApp-imagemetadata">Propriedades e Meta-Dados da Fotografia</link> para mais detalhes sobre as informações embutidas em suas fotografias. </para>
 
                     <para>O formato EXIF contém diferentes seções de marcação nomeadas <emphasis>Diretórios de Arquivo de Imagem</emphasis> (do inglês, IFD). As seções que são encontradas em uma arquivo EXIF normal são as seguintes: <itemizedlist>
             
@@ -788,7 +788,7 @@
                 
             </sect3>
             
-            <sect3 id="using-kapp-filepropertiestool">
+            <sect3 id="using-tdeApp-filepropertiestool">
             <title>Ferramenta Propriedades do Arquivo</title>
             
                 <anchor id="filepropertiestool.anchor"/>
@@ -797,14 +797,14 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Visualizador de Histograma</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Se você estiver interessado no histograma detalhado de sua fotografia você pode visualizá-lo usando <menuchoice><guimenu>Imagem</guimenu> <guimenuitem>Histograma</guimenuitem></menuchoice>. O histograma de uma imagem mostra a quantidade de cada cor que está presente e suas diferentes amplitudes dentro da imagem. Se sua fotografia tiver uma cor desbotada você será capaz de ver o que está errado olhando o histograma. </para>
             
-                <para>O Visualizador de Histograma mostra informações sobre a distribuição estatística dos valores de corres na imagem atual. Ele é puramente informativo: nada que você faça fará qualquer mudança na imagem. Se você deseja realizar uma correção de cores baseada no histograma, use o plugin de Ajuste de Níveis do Editor de Imagem. Este plugin é parte do <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projeto Plugins de Imagem do Digikam</ulink>. Para mais informações sobre o uso de Plugins no &digikam; veja a seção <link linkend="using-kapp-setup">Configuração</link>. </para>
+                <para>O Visualizador de Histograma mostra informações sobre a distribuição estatística dos valores de corres na imagem atual. Ele é puramente informativo: nada que você faça fará qualquer mudança na imagem. Se você deseja realizar uma correção de cores baseada no histograma, use o plugin de Ajuste de Níveis do Editor de Imagem. Este plugin é parte do <ulink url="http://extragear.kde.org/apps/digikamimageplugins">projeto Plugins de Imagem do Digikam</ulink>. Para mais informações sobre o uso de Plugins no &digikam; veja a seção <link linkend="using-tdeApp-setup">Configuração</link>. </para>
                                                 
                 <figure>
                     <title>O Visualizador de Histograma em Ação</title>
@@ -845,7 +845,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Como Usar um Histograma</title>
                 
                 <para>Histogramas são gráficos que servem para avaliar a precisão de uma imagem mostrada na tela. O gráfico representa 3 regiões de brilho da fotografia: <itemizedlist> <listitem><para> (1) : os tons sombreados à esquerda. </para></listitem> <listitem><para> (2) : os tons médios no meio. </para></listitem> <listitem><para> (3) : os tons mais fortes à direita. </para></listitem> </itemizedlist> <figure> <title>A Descrição do Histograma</title> <graphic srccredit="The Histogram Description" fileref="histogramdescription.png"/> </figure> A distribuição do gráfico, onde os picos e protuberâncias são aglomerados, indicam se a imagem está muito escura, muito brilhosa, ou bem balanceada. </para>
@@ -858,19 +858,19 @@
 
                 <para>Importante: nem todos as fotografias devem exibir esta protuberância na parte central do seu histograma. Isto depende muito do assunto da fotografia. Em alguns casos, pode ser mais apropriado que o histograma mostre um pico em uma das pontas, ou em ambas. </para>
                         
-                <para>O histograma é uma maneira confiável de decidir se uma fotografia foi ou não corretamente exposta. O histograma deve mostrar uma sub ou sobre exposição, e uma <link linkend="using-kapp-correctingexposure">Ferramenta de Correção de Exposição</link> deve ser usada para corrigir a fotografia. </para>
+                <para>O histograma é uma maneira confiável de decidir se uma fotografia foi ou não corretamente exposta. O histograma deve mostrar uma sub ou sobre exposição, e uma <link linkend="using-tdeApp-correctingexposure">Ferramenta de Correção de Exposição</link> deve ser usada para corrigir a fotografia. </para>
                 
             </sect3>
                     
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Ajustando uma Fotografia</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Cortando uma Fotografia</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Corte Manual</title>
 
                     <para>Cortar uma fotografia é uma operação comum e o Editor de Imagem torna isto muito fácil. Para cortar uma fotografia simplesmente arraste um retângulo sobre a imagem mantendo pressionado o botão esquerdo do mouse e movendo o mouse. Você verá uma linha marcando um quadro retangular aparecer conforme você move o mouse. </para>
@@ -887,7 +887,7 @@
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Corte Proporcional</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -964,7 +964,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Redimensionando uma Fotografia</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -978,7 +978,7 @@
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Rodando ou Invertendo uma Fotografia</title>
                 
                 <para>Se a fotografia estiver na orientação errada você pode <guilabel>Inverter</guilabel> ou <guilabel>Rodar</guilabel> a fotografia para a orientação que você deseja usando as ferramentas Inverter/Rodar disponíveis nos menus  <menuchoice><guimenu>Transformar</guimenu> <guimenuitem>Rodar</guimenuitem></menuchoice> e <menuchoice><guimenu>Transformar</guimenu> <guimenuitem>Inverter</guimenuitem></menuchoice>. </para>
@@ -987,7 +987,7 @@
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Corrigir Olhos Avermelhados na Fotografia</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1004,7 +1004,7 @@
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Ajustando a Nitidez</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1057,7 +1057,7 @@
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Corrigindo Cores</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1097,7 +1097,7 @@
             <para>O resultado de qualquer um destes ajustes que fizer não serão guardados até você salvar sua fotografia. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Corrigindo Exposição</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1211,7 +1211,7 @@
             
     </sect1>  
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>Configuração do &digikam;</title>
 
         <anchor id="setupdialog.anchor"/>
@@ -1230,9 +1230,9 @@
                                 
             <para>A <guilabel>Localização da Biblioteca de Álbuns</guilabel> é o local no seu disco rígido onde o &digikam; irá guardar todos os Álbuns. Se você mudar este local sem mover manualmente todos os Álbuns do disco rígido, o &digikam; irá pensar que não existem quaisquer Álbuns e irá gerar uma nova base de dados no novo local. Os seus Álbuns antigos não serão alterados, mas você terá que alterar a Localização da Biblioteca de Álbuns de volta ao local antigo para acessá-los. Se não tiver a certeza do que está fazendo, é melhor não alterar esta localização. </para>            
             
-            <para>As <guilabel>Configurações da Marca</guilabel> serão explicadas na seção <link linkend="using-kapp-mytagsview">Minhas Marcas</link>. </para> 
+            <para>As <guilabel>Configurações da Marca</guilabel> serão explicadas na seção <link linkend="using-tdeApp-mytagsview">Minhas Marcas</link>. </para> 
 
-            <para>As opções de <guilabel>Informações Extra na Visão de Miniaturas</guilabel> são descritas na seção <link linkend="using-kapp-imageview">Imagens</link>. </para> 
+            <para>As opções de <guilabel>Informações Extra na Visão de Miniaturas</guilabel> são descritas na seção <link linkend="using-tdeApp-imageview">Imagens</link>. </para> 
             
             <para>As outras opções deste diálogo são auto-explicativas. </para> 
                         
@@ -1261,7 +1261,7 @@
         <sect2 id="setupcollection">
         <title>Configurações da Coleção</title>
 
-            <para>Este diálogo gerencia seus tipos de Coleções. Coleções de Álbuns são descritas em detalhes na seção <link linkend="using-kapp-myalbumsview">Meus Álbuns</link>. </para>
+            <para>Este diálogo gerencia seus tipos de Coleções. Coleções de Álbuns são descritas em detalhes na seção <link linkend="using-tdeApp-myalbumsview">Meus Álbuns</link>. </para>
 
             <figure>
                 <title>As Configurações de Coleção</title>
@@ -1355,7 +1355,7 @@
         <sect2 id="setupmisc">
         <title>Configurações Diversas</title>
 
-            <para>Aqui você poderá controlar como o digiKam irá se comportar quando você excluir uma fotografia ou um Álbum. Veja as seções <link linkend="using-kapp-deleteimage">Excluindo uma Fotografia</link> e <link linkend="using-kapp-deletealbum">Excluindo um Álbum</link> para mais detalhes. </para>
+            <para>Aqui você poderá controlar como o digiKam irá se comportar quando você excluir uma fotografia ou um Álbum. Veja as seções <link linkend="using-tdeApp-deleteimage">Excluindo uma Fotografia</link> e <link linkend="using-tdeApp-deletealbum">Excluindo um Álbum</link> para mais detalhes. </para>
             
             <para>Você pode também desativar a visualização da tela de abertura quando o digiKam inicializa. Isto poderá acelerar bastante o tempo de inicialização do digiKam. </para>
 
@@ -2357,7 +2357,7 @@
 <appendix id="installation">
 <title>Instalação</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Como Obter o &digikam;</title>
 
 <para>O sítio Web do &digikam; está em <ulink url="http://digikam.sourceforge.net">http://digikam.sourceforge.net</ulink>. Por favor, verifique-o regularmente para saber novidades sobre o &digikam;. O &digikam; pode ser obtido no formato de código e binário em <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php</ulink>. </para>
diff --git a/doc/ru/digikam/index.docbook b/doc/ru/digikam/index.docbook
index d31319ac..aff27bf2 100644
--- a/doc/ru/digikam/index.docbook
+++ b/doc/ru/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Russian "INCLUDE"><!-- change language only here -->
@@ -87,10 +87,10 @@
 <chapter id="introduction">
 <title>Введение</title>
 
-    <sect1 id="using-kapp-background">
+    <sect1 id="using-tdeApp-background">
     <title>Фон</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>О &digikam;</title>
 
        <para>&digikam; — широкофункциональное приложение для управления фотографиями для среды &kde;. Это приложение предоставляет простой интерфейс по управлению фотографиями, переносу их с камеры. &digikam; предназначен для работы с огромным числом фотографий, которые организовуются в иерархию альбомов (по сути - обычных каталогов), легко находить нужные фотографиипо специальным меткам и датам. Это приложение обладает функциями для быстрого просмотра, организации, редактирования и публикации ваших фотографий. </para>
@@ -133,7 +133,7 @@
 
     </sect1>
 
-    <sect1 id="using-kapp-firstrun">
+    <sect1 id="using-tdeApp-firstrun">
     <title>Начало работы</title>
 
         <sect2 id="firstrundialog">
@@ -164,15 +164,15 @@
               <textobject><phrase>Окно "Отсутствует альбом"</phrase></textobject></inlinemediaobject>
         </para>
 
-        <para>При указании для библиотеки альбомов существующего каталога с фотографиями значки альбомов в &digikam; сначала не будут содержать эскизы фотографий. При первом просмотре альбома в качестве его значка устанавливается эскиз его первой фотографии. В разделе <link linkend="using-kapp-myalbumsview">Мои альбомы</link> описана процедура изменения значка альбома. </para>
+        <para>При указании для библиотеки альбомов существующего каталога с фотографиями значки альбомов в &digikam; сначала не будут содержать эскизы фотографий. При первом просмотре альбома в качестве его значка устанавливается эскиз его первой фотографии. В разделе <link linkend="using-tdeApp-myalbumsview">Мои альбомы</link> описана процедура изменения значка альбома. </para>
 
-        <para>Если ранее вы уже использовали какое-то другое приложение для управления коллекцией фотографий, которое создаёт эскизы в нестандартном каталоге, &digikam; покажет этот каталог как отдельный Альбом. При хранении эскизов &digikam; следует стандартам организации <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink>. Таким образом, скрыть нестандартный каталог с эскизами в списке "Мои альбомы" невозможно. Если вы всё же хотите оставить эти каталоги, создайте в новом пустом каталоге символические ссылки на каталоги с фотографиями. Либо создайте новую коллекцию альбомов, содержащую только каталоги с эскизами и включите сортировку альбомов по к коллекциям. См. также <link linkend="using-kapp-myalbumsview">Мои альбомы</link>. </para>
+        <para>Если ранее вы уже использовали какое-то другое приложение для управления коллекцией фотографий, которое создаёт эскизы в нестандартном каталоге, &digikam; покажет этот каталог как отдельный Альбом. При хранении эскизов &digikam; следует стандартам организации <ulink url="http://www.freedesktop.org/">freedesktop.org</ulink>. Таким образом, скрыть нестандартный каталог с эскизами в списке "Мои альбомы" невозможно. Если вы всё же хотите оставить эти каталоги, создайте в новом пустом каталоге символические ссылки на каталоги с фотографиями. Либо создайте новую коллекцию альбомов, содержащую только каталоги с эскизами и включите сортировку альбомов по к коллекциям. См. также <link linkend="using-tdeApp-myalbumsview">Мои альбомы</link>. </para>
 
-        <para>После того, как каталог Библиотеки альбомов указан, вы можете приступить к настройке работы с камерой. А после этого узнать как можно <link linkend="using-kapp-myalbumsview">Мои альбомы</link> и <link linkend="using-kapp-mytagsview">Мои метки</link> организовывать альбомы с фотографиями. </para> 
+        <para>После того, как каталог Библиотеки альбомов указан, вы можете приступить к настройке работы с камерой. А после этого узнать как можно <link linkend="using-tdeApp-myalbumsview">Мои альбомы</link> и <link linkend="using-tdeApp-mytagsview">Мои метки</link> организовывать альбомы с фотографиями. </para> 
         </sect2> 
     </sect1>
 
-    <sect1 id="using-kapp-fileformatsupport">
+    <sect1 id="using-tdeApp-fileformatsupport">
     <title>Поддерживаемые форматы файлов изображений</title>
 
         <sect2>
@@ -208,7 +208,7 @@
 
             <sect3>
             <title>PNG</title>
-                <para>PNG — формат изображений, разработанный как замена некоторым устаревшим форматам, распространённым в 1990-х. Это формат сжатия без потерь, как и TIFF, но он боле компактный. Хотя наверняка, ваша камера не поддерживает формат PNG, многие люди специально преобразовывают фотографии в этот формат после переноса их  на компьютер. В отличие от JPEG, изображения PNG не теряют качества при пересжатии после модификации. &digikam; полностью поддерживает формат PNG, кроме того, модуль пакетной обработки может преобразовать изображения из любого поддерживаемого формата в формат PNG за один шаг. Смотрите секцию <link linkend="using-kapp-setup">Настройка</link>, для получения подробной информации об использовании дополнительных модулей в &digikam; </para>
+                <para>PNG — формат изображений, разработанный как замена некоторым устаревшим форматам, распространённым в 1990-х. Это формат сжатия без потерь, как и TIFF, но он боле компактный. Хотя наверняка, ваша камера не поддерживает формат PNG, многие люди специально преобразовывают фотографии в этот формат после переноса их  на компьютер. В отличие от JPEG, изображения PNG не теряют качества при пересжатии после модификации. &digikam; полностью поддерживает формат PNG, кроме того, модуль пакетной обработки может преобразовать изображения из любого поддерживаемого формата в формат PNG за один шаг. Смотрите секцию <link linkend="using-tdeApp-setup">Настройка</link>, для получения подробной информации об использовании дополнительных модулей в &digikam; </para>
     
                 <para>PNG — расширяемый, переносимый формат хранения растровых изображений без потерь, с хорошим сжатием. PNG — не использующая патентованные алгоритмы замена формату &GIF;, также обычно может заменять формат TIFF. PNG разрабатывался для просмотра изображений в сети, таким образом, он позволяет читать изображения в последовательном (потоковом) режиме. Кроме того, PNG сохраняет значение гаммы и цветности, для улучшенной цветопередачи на разнородных платформах. PNG поддерживает глубину цвета 8 и 16 бит на цвет на пиксел. Это идеальный формат для архивирования фотографий. Чтобы более подробно познакомиться с этим форматом, посетите <ulink url="http://www.libpng.org/pub/png/">домашнюю страницу PNG</ulink>. </para>
             
@@ -219,7 +219,7 @@
                 
                 <para>Некоторые, обычно боле дорогие, фотоаппараты, предлагают сохранять фотографии в "сыром" (RAW) формате. Для сырого формата, нет каких-то определённых стандартов. они отличаются от производителя к производителю. Сырой формат содержит все данные, полученные непосредственно с фоточувствительного элемента, перед тем, как программное обеспечение фотоаппарата изменит баланс белого или что-то ещё. Сохранение фотографии в сыром формате, позволяет вам более качественно изменять такие настройки, как баланс белого, уже после того как фотография сохранена на ПК. Большинство профессиональных фотографов используют сырой формат, потому что он даёт им максимум гибкости в допечатной подготовке. Обратная сторона гибкости — "сырые" фотографии занимают чрезвычайно много места на карте памяти. </para>
                 
-                <para>Если вы хотите больше узнать о "сыром" формате, прочитайте руководство <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">The Luminous Landscape </ulink> и <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>. В &digikam; вы можете преобразовать "сырые" фотографии в JPEG или TIFF с помощью модуля <ulink url="help:/kipi-plugins/rawconverter.html">преобразование "сырых" изображений</ulink>. Посмотрите секцию <link linkend="using-kapp-setup">Настройка</link> для получения справки по использованию модулей расширения в &digikam;. </para>
+                <para>Если вы хотите больше узнать о "сыром" формате, прочитайте руководство <ulink url="http://www.luminous-landscape.com/tutorials/understanding-series/u-raw-files.shtml">The Luminous Landscape </ulink> и <ulink url="http://www.cambridgeincolour.com/tutorials/RAW-file-format.htm">Cambridge in Colour</ulink>. В &digikam; вы можете преобразовать "сырые" фотографии в JPEG или TIFF с помощью модуля <ulink url="help:/kipi-plugins/rawconverter.html">преобразование "сырых" изображений</ulink>. Посмотрите секцию <link linkend="using-tdeApp-setup">Настройка</link> для получения справки по использованию модулей расширения в &digikam;. </para>
 
                 <para>&digikam; поддерживает RAW-изображения. Для этого используется программа <ulink url="http://www.cybercom.net/~dcoffin/dcraw/">DCRAW</ulink>. Основные RAW-форматы, поддерживаемые &digikam;: <informaltable><tgroup cols="2">
         
@@ -293,13 +293,13 @@
 
         <para>Зависимость от библиотек означает, невозможность составить безусловный список форматов поддерживаемых вашей системой. По крайней мере, точно доступны JPEG, PNG и TIFF </para>
 
-        <para>&digikam; отображает только те файлы, форматы которых он понимает. Формат определяется по расширению файла. &digikam; сверяет расширение файла с имеющимся списком. Если расширение присутствует в списке, то &digikam; показывает содержимое файла в панели просмотра изображений. Список можно изменить, чтобы узнать, как - смотрите раздел <link linkend="using-kapp-setup">Настройка</link>. </para>
+        <para>&digikam; отображает только те файлы, форматы которых он понимает. Формат определяется по расширению файла. &digikam; сверяет расширение файла с имеющимся списком. Если расширение присутствует в списке, то &digikam; показывает содержимое файла в панели просмотра изображений. Список можно изменить, чтобы узнать, как - смотрите раздел <link linkend="using-tdeApp-setup">Настройка</link>. </para>
 
         </sect2>
     
     </sect1>
 
-    <sect1 id="using-kapp-pluginssupport">
+    <sect1 id="using-tdeApp-pluginssupport">
     <title>Поддерживаемые модули расширения</title>
 
         <para>Одна из самый замечательных особенностей &digikam; - это возможность быстро расширять функциональность программы с помощью модулей расширения. Поддерживаются две архитектуры модулей: <itemizedlist>
@@ -320,7 +320,7 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-camerasupport">
+    <sect1 id="using-tdeApp-camerasupport">
     <title>Поддерживаемые цифровые фотокамеры</title>
     <anchor id="digitalstillcamera.anchor"/>
         
@@ -389,14 +389,14 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
 <title>Работа в &digikam;</title>
 
     
-    <sect1 id="using-kapp-mainwindow">
+    <sect1 id="using-tdeApp-mainwindow">
     <title>Главное окно &digikam;</title>
 
-        <sect2 id="using-kapp-mainwindow-intro">
+        <sect2 id="using-tdeApp-mainwindow-intro">
         <title>Введение</title>
 
             <para>
@@ -404,7 +404,7 @@
               </inlinemediaobject>
             </para>
 
-            <para>Главное окно &digikam; разделено на четыре области. Первая — боковая панель слева, на которой вы можете выбрать один из 4 режимов представляния фотографий: <guibutton>Мои альбомы</guibutton>, <guibutton>По дате</guibutton>, <guibutton>Мои метки</guibutton> и <guibutton>Поисковые запросы</guibutton>. Вторая — иерархический список, где "ветви" дерева соответствуют выбранному режиму представления. Окно просмотра изображений находится посредине, и с правого края ещё одна <link linkend="using-kapp-sidebar">боковая панель</link>. Эта панель может использоваться для просмотра разнообразной информации об изображении. </para>
+            <para>Главное окно &digikam; разделено на четыре области. Первая — боковая панель слева, на которой вы можете выбрать один из 4 режимов представляния фотографий: <guibutton>Мои альбомы</guibutton>, <guibutton>По дате</guibutton>, <guibutton>Мои метки</guibutton> и <guibutton>Поисковые запросы</guibutton>. Вторая — иерархический список, где "ветви" дерева соответствуют выбранному режиму представления. Окно просмотра изображений находится посредине, и с правого края ещё одна <link linkend="using-tdeApp-sidebar">боковая панель</link>. Эта панель может использоваться для просмотра разнообразной информации об изображении. </para>
 
             <para>Сверху находятся меню и панель инструментов. </para>
             
@@ -445,28 +445,28 @@
             
         </sect2>
         
-        <sect2 id="using-kapp-myalbumsview">
+        <sect2 id="using-tdeApp-myalbumsview">
         <title>Альбомы</title>
 
             <para>В режиме просмотра "Альбомы" фотографии организовутся по альбомам. Все фотографии, которыми управляет &digikam;, сохраняются в различные подкаталоги одного главного каталога. Альбомы можно сортировать по этим каталогам, по названию коллекции (которое устанавливается в свойствах альбома), или по дате (которую тоже можно изменять в свойствах альбома). </para>
             
             <para>Вы можете переключаться между методами сортировки с помощью подпункта <guimenuitem>Сортировать альбомы</guimenuitem> меню <guimenu>Вид</guimenu>. </para>
         
-            <sect3 id="using-kapp-createnewalbum">
+            <sect3 id="using-tdeApp-createnewalbum">
             <title>Создание нового альбома</title>
                 
                 <para>Существует несколько способов создания нового альбома. Создать новый альбом можно при переносе новых фотографий из камеры, с помощью кнопки <menuchoice><guimenu>Новый альбом</guimenu></menuchoice> на панели инструментов. Также, альбом создаётся при импорте фотографий из другого каталога. Для этого выберите пункт меню <menuchoice><guimenu>Альбом</guimenu> <guimenuitem>Импорт</guimenuitem> <guimenuitem>Импортировать папки...</guimenuitem></menuchoice>, и выберите каталоги, которые вы хотите импортировать. Альбом получит имя выбранного каталога. Импортировать каталог можно просто перетащив его в окно программы. Удерживая нажатой левую кнопку мыши на значке папки, например в окне &konqueror;, и перетащите её в список альбомов (Мои альбомы, слева). В появившемся меню можно выбрать между копированием и перемещением каталога в &digikam; (также, можно создать символическую ссылку на каталог - тогда фотографии останутся в прежнем месте, просто у папки будет несколько имён). </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-deletealbum">
+            <sect3 id="using-tdeApp-deletealbum">
             <title>Удаление альбома</title>
                 
                 <para>Если вы удаляете альбом, &digikam;, перемещает его в корзину &kde;. Вы можете изменить это поведение так, что альбом будет действительно удаляться вместе со всеми фотографиями. Это можно сделать в меню <menuchoice><guimenu>Настройки</guimenu><guimenuitem>Настроить &digikam;</guimenuitem></menuchoice> на вкладке Разное. Вверху этой вкладки вы можете выбрать, что делать при запросе на удаление фотографии. Чтобы удалить альбом щёлкните на нём правой кнопкой мыши в списке "Мои альбомы" и выберите Удалить альбом с жёсткого диска в появившемся меню. </para>
         
             </sect3>
                         
-            <sect3 id="using-kapp-addphototoalbum">
+            <sect3 id="using-tdeApp-addphototoalbum">
             <title>Добавление фотографии в Альбом</title>
                 
                 <para>Обычно новый альбом создаётся и заполняется фотографиями из камеры с помощью меню Камера. Однако иногда появляется необходимость добавить фотографию в существующий альбому. Для этого выберите альбом и нажмите кнопку <guilabel>Добавить изображения</guilabel> на панели инструментов, или выберите пункт меню <menuchoice><guimenu>Альбом</guimenu> <guimenuitem>Импорт</guimenuitem> <guimenuitem>Добавить изображения</guimenuitem></menuchoice>. Выберите фотографии с помощью диалога Добавить изображения и нажмите кнопку <guilabel>Открыть</guilabel>. Фотографии будут скопированы в альбом. Добавить фотографию также можно перетащив её, например из окна &konqueror;, в в список фотографий (в центре). </para>
@@ -475,14 +475,14 @@
         
             </sect3>
         
-            <sect3 id="using-kapp-movecopyitem">
+            <sect3 id="using-tdeApp-movecopyitem">
             <title>Копирование или перемещение фотографий между альбомами.</title>
                 
                 <para>Щёлкните на фотографии левой кнопкой мыши и перетащите её в другой альбом. В появившемся меню выберите <guilabel>Переместить</guilabel> или <guilabel>Копировать</guilabel> фотографию. Таким же образом вы можете копировать или перемещать несколько фотографий, просто выделите те, которые вы хотите переместить/скопировать. </para>
         
             </sect3>
 
-            <sect3 id="using-kapp-managealbums">
+            <sect3 id="using-tdeApp-managealbums">
             <title>Управление альбомами</title>
 
                 <anchor id="albumpropsedit.anchor"/>
@@ -512,7 +512,7 @@
             
             </sect3>                          
 
-            <sect3 id="using-kapp-setalbumicon">
+            <sect3 id="using-tdeApp-setalbumicon">
             <title>Установка значка альбома</title>
                 
                 <para>При первом просмотре альбома для его представления в списке "Мои альбомы" выбирается первая фотография в нём. Это помогает вам быстро вспомнить какие фотографии находятся в альбоме. Иногда первая фотография не даёт такой информации, тогда выберите другую. </para> 
@@ -521,7 +521,7 @@
         
             </sect3>            
             
-            <sect3 id="using-kapp-aboutcollections">
+            <sect3 id="using-tdeApp-aboutcollections">
             <title>Примечание о коллекциях альбомов</title>
                 
                 <para>Альбом может находиться только в одной коллекции альбомов, а одна коллекция не может быть вложена в другую </para>
@@ -532,7 +532,7 @@
                                     
         </sect2>
         
-        <sect2 id="using-kapp-imageview">
+        <sect2 id="using-tdeApp-imageview">
         <title>Просмотр изображений</title>
 
             <sect3>
@@ -548,7 +548,7 @@
             
                 <para>Информация о каждой фотографии показывается под эскизом. Какая информация показывается, можно выбрать в <menuchoice> <guimenu>Настройки</guimenu> <guimenuitem>Настроить &digikam;</guimenuitem> </menuchoice>. Перейдите на страницу Альбом, в секцию <guilabel>Эскизы</guilabel>. </para> 
 
-                <para>Если указатель мыши задержится на некоторое время над эскизом, то появится небольшой ярлык. На этом ярлыке присутствует дополнительная информация о фотографии включая всю информацию о метках для этой фотографии. Вверху раздела <link linkend="using-kapp-mainwindow-intro">Введение в Главное Окно</link>, на снимке экрана, виден ярлык к одной из фотографий . </para>
+                <para>Если указатель мыши задержится на некоторое время над эскизом, то появится небольшой ярлык. На этом ярлыке присутствует дополнительная информация о фотографии включая всю информацию о метках для этой фотографии. Вверху раздела <link linkend="using-tdeApp-mainwindow-intro">Введение в Главное Окно</link>, на снимке экрана, виден ярлык к одной из фотографий . </para>
 
             </sect3>
 
@@ -559,14 +559,14 @@
 
             </sect3>
 
-            <sect3 id="using-kapp-imageviewing">
+            <sect3 id="using-tdeApp-imageviewing">
             <title>Просмотр фотографии</title>
              
-                <para>Открыть фотографию в редакторе можно щёлкнув на ней левой кнопкой мышки, или щёлкнув правой кнопкой и выбрав <guilabel>Вид/правка</guilabel> в контекстном меню. Чтобы увидеть справку по редактированию посмотрите раздел <link linkend="using-kapp-imageeditor">Редактор изображений &digikam;</link>. </para>
+                <para>Открыть фотографию в редакторе можно щёлкнув на ней левой кнопкой мышки, или щёлкнув правой кнопкой и выбрав <guilabel>Вид/правка</guilabel> в контекстном меню. Чтобы увидеть справку по редактированию посмотрите раздел <link linkend="using-tdeApp-imageeditor">Редактор изображений &digikam;</link>. </para>
         
             </sect3>   
 
-            <sect3 id="using-kapp-externalapp">
+            <sect3 id="using-tdeApp-externalapp">
             <title>Просмотр или редактирование фотографий с помощью внешних программ</title>
 
                 <para>Иногда &digikam; не даёт вам тех возможностей, которые вы бы хотели. Тогда вы можете открыть фотографию в другом приложении щёлкнув на нём правой кнопкой мышки и выбрав пункт <guilabel>Открыть в</guilabel> в контекстном меню. Появившийся список содержит приложения, которые связаны в &kde; с форматом этого изображения. Если в этом списке нет интересующей вас программы, посмотрите руководство пользователя &kde; чтобы узнать как изменить привязку к форматам файлов. </para>
@@ -575,7 +575,7 @@
 
             </sect3>
             
-            <sect3 id="using-kapp-rotateimage">
+            <sect3 id="using-tdeApp-rotateimage">
             <title>Вращение фотографий</title>
              
                 <note><para>Для этого нужен модуль расширения "Kipi JPEG Lossless Plugin". Если у вас его нет, то вращение доступно только в редакторе изображений. Редактор изображений использует другой алгоритм, так что возможно появление дополнительных ошибок, шумов, потеря качества при сохранении в формате JPEG, хотя вы наверное не заметите потери качества. Метод вращения изображения описанный здесь использует Kipi JPEG Lossless Plugin, и, таким образом, не происходит потерь качества. </para></note>
@@ -588,14 +588,14 @@
                 
             </sect3> 
 
-            <sect3 id="using-kapp-renameimage">
+            <sect3 id="using-tdeApp-renameimage">
             <title>Переименование фотографий</title>
              
                 <para>Чтобы переименовать фотографию щёлкните правой кнопкой мыши на эскизе и выберите  <guilabel>Переименовать...</guilabel>. Не забудьте оставить расширение (.jpg, .tif, &etc;). </para>
         
             </sect3>             
 
-            <sect3 id="using-kapp-deleteimage">
+            <sect3 id="using-tdeApp-deleteimage">
             <title>Удаление фотографий</title>
              
                 <para>Если вы удаляете фотографии из &digikam; то они перемещаются в Корзину &kde;. Если вы хотите чтобы фотография была удалена с диска, то выберите пункт меню <menuchoice><guimenu>Настройки</guimenu> <guimenuitem>Настроить &digikam;</guimenuitem></menuchoice> вкладку <guilabel>Разное</guilabel>. На верху этой вкладке есть установки которые контролируют поведение при удалении фотографий. </para>
@@ -606,7 +606,7 @@
                                                             
         </sect2>
         
-        <sect2 id="using-kapp-mytagsview">
+        <sect2 id="using-tdeApp-mytagsview">
           <title>Представление "Метки"</title>
 
             <para>метки на фотографиях позволяют очень гибко управлять и каталогизировать фотографии. метки — своего рода текстовые метки, которые могут быть связаны с отдельной фотографией (или с несколькими сразу). В дальнейшем фотографию можно найти по этой метке. </para>
@@ -621,7 +621,7 @@
 
             <para>По умолчанию при выборе метки в дереве фотографии, связанные с вложенными метками, не показываются. Вы можете изменить это поведение: в <menuchoice><guimenu>Настройки</guimenu> <guimenuitem>Настроить &digikam;</guimenuitem></menuchoice> перейдите на  вкладку <guilabel>Альбомы</guilabel> и поставьте флажок напротив <guilabel>Показывать содержимое вложенных меток</guilabel>. </para>
 
-            <sect3 id="using-kapp-managetags">
+            <sect3 id="using-tdeApp-managetags">
                 <title>Управление метками</title>
              
                 <para>Для создания метки щёлкните правой кнопкой мыши на заголовке "Мои метки" или на другой уже существующей метке и выберите <guilabel>Создать метку...</guilabel> в контекстном меню. Если вы щёлкнули правой кнопкой мыши на уже существующей метке, то новая метка будет создана как "вложенная метка" (по аналогии подкаталогом). </para>
@@ -636,7 +636,7 @@
                                                                         
             </sect3>    
 
-            <sect3 id="using-kapp-taggingimages">
+            <sect3 id="using-tdeApp-taggingimages">
                <title>Добавление метки к фотографии</title>
              
                 <para>Чтобы использовать все возможности &digikam; сввязанные с метками, нужно сперва звязать зкаладки с каждой фотографией. Чтобы сделать это вы можете просто перетащить фотографию на метку в дереве "Мои метки", или выделить фотографии и щёлкнуть на них правой кнопкой мыши, в контекстном меню выбрать <guilabel>Добавить в метку</guilabel> и далее имя метки. </para>
@@ -655,7 +655,7 @@
                                 
         </sect2>
         
-        <sect2 id="using-kapp-mydatesview">
+        <sect2 id="using-tdeApp-mydatesview">
             <title>Главное окно после выбора представления "Даты"</title>
 
             <para><inlinemediaobject><imageobject><imagedata fileref="maininterfacedateview.png" format="PNG"/> </imageobject>
@@ -668,7 +668,7 @@
             
         </sect2>
           
-        <sect2 id="using-kapp-mysearchesview">
+        <sect2 id="using-tdeApp-mysearchesview">
         <title>Представление "Поисковые запросы"</title>
 
             <sect3>
@@ -687,7 +687,7 @@
                 
                 <para>Если вы довольны результатом, нажмите на кнопку <guilabel>Ok</guilabel>, поиск будет завершён, результаты вы можете увидеть в представлении "Поисковые запросы". Строка, которую вы ввели в поле <guilabel>Сохранить как ...</guilabel> будет отображаться в списке "Вы искали", чтобы просмотреть результаты поиска позже. Если вы хотите изменить критерии поиска или название, просто щелкните правой кнопкой мыши на соответствующей строке списка "Поисковые запросы" и выберите соответствующий пункт в контекстном меню. </para>
                 
-                <para>Если в к онтекстном меню вы выберите <guilabel>Изменить параметры поиска...</guilabel>, снова откроется диалог быстрого поиска, где вы можете изменить критерии поиска и название. Если вы выберите <guilabel>Редактировать как Расширенный поиск</guilabel>, откроется диалог расширенного поиска, где вы сможете более тонко изменять критерии поиска. Подробности в секции <link linkend="using-kapp-mainwindow-advancedsearchtool">Расширенный поиск</link>. </para>
+                <para>Если в к онтекстном меню вы выберите <guilabel>Изменить параметры поиска...</guilabel>, снова откроется диалог быстрого поиска, где вы можете изменить критерии поиска и название. Если вы выберите <guilabel>Редактировать как Расширенный поиск</guilabel>, откроется диалог расширенного поиска, где вы сможете более тонко изменять критерии поиска. Подробности в секции <link linkend="using-tdeApp-mainwindow-advancedsearchtool">Расширенный поиск</link>. </para>
                 
                 <para>Чтобы удалить результаты поиска выберите пункт <guilabel>Удалить папку поиска</guilabel> из контекстного меню. </para>
     
@@ -698,7 +698,7 @@
 
             </sect3>            
             
-            <sect3 id="using-kapp-mainwindow-advancedsearchtool">
+            <sect3 id="using-tdeApp-mainwindow-advancedsearchtool">
             <title>Расширенный поиск</title>
             <anchor id="advancedsearchtool.anchor"/>
             
@@ -761,32 +761,32 @@
                 
     </sect1>
 
-    <sect1 id="using-kapp-sidebar">
+    <sect1 id="using-tdeApp-sidebar">
     <title>Боковая панель &digikam;</title>
     <anchor id="sidebar.anchor"/>
     
         <sect2>
         <title>Введение. Правая боковая панель.</title>
-           <para>В главном окне &digikam;, у правого края окна, есть боковая панель, на которой вы можете увидеть дополнительную информацию о выбранных фотографиях и действиях, которые можно над ними совершить. Эта такая же боковая панель, которую вы можете увидеть в окне <link linkend="using-kapp-imageeditor">Редактора изображений</link>, за исключением того, что в ней нет кнопок первая-предыдущая-следующая-последняя фотография. Боковая панель появляется если щёлкнуть мышью на одной из пяти меток справа: </para>
+           <para>В главном окне &digikam;, у правого края окна, есть боковая панель, на которой вы можете увидеть дополнительную информацию о выбранных фотографиях и действиях, которые можно над ними совершить. Эта такая же боковая панель, которую вы можете увидеть в окне <link linkend="using-tdeApp-imageeditor">Редактора изображений</link>, за исключением того, что в ней нет кнопок первая-предыдущая-следующая-последняя фотография. Боковая панель появляется если щёлкнуть мышью на одной из пяти меток справа: </para>
 
            <para>
             <itemizedlist>
             
-                <listitem><para><link linkend="using-kapp-sidebarfileproperties">Свойства</link>: свойства файла и изображения, ключевые параметры съёмки (данные EXIF).</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarfileproperties">Свойства</link>: свойства файла и изображения, ключевые параметры съёмки (данные EXIF).</para></listitem>
 
-                <listitem><para><link linkend="using-kapp-sidebarmetadata"> Метаданные</link>: EXIF, пометки производителя, данные IPTC и GPS.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarmetadata"> Метаданные</link>: EXIF, пометки производителя, данные IPTC и GPS.</para></listitem>
                    
-                <listitem><para><link linkend="using-kapp-sidebarcolors"> Цвета</link>: Гистограммы цветов и встроенные ICC профили цвета.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcolors"> Цвета</link>: Гистограммы цветов и встроенные ICC профили цвета.</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebarcommentstags">Комментарии и метки</link>: Комментарии, Дата и время, Рейтинг, метки.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebarcommentstags">Комментарии и метки</link>: Комментарии, Дата и время, Рейтинг, метки.</para></listitem>
                 
-                <listitem><para><link linkend="using-kapp-sidebartagfilters">Фильтры меток</link>: Фильтр меток, применяемый к выделенным в главном окне фотографиям.</para></listitem>
+                <listitem><para><link linkend="using-tdeApp-sidebartagfilters">Фильтры меток</link>: Фильтр меток, применяемый к выделенным в главном окне фотографиям.</para></listitem>
             
             </itemizedlist>
 Щелкнув на соответствующей метке мышью вы откроете боковую панель (или закроете, если панель была октрыта). </para>
         </sect2>
 
-        <sect2 id="using-kapp-sidebarfileproperties">
+        <sect2 id="using-tdeApp-sidebarfileproperties">
         <title>Свойства</title>
            <para>Панель свойства всю существенную информацию о выделенном изображении. Панель разделена на следующие секции: <itemizedlist>
 
@@ -805,7 +805,7 @@
            </para>
         </sect2>
 
-        <sect2 id="using-kapp-sidebarmetadata">
+        <sect2 id="using-tdeApp-sidebarmetadata">
         <title>Вкладки на панели метаданные</title>
 
            <para>Панель "Метаданные" состоит из четырёх вкладок <guilabel>EXIF, Пометки автора, IPTC и GPS</guilabel>. Выпадающий список позволяет выбрать между простым и подробным видом вкладки, а кнопки Печать и Копировать позволяют печатать (стандартный диалог печати) или копировать соответствующую вкладку в буфер обмена. Кнопки сверху позволяют перемещаться между файлами. </para>
@@ -813,7 +813,7 @@
            <para><inlinemediaobject><imageobject><imagedata fileref="sidebarmetadata.png" format="PNG"/> </imageobject><textobject><phrase>Вкладки на панели метаданные</phrase></textobject></inlinemediaobject>
            </para>
 
-           <sect3 id="using-kapp-sidebarmetadataexif">
+           <sect3 id="using-tdeApp-sidebarmetadataexif">
            <title>метаданные EXIF</title>
 
                 <anchor id="kexif.anchor"/>
@@ -858,23 +858,23 @@
            
            </sect3>
 
-           <sect3 id="using-kapp-sidebarmetadatamakernote">
+           <sect3 id="using-tdeApp-sidebarmetadatamakernote">
            <title>TODO Makernotes</title>
               <para>tbc </para>
            
            </sect3>
 
 
-           <sect3 id="using-kapp-sidebarmetadataiptc">
+           <sect3 id="using-tdeApp-sidebarmetadataiptc">
            <title>TODO IPTC</title>
               <para>tbc </para>
            
            </sect3>
 
-           <sect3 id="using-kapp-sidebarmetadatagps">
+           <sect3 id="using-tdeApp-sidebarmetadatagps">
            <title>Метаданные GPS</title>
-              <para>На этой вкладке вы можете увидеть данные секции GPS (<link linkend="using-kapp-gps">примечание</link>). Данные о местоположении остаются только в EXIF фотографии (не сохраняются в базе данных). Что позволяет узнавать местоположение и другим приложениям, которые понимают формат данных EXIF GPS. </para>
-	      <para>Несколько особенностей использования устройств GPS вместе с камерой представлены <link linkend="using-kapp-gps">здесь</link>. </para>
+              <para>На этой вкладке вы можете увидеть данные секции GPS (<link linkend="using-tdeApp-gps">примечание</link>). Данные о местоположении остаются только в EXIF фотографии (не сохраняются в базе данных). Что позволяет узнавать местоположение и другим приложениям, которые понимают формат данных EXIF GPS. </para>
+	      <para>Несколько особенностей использования устройств GPS вместе с камерой представлены <link linkend="using-tdeApp-gps">здесь</link>. </para>
 
               <example>  <title>Панель Метаданные GPS</title>
                    <screenshot><screeninfo>Боковая панель Метаданные</screeninfo><mediaobject><imageobject><imagedata fileref="sidebarmetadatagps.png" format="PNG"/> </imageobject></mediaobject></screenshot>
@@ -883,18 +883,18 @@
            </sect3>
 
         </sect2>
-        <sect2 id="using-kapp-sidebarcolors">
+        <sect2 id="using-tdeApp-sidebarcolors">
         <title>Цвета</title>
-           <para>На панели Цвета есть две вкладки — <guilabel>Цвет и Профиль ICC</guilabel>. Подробнее об управлении цветом можно узнать <link linkend="using-kapp-iccprofile">здесь</link>. </para>
+           <para>На панели Цвета есть две вкладки — <guilabel>Цвет и Профиль ICC</guilabel>. Подробнее об управлении цветом можно узнать <link linkend="using-tdeApp-iccprofile">здесь</link>. </para>
 
-            <sect3 id="using-kapp-histogramviewer">
+            <sect3 id="using-tdeApp-histogramviewer">
             <title>Просмотр Гистограммы</title>
             
                 <anchor id="histogramviewer.anchor"/>
             
                 <para>Гистограмма показывает какое количество точек имеет определённый цвет на фотографии. Если у фотографии нарушен цветовой баланс. это хорошо будет заметно на гистограмме. </para>
             
-                <para>Вы можете только просомтреть гистограмму на этой панели, скорректировать баланс цвета с панели невозможно. Чтобы скорректировать цвета воспользуйтесь инструментом Скорректировать уровни и Скорректировать Кривые. Эти дополнительные модули являются частью проекта <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigikamImagePlugins</ulink>. Чтобы подробнее узнать, как пользоваться модулями расширения в &digikam; смотрите секцию <link linkend="using-kapp-setup">Настройка</link>. </para>
+                <para>Вы можете только просомтреть гистограмму на этой панели, скорректировать баланс цвета с панели невозможно. Чтобы скорректировать цвета воспользуйтесь инструментом Скорректировать уровни и Скорректировать Кривые. Эти дополнительные модули являются частью проекта <ulink url="http://extragear.kde.org/apps/digikamimageplugins">DigikamImagePlugins</ulink>. Чтобы подробнее узнать, как пользоваться модулями расширения в &digikam; смотрите секцию <link linkend="using-tdeApp-setup">Настройка</link>. </para>
                                                 
                 <example>   <title>Вкладка Гистограмма в действии</title>
                     <screenshot><screeninfo>Вкладка Гистограмма в действии</screeninfo><mediaobject><imageobject><imagedata fileref="sidebarcolorshistogramviewer.png" format="PNG"/> </imageobject></mediaobject></screenshot>
@@ -934,7 +934,7 @@
         
             </sect3>
 
-            <sect3 id="using-kapp-usinghistogram">
+            <sect3 id="using-tdeApp-usinghistogram">
             <title>Как пользоваться Гистограммой</title>
                 
                 <para>Гистограмма — графический способ представления точности воспроизведения изображения. График состоит из 3 участков яркости: <itemizedlist><listitem><para>(1): тени (передержки) — левый участок.</para></listitem><listitem><para>(2): нормальный участок в центре. </para></listitem><listitem><para>(3): светлый участок (недодержки) — справа</para></listitem></itemizedlist> <example> <title>Гистограмма в режиме Все цвета</title> <screenshot><screeninfo>Гистограмма в режиме Все цвета</screeninfo><mediaobject><imageobject><imagedata fileref="editorhistogramdescription.png" format="PNG"/> </imageobject></mediaobject></screenshot> </example>В зависимости от того, где расположены пики гистограммы, а где провалы, можно определить, хорошо ли сбалансированы цвета и была выдержка правильной или фотография передержана (недодержана). </para>
@@ -947,13 +947,13 @@
 
                 <para>ВАЖНО: Нельзя полагаться только на гистограмму, в зависимости от объекта съёмки, при нормальной выдержке, на гистограмме может быть пик слева, или справа, или с обеих сторон сразу. </para>
                         
-                <para>Гистограмма предоставляет достаточно точный критерий нормальной выдержки. Если вы считаете, что фотография передержана или недодержана, воспользуйтесь <link linkend="using-kapp-correctingexposure">Коррекцией экспозиции</link>, чтобы это исправить. </para>
+                <para>Гистограмма предоставляет достаточно точный критерий нормальной выдержки. Если вы считаете, что фотография передержана или недодержана, воспользуйтесь <link linkend="using-tdeApp-correctingexposure">Коррекцией экспозиции</link>, чтобы это исправить. </para>
                 
             </sect3>
  
         </sect2>
 
-        <sect2 id="using-kapp-sidebarcommentstags">
+        <sect2 id="using-tdeApp-sidebarcommentstags">
         <title>Комментарии и метки</title>
            <para>Эта панель позволяет редактировать и просматривать такие атрибуты фотографии как коментарии, рейтинг, дата и метки. Эти атрибуты хранятся в базе данных &digikam; а также в метаданных IPTC и EXIF. Все эти атрибуты доступны в одном окне, вы можете увидеть его ниже на снимке экрана. При обработке фотографии, если данные в разных источниках различаются, авбирается источник с самым высоким приоритетом и данные из него записываются во все остальные. Приоритет источников такой: 1) база данных &digikam; 2) IPTC и 3) EXIF. </para>
 
@@ -1017,14 +1017,14 @@
            <para>Выпадающий список снизу — ещё одна эргономическая особенность предназначенная для бытрого добавления меток к сериям фотографий. По мере того, как вы создаёте и связываете метки с фотографиями, они сохраняются в этом списке. </para>
 
            <para>Также к фотографии можно добавить метку установив флажок слева от необходимой метки. Все метки к изображениям сохраняются в поле 'keyword' метаданных IPTC. </para>
-           <note><para>Даже если вы выделили несколько фотографий, метки будут показаны только для одной, и эта фотография будет выделена, с остальных выделение будет снято. Если вы хотите связать с меткой несколько фотографий смотрите секцию <link linkend="using-kapp-sidebartagfilters"> Фильтр меток</link>. </para></note>
+           <note><para>Даже если вы выделили несколько фотографий, метки будут показаны только для одной, и эта фотография будет выделена, с остальных выделение будет снято. Если вы хотите связать с меткой несколько фотографий смотрите секцию <link linkend="using-tdeApp-sidebartagfilters"> Фильтр меток</link>. </para></note>
 
           </sect3>
 
         </sect2>
 
 
-        <sect2 id="using-kapp-sidebartagfilters">
+        <sect2 id="using-tdeApp-sidebartagfilters">
         <title>Фильтр меток</title>
            <para>Фильтр меток используется чтобы привязать или изменить привязку группы фотографий находящихся в главном окне к метке. Если в фильтре выбрана одна или несколько меток, то в главном окне будут показаны только те фотографии которые есть и в левой боковой панели (т.е. в панели Альбомы, Даты, метки, Папки поиска) и в фильтре. При выборе доступны все метки. </para>
            <para>Например, если у вас есть метка "Публичные" которой вы помечаете все фотографии за исключением приватных. Тогда вы можете отметить эту метку в правой боковой панели (в фильтре меток) чтобы спрятать частные фотографии фотографии (все те у которых нет метки "Публичные"). Во всех представлениях, доступныз в левой боковой панели, будут показаны только "публичные" фотографии. Другой пример, допустим у вас есть дерево меток состоящее из названий 7 различных цветов с корнем "Цвета" и вы хотите выделить только "красный" и "зелёный". Для этого выберите метку "Цвета" в панели метки справа, и отметьте метки "красный" и "зелёный" в фильтре меток в панели справа. </para>
@@ -1040,16 +1040,16 @@
 
     </sect1>
     
-    <sect1 id="using-kapp-camera">
+    <sect1 id="using-tdeApp-camera">
     <title>Использование цифровой камеры с &digikam;</title>
     <anchor id="camerainterface.anchor"/>
 
         <sect2>
         <title>Введение. Взаимодействие с камерой</title>
 
-            <para>С помощью диалога Камера вы можете закачивать фотографии из камеры в Альбом &digikam;. Чтобы открыть окно этого диалога выберите меню пункт Камера и в этом подменю выберите настроенную камеру. Чтобы узнать как настроить &digikam; для работы с вашей камерой прочитайте секцию <link linkend="setupcamera"> Настройка камеры</link>. Если вы хотите узнать, какие цифровые фотоаппараты поддерживает &digikam; прочитайте <link linkend="using-kapp-camerasupport">эту секцию</link>. </para>
+            <para>С помощью диалога Камера вы можете закачивать фотографии из камеры в Альбом &digikam;. Чтобы открыть окно этого диалога выберите меню пункт Камера и в этом подменю выберите настроенную камеру. Чтобы узнать как настроить &digikam; для работы с вашей камерой прочитайте секцию <link linkend="setupcamera"> Настройка камеры</link>. Если вы хотите узнать, какие цифровые фотоаппараты поддерживает &digikam; прочитайте <link linkend="using-tdeApp-camerasupport">эту секцию</link>. </para>
 
-            <para>Можно также добавлять фотографии и из других каталогов на вашем жёстком диске, минуя диалог Камера. См. <link linkend="using-kapp-addphototoalbum">Добавление фотографий в Альбом</link>. В частности, таким альтернативным способом можно добавлять и фотографии с камеры, но диалог Камера позволяет указывать дополнительные параметры импорта. </para>
+            <para>Можно также добавлять фотографии и из других каталогов на вашем жёстком диске, минуя диалог Камера. См. <link linkend="using-tdeApp-addphototoalbum">Добавление фотографий в Альбом</link>. В частности, таким альтернативным способом можно добавлять и фотографии с камеры, но диалог Камера позволяет указывать дополнительные параметры импорта. </para>
             
             <para>Чтобы &digikam; мог подключиться к камере, нужно подключить камеру к компьютеру, возможно потребуется включить питание камеры и перевести её в режим просмотра фотографий. ВАЖНО: прочтите перед этим инструкцию к вашему фотоаппарату. </para>
         
@@ -1072,7 +1072,7 @@
 
             <para>Это окно показывает свойства файла фотографии, который находится в камере. Соответствующий флаг показывает, переносилась ли эта фотография на компьютер ранее. Обратите внимание, что некоторые фотоаппараты не поддерживают такую возможность. </para>            
             
-            <para>На вкладке Метаданные показываются дополнительныые сведения,  хранящиеся непосредственно в файле фотографии. Обычно файл содержит несколько разделов метаданных: EXIF, Пометки производителя, GPS, &etc;. Эта панель абсолютно идентична <link linkend="using-kapp-sidebarmetadata">панели Метаданные</link> в главном окне &digikam; или в окне редактора изображений. ВАЖНО: некоторые камеры не поддерживают все или некоторые виды метаданных. </para>            
+            <para>На вкладке Метаданные показываются дополнительныые сведения,  хранящиеся непосредственно в файле фотографии. Обычно файл содержит несколько разделов метаданных: EXIF, Пометки производителя, GPS, &etc;. Эта панель абсолютно идентична <link linkend="using-tdeApp-sidebarmetadata">панели Метаданные</link> в главном окне &digikam; или в окне редактора изображений. ВАЖНО: некоторые камеры не поддерживают все или некоторые виды метаданных. </para>            
 
         </sect2>
         
@@ -1091,7 +1091,7 @@
         <title>Выбор альбома</title>
         <anchor id="targetalbumdialog.anchor"/>        
         
-            <para>После того как вы нажали на кнопку <guilabel>Загрузить все</guilabel> или <guilabel>Загрузить выделенные</guilabel> появиться диалог выбора альбома, куда будут загружаться фотографии. В диалоге будут представлены уже существующие альбомы в виде каталогов (о порядке сортировки альбомов можно прочитать в секции <link linkend="using-kapp-myalbumsview">Вид Альбомы</link> ). Выберите альбом, куда вы хотите поместить фотографии и нажмите кнопку ОК. </para>
+            <para>После того как вы нажали на кнопку <guilabel>Загрузить все</guilabel> или <guilabel>Загрузить выделенные</guilabel> появиться диалог выбора альбома, куда будут загружаться фотографии. В диалоге будут представлены уже существующие альбомы в виде каталогов (о порядке сортировки альбомов можно прочитать в секции <link linkend="using-tdeApp-myalbumsview">Вид Альбомы</link> ). Выберите альбом, куда вы хотите поместить фотографии и нажмите кнопку ОК. </para>
         
             <example>   <title>Диалог выбора альбома</title>
                 <screenshot><screeninfo>Диалог выбора альбома</screeninfo><mediaobject><imageobject><imagedata fileref="cameratargetalbumdialog.png" format="PNG"/> </imageobject></mediaobject></screenshot> 
@@ -1116,7 +1116,7 @@
 
         </sect2>
         
-        <sect2 id="using-kapp-cameraclientrenaming">
+        <sect2 id="using-tdeApp-cameraclientrenaming">
         <title>Автоматическое переименование.</title>
 
             <para>Обычно камеры используют непонятные имена и, если фотография удалена из камеры, могут использовать их повторно, в результате чего может возникнуть конфликт имён при загрузке нескольких фотографий в один альбом. Наиболее удобно использовать в имён файла фотографии дату и время, когда он была снята. </para>
@@ -1151,7 +1151,7 @@
             <sect3>
             <title>Автоматическое вращение</title>
 
-                <para>&digikam; может использовать информацию о положении камеры в момент съёмки фотографии, чтобы повернуть фотографию при загрузке. Не все камеры включают эту информацию в фотографии. Чтобы узнать какие данные камера может включать в фотографию смотрите секцию <link linkend="using-kapp-sidebarmetadata"> боковая панель Метаданные</link>. </para>
+                <para>&digikam; может использовать информацию о положении камеры в момент съёмки фотографии, чтобы повернуть фотографию при загрузке. Не все камеры включают эту информацию в фотографии. Чтобы узнать какие данные камера может включать в фотографию смотрите секцию <link linkend="using-tdeApp-sidebarmetadata"> боковая панель Метаданные</link>. </para>
 
                 <para>Эта опция включена по умолчанию, если камера не включает эту информацию,  &digikam; не будет поворачивать фотографию.Если вы хотите выключить автоматический поворот, нажмите кнопку <guilabel>Дополнительно</guilabel> и уберите выделение напротив опции <guilabel>Автоповорот</guilabel> внизу окна. </para>
             
@@ -1160,7 +1160,7 @@
             <sect3>
             <title>Автоматическое создание Альбома</title>
                 
-                <para>Если камера сохраняет информацию о том когда была сделана фотография, &digikam; может её использовать чтобы создать под альбом в том альбоме который вы выбрали при загрузке. Имя под-альбома будет основано на дате. Все фотографии с одной датой будут загружены в один под-альбом. Не все камеры включают эту информацию в фотографии. Чтобы узнать какие данные камера может включать в фотографию смотрите секцию <link linkend="using-kapp-sidebarmetadata"> боковая панель Метаданные</link>. </para>
+                <para>Если камера сохраняет информацию о том когда была сделана фотография, &digikam; может её использовать чтобы создать под альбом в том альбоме который вы выбрали при загрузке. Имя под-альбома будет основано на дате. Все фотографии с одной датой будут загружены в один под-альбом. Не все камеры включают эту информацию в фотографии. Чтобы узнать какие данные камера может включать в фотографию смотрите секцию <link linkend="using-tdeApp-sidebarmetadata"> боковая панель Метаданные</link>. </para>
                 
                 <para>Эта опция выключена по умолчанию, и &digikam; загружает фотографии в тот альбом который вы выбрали. Если вы хотите включить эту опцию, нажмите кнопку <guilabel>Дополнительно</guilabel> и выберите <guilabel>Загружать фотографии в автоматически ....</guilabel> внизу окна. </para>
 
@@ -1183,7 +1183,7 @@
 
         </sect2>
                             
-        <sect2 id="using-kapp-gps">
+        <sect2 id="using-tdeApp-gps">
         <title>Как использовать устройства GPS совместно с &digikam;</title>
             <note><para>
                     <inlinemediaobject>
@@ -1273,7 +1273,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
 
     </sect1>
     
-    <sect1 id="using-kapp-imageeditor">
+    <sect1 id="using-tdeApp-imageeditor">
     <title>Редактор изображений &digikam;</title>
     <anchor id="imageeditor.anchor"/>
     
@@ -1383,13 +1383,13 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustingimage">
+        <sect2 id="using-tdeApp-adjustingimage">
         <title>Исправление фотографии</title>
 
-            <sect3 id="using-kapp-croppingimage">
+            <sect3 id="using-tdeApp-croppingimage">
             <title>Кадрирование</title>
              
-                <sect4 id="using-kapp-manualcrop">
+                <sect4 id="using-tdeApp-manualcrop">
                 <title>Ручное кадрирование</title>
 
                     <para>Кадрирование - это не просто часто применяемая над фотографией операция, но и неоценимое средство исправления композиции. Редактор изображений предоставляет простой способ кадрирования: отрезается всё что выходит за нарисованный прямоугольник. Для того чтобы нарисовать прямоугольник, поместите курсор мыши туда где должен располагаться левый верхний угол прямоугольника и нажмите левую кнопку мыши, поместите курсор мыши туда где должен располагаться правый нижний угол прямоугольника и отпустите левую кнопку мыши. Во время перемещения курсора мыши с нажатой левой кнопкой, вы увидите рамку пунктирную рамку, которая показывает размер будущего прямоугольника. </para>
@@ -1405,7 +1405,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
 
                 </sect4>
             
-                <sect4 id="using-kapp-proportionalcrop">
+                <sect4 id="using-tdeApp-proportionalcrop">
                 <title>Пропорциональное кадрирование</title>
 
                     <anchor id="ratiocroptool.anchor"/>                                
@@ -1473,7 +1473,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
                                 
                 </sect4>
             
-                <sect4 id="using-kapp-compositionguides">
+                <sect4 id="using-tdeApp-compositionguides">
                 <title>Правило композиции.</title>
 
                     <para>При первом взгляде глаза человека редко попадают сразу в центр изображения. Человек начинает рассматривать изображение с левого верхнего угла в правый нижний, потом левого нижнего в правый верхний. Это непроизвольное движение глаз хорошо изучено. Для фотографов это означает, что объект съёмки надо выставить в фотографии так, чтобы глаз быстро нашёл его на фотографии. </para>                                                                                
@@ -1572,7 +1572,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             
             </sect3>
 
-            <sect3 id="using-kapp-resizingimage">
+            <sect3 id="using-tdeApp-resizingimage">
             <title>Изменение размера фотографии</title>
                             
                 <anchor id="resizetool.anchor"/>
@@ -1587,7 +1587,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             
             </sect3>
 
-            <sect3 id="using-kapp-rotatingflippingimage">
+            <sect3 id="using-tdeApp-rotatingflippingimage">
             <title>Поворот и отражение фотографий</title>
                 
                 <para>Для того чтобы <guilabel>Отразить</guilabel> или <guilabel>Повернуть</guilabel> фотографию, воспользуйтесь инструментом Отражение/Вращение, для этого выберите пункт меню <menuchoice><guimenu>Преобразование</guimenu> <guimenuitem>Вращать</guimenuitem></menuchoice> или <menuchoice><guimenu>Преобразование</guimenu> <guimenuitem>Отразить</guimenuitem></menuchoice>. </para>
@@ -1596,7 +1596,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
                 
             </sect3>
                 
-            <sect3 id="using-kapp-redeyecorrection">
+            <sect3 id="using-tdeApp-redeyecorrection">
             <title>Исправление эффекта "красных глаз"</title>
                 
                 <anchor id="redeyecorrectiontool.anchor"/>
@@ -1611,7 +1611,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
         
         </sect2>
 
-        <sect2 id="using-kapp-adjustsharpness">
+        <sect2 id="using-tdeApp-adjustsharpness">
         <title>Настройка резкости</title>
         
         <anchor id="blursharpentool.anchor"/>
@@ -1703,7 +1703,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
         
         </sect2>
         
-        <sect2 id="using-kapp-correctingcolor">
+        <sect2 id="using-tdeApp-correctingcolor">
         <title>Цветовая коррекция</title>
             
             <anchor id="colorbalancetool.anchor"/>
@@ -1752,7 +1752,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             <para>Результаты всех изменений не сохраняются до тех пор, пока вы не сохраните фотографию. </para>
         </sect2>
 
-        <sect2 id="using-kapp-correctingexposure">
+        <sect2 id="using-tdeApp-correctingexposure">
         <title>Коррекция выдержки</title>
         
             <anchor id="bcgadjusttool.anchor"/>
@@ -1921,7 +1921,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
            <para>Из главного окна вы можете печатать как отдельные снимки так и несколько сразу. Для этого выделите снимки обычным образом и выберите пункт меню <menuchoice><guimenu>Альбом</guimenu><guimenuitem>Экспорт</guimenuitem> <guimenuitem>Мастер печати</guimenuitem></menuchoice>. Далее следуйте инструкциям. </para>
         </sect2>
         
-        <sect2 id="using-kapp-iccprofile">
+        <sect2 id="using-tdeApp-iccprofile">
             <title>Управления профилями цвета ICC</title>
             
             <para>Что же такого важного в управлении цветовыми профилями ICC? Это просто термин, такой же как например Hi-Fi (High Fidelity — высокое качество), который означает что высокое качество гарантируется от микрофона до колонок, включая провода, оборудование записи, усилители и т.д. То же самое и управление цветовыми профилями ICC, позволяет поддерживать высокое качества цвета от фотоаппарата до устройства вывода (будь то фотопринтер, монитор, проектор или специальная печатная машина). В отличие от звука, устройство хранения не привносит искажений в цвет. </para>
@@ -1994,7 +1994,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
     </sect1>  
 
         
-    <sect1 id="using-kapp-setup">
+    <sect1 id="using-tdeApp-setup">
     <title>Настройка &digikam;</title>
 
         <sect2 id="setupdialog">
@@ -2015,7 +2015,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
                                     
                 <para><guilabel>Каталог библиотеки альбомов</guilabel> определяет каталог, в котором &digikam; хранит все альбомы (фотографии). Если измените этот пункт настроек и не перенесёте все подкаталоги вручную, &digikam; подумает что у вас нет Альбомов и создаст новую пустую базу данных, хотя на самом деле альбомы остались на месте и ничего с ними не произошло. Если вы не уверены — не изменяйте каталог библиотеки альбомов. </para>            
                 
-                <para>Настройки <guilabel>Эскизов</guilabel> подробно освящена в разделе <link linkend="using-kapp-imageview">Изображения</link>. </para> 
+                <para>Настройки <guilabel>Эскизов</guilabel> подробно освящена в разделе <link linkend="using-tdeApp-imageview">Изображения</link>. </para> 
                 
                 <para>Остальные установки вполне понятны по названиям. </para> 
                             
@@ -2044,7 +2044,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             <sect3 id="authoridentity">
             <title>Профиль автора по умолчанию (IPTC)</title>
 
-                <para>Настройки на этой странице позволяют задать сведения об авторских и смежных правах, как показано на снимке экрана снизу. Эта информация автоматически запишется в метаданные IPTC, если отмечена соответствующая опция, при переносе фотографий через <link linkend="using-kapp-cameraclientrenaming">интерфейс работы с камерой</link>. </para>
+                <para>Настройки на этой странице позволяют задать сведения об авторских и смежных правах, как показано на снимке экрана снизу. Эта информация автоматически запишется в метаданные IPTC, если отмечена соответствующая опция, при переносе фотографий через <link linkend="using-tdeApp-cameraclientrenaming">интерфейс работы с камерой</link>. </para>
 
                 <para>  
                     <inlinemediaobject><imageobject><imagedata fileref="cameraclientidentity.png" format="PNG"/> </imageobject></inlinemediaobject>
@@ -2055,7 +2055,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             <sect3 id="setupcollection">
             <title>Настройки коллекции</title>
     
-                <para>Этот диалог управляет коллекциями. Подробнее о коллекциях можно прочитать в разделе <link linkend="using-kapp-myalbumsview">Альбомы</link>. </para>
+                <para>Этот диалог управляет коллекциями. Подробнее о коллекциях можно прочитать в разделе <link linkend="using-tdeApp-myalbumsview">Альбомы</link>. </para>
     
                 <para> 
                     <inlinemediaobject><imageobject><imagedata fileref="setupcollections.png" format="PNG"/> </imageobject></inlinemediaobject>
@@ -2187,7 +2187,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
             <sect3 id="setupmisc">
             <title>Другие настройки</title>
     
-                <para>Здесь вы можете настроить поведение &digikam; при удалении фотографии или альбома. Смотрите также разделы <link linkend="using-kapp-deleteimage">Удаление фотографий</link> и <link linkend="using-kapp-deletealbum">Удаления альбомов</link>. </para>
+                <para>Здесь вы можете настроить поведение &digikam; при удалении фотографии или альбома. Смотрите также разделы <link linkend="using-tdeApp-deleteimage">Удаление фотографий</link> и <link linkend="using-tdeApp-deletealbum">Удаления альбомов</link>. </para>
                 
                 <para>Вы также можете выключить заставку при загрузке &digikam;. Это немного ускорит загрузку &digikam;. </para>
     
@@ -3402,7 +3402,7 @@ fi                 </screen></blockquote>  <tip><para>maps.google.com не по�
 <appendix id="installation">
 <title>Установка</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>Как получить &digikam;</title>
 
 <para>Веб сайт программы &digikam; располагается по адресу <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Регулярно проверяйте его, чтобы узнать новости о &digikam;. Исходные тексты или скомпилированные пакеты вы можете загрузить по адресу <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php</ulink> </para>
diff --git a/doc/sv/digikam/credits-annex.docbook b/doc/sv/digikam/credits-annex.docbook
index 8d299ea2..79de4337 100644
--- a/doc/sv/digikam/credits-annex.docbook
+++ b/doc/sv/digikam/credits-annex.docbook
@@ -42,7 +42,7 @@
 
 <appendix id="installation">        <title>Installation</title>
 
-<sect1 id="getting-kapp">                <title>How to Obtain &digikam;</title>
+<sect1 id="getting-tdeApp">                <title>How to Obtain &digikam;</title>
 
 <para>
 The website for &digikam; is at <ulink url="http://www.digikam.org">http://www.digikam.org</ulink>. Please check it regularly to get the latest news about &digikam;. &digikam; can be obtained in binary and source format from <ulink url="http://sourceforge.net/project/showfiles.php?group_id=42641">http://sourceforge.net/project/showfiles.php?group_id=42641</ulink>.
diff --git a/doc/sv/digikam/index.docbook b/doc/sv/digikam/index.docbook
index c283abcf..bac55e3d 100644
--- a/doc/sv/digikam/index.docbook
+++ b/doc/sv/digikam/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&digikam;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&digikam;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY package "extragear-graphics">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % Swedish "INCLUDE"><!-- change language only here -->
@@ -260,7 +260,7 @@
 
 <!-- *********************************************************************** -->
 
-<chapter id="using-kapp">       <title>Använda &digikam;</title>
+<chapter id="using-tdeApp">       <title>Använda &digikam;</title>
 
 
  <sect1 id="using-mainwindow">         <title>Huvudfönstret i &digikam;</title>
diff --git a/doc/sv/showfoto/index.docbook b/doc/sv/showfoto/index.docbook
index f4585eea..8ecb00cd 100644
--- a/doc/sv/showfoto/index.docbook
+++ b/doc/sv/showfoto/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&showfoto;"><!-- replace kapp here, do *not* replace kappname-->
+  <!ENTITY kappname "&showfoto;"><!-- replace tdeApp here, do *not* replace kappname-->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
   <!ENTITY % Swedish "INCLUDE"><!-- change language only here -->
@@ -82,9 +82,9 @@
 <chapter id="introduction">
   <title>Inledning</title>
 
-    <sect1 id="using-kapp-background">    <title>Bakgrund</title>
+    <sect1 id="using-tdeApp-background">    <title>Bakgrund</title>
 
-       <sect2 id="using-kapp-about">
+       <sect2 id="using-tdeApp-about">
        <title>Om &showfoto;</title>
 
        <para>&showfoto; är en snabb bildeditor med några få men ändå kraftfulla bildredigeringsverktyg. Du kan använda den för att visa dina fotografier och göra förbättringar av dem. </para>
@@ -146,7 +146,7 @@ Genom att klicka flera gånger i rad på samma flik gör att sidoraden visas ell
 
 </chapter>
 
-<chapter id="using-kapp">        <title>Använda &showfoto;</title>
+<chapter id="using-tdeApp">        <title>Använda &showfoto;</title>
 &doc-photo-editing; <sect1 id="using-setup">        <title>Inställning av &showfoto;</title>
 
         <anchor id="setupdialog.anchor"/>
diff --git a/src/digikam/albumiconview.cpp b/src/digikam/albumiconview.cpp
index 88d6a3d1..d80fcba4 100644
--- a/src/digikam/albumiconview.cpp
+++ b/src/digikam/albumiconview.cpp
@@ -525,7 +525,7 @@ void AlbumIconView::slotRightButtonClicked(const TQPoint& pos)
 
     TQPopupMenu popmenu(this);
     TDEAction *paste    = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0);
-    TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
+    TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard);
 
     if(!data || !TQUriDrag::canDecode(data))
     {
@@ -684,7 +684,7 @@ void AlbumIconView::slotRightButtonClicked(IconItem *item, const TQPoint& pos)
     
     TDEAction *copy     = KStdAction::copy(this, TQ_SLOT(slotCopy()), 0);
     TDEAction *paste    = KStdAction::paste(this, TQ_SLOT(slotPaste()), 0);
-    TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
+    TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard);
     if(!data || !TQUriDrag::canDecode(data))
     {
         paste->setEnabled(false);
@@ -848,12 +848,12 @@ void AlbumIconView::slotCopy()
     TQDragObject* drag = 0;
 
     drag = new ItemDrag(urls, kioURLs, albumIDs, imageIDs, this);
-    kapp->clipboard()->setData(drag);
+    tdeApp->clipboard()->setData(drag);
 }
 
 void AlbumIconView::slotPaste()
 {
-    TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
+    TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard);
     if(!data)
         return;
 
@@ -1686,7 +1686,7 @@ void AlbumIconView::changeTagOnImageInfos(const TQPtrList<ImageInfo> &list, cons
         if (progress)
         {
             emit signalProgressValue((int)((i++/cnt)*100.0));
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     d->imageLister->blockSignals(false);
@@ -1883,7 +1883,7 @@ void AlbumIconView::slotSetExifOrientation( int orientation )
         }
 
         emit signalProgressValue((int)((i++/cnt)*100.0));
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     emit signalProgressBarMode(StatusProgressBar::TextMode, TQString());
@@ -2269,7 +2269,7 @@ void AlbumIconView::slotAssignRating(int rating)
                 hub.write(info->filePath(), MetadataHub::FullWriteIfChanged);
 
                 emit signalProgressValue((int)((i++/cnt)*100.0));
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
         }
     }
diff --git a/src/digikam/albumlister.cpp b/src/digikam/albumlister.cpp
index 63648773..91f808eb 100644
--- a/src/digikam/albumlister.cpp
+++ b/src/digikam/albumlister.cpp
@@ -521,7 +521,7 @@ void AlbumLister::slotFilterItems()
     // This takes linear time - and deleting seems to take longer. Set wait cursor for large numbers.
     bool setCursor = (3*deleteFilteredItemsList.count() + newFilteredItemsList.count()) > 1500;
     if (setCursor)
-        kapp->setOverrideCursor(KCursor::waitCursor());
+        tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     emit signalItemsTextFilterMatch(matchForText);
     emit signalItemsFilterMatch(match);
@@ -537,7 +537,7 @@ void AlbumLister::slotFilterItems()
     }
 
     if (setCursor)
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
 }
 
 void AlbumLister::slotResult(TDEIO::Job* job)
diff --git a/src/digikam/albumsettings.cpp b/src/digikam/albumsettings.cpp
index 6b7d4315..f87dd0d8 100644
--- a/src/digikam/albumsettings.cpp
+++ b/src/digikam/albumsettings.cpp
@@ -149,7 +149,7 @@ AlbumSettings* AlbumSettings::instance()
 AlbumSettings::AlbumSettings()
 {
     d = new AlbumSettingsPrivate;
-    d->config  = kapp->config();
+    d->config  = tdeApp->config();
     m_instance = this;
     init();
 }
diff --git a/src/digikam/albumthumbnailloader.cpp b/src/digikam/albumthumbnailloader.cpp
index 1fe2065b..667fe53c 100644
--- a/src/digikam/albumthumbnailloader.cpp
+++ b/src/digikam/albumthumbnailloader.cpp
@@ -190,7 +190,7 @@ TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize)
 
 TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size)
 {
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();
     return iconLoader->loadIcon(name, TDEIcon::NoGroup,
                                 size, TDEIcon::DefaultState,
                                 0, true);
diff --git a/src/digikam/datefolderview.cpp b/src/digikam/datefolderview.cpp
index 8e36742e..4c52dc41 100644
--- a/src/digikam/datefolderview.cpp
+++ b/src/digikam/datefolderview.cpp
@@ -329,7 +329,7 @@ void DateFolderView::slotSelectionChanged()
 
 void DateFolderView::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     TQString selected;
@@ -363,7 +363,7 @@ void DateFolderView::loadViewState()
 
 void DateFolderView::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     DateFolderItem *item = dynamic_cast<DateFolderItem*>(d->listview->selectedItem());
diff --git a/src/digikam/digikamapp.cpp b/src/digikam/digikamapp.cpp
index 5b12575a..d6e2551a 100644
--- a/src/digikam/digikamapp.cpp
+++ b/src/digikam/digikamapp.cpp
@@ -113,11 +113,11 @@ DigikamApp::DigikamApp()
 {
     d = new DigikamAppPriv;
     m_instance = this;
-    d->config  = kapp->config();
+    d->config  = tdeApp->config();
     d->config->setGroup("General Settings");
 
     if(d->config->readBoolEntry("Show Splash", true) &&
-       !kapp->isRestored())
+       !tdeApp->isRestored())
     {
         d->splashScreen = new SplashScreen("digikam-splash.png");
         d->splashScreen->show();
@@ -1755,7 +1755,7 @@ void DigikamApp::slotToggleFullScreen()
     }
     else
     {
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("ImageViewer Settings");
         bool fullScreenHideToolBar = config->readBoolEntry("FullScreen Hide ToolBar", false);
 
@@ -1789,7 +1789,7 @@ void DigikamApp::slotShowTip()
 
 void DigikamApp::slotShowKipiHelp()
 {
-    TDEApplication::kApplication()->invokeHelp( TQString(), "kipi-plugins" );
+    tdeApp->invokeHelp( TQString(), "kipi-plugins" );
 }
 
 void DigikamApp::slotRawCameraList()
@@ -2014,12 +2014,12 @@ void DigikamApp::slotSyncAllPicturesMetadataDone()
 
 void DigikamApp::slotDonateMoney()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void DigikamApp::slotContribute()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void DigikamApp::slotRecurseAlbums(bool checked)
diff --git a/src/digikam/digikamfirstrun.cpp b/src/digikam/digikamfirstrun.cpp
index e7a95c01..0810e334 100644
--- a/src/digikam/digikamfirstrun.cpp
+++ b/src/digikam/digikamfirstrun.cpp
@@ -89,7 +89,7 @@ DigikamFirstRun::DigikamFirstRun(TDEConfig* config, TQWidget* parent,
                               "include the slash in the translation","/Pictures"));
     m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly);
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup,
                                 128, TDEIcon::DefaultState, 0, true));
     m_ui->setMinimumSize(450, m_ui->sizeHint().height());
@@ -171,7 +171,7 @@ void DigikamFirstRun::slotOk()
 
     TQString ErrorMsg, URL;
 
-    if (kapp->startServiceByDesktopName("digikam", URL , &ErrorMsg) > 0)
+    if (tdeApp->startServiceByDesktopName("digikam", URL , &ErrorMsg) > 0)
     {
         DError() << ErrorMsg << endl;
         KMessageBox::sorry(this, i18n("Cannot restart digiKam automatically.\n"
diff --git a/src/digikam/digikamview.cpp b/src/digikam/digikamview.cpp
index a8fb42fb..1fb00828 100644
--- a/src/digikam/digikamview.cpp
+++ b/src/digikam/digikamview.cpp
@@ -466,7 +466,7 @@ void DigikamView::setupConnections()
 
 void DigikamView::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("MainWindow");
 
     if(config->hasKey("SplitterSizes"))
@@ -477,7 +477,7 @@ void DigikamView::loadViewState()
 
 void DigikamView::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("MainWindow");
     config->writeEntry("SplitterSizes", d->splitter->sizes());
 
@@ -1500,7 +1500,7 @@ void DigikamView::slotItemsInfoFromAlbums(const ImageInfoList& infoList)
 
 void DigikamView::slideShow(ImageInfoList &infoList)
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false);
 
@@ -1543,7 +1543,7 @@ void DigikamView::slideShow(ImageInfoList &infoList)
         settings.pictInfoMap.insert(info->kurl(), pictInfo);
 
         emit signalProgressValue((int)((i++/cnt)*100.0));
-        kapp->eventLoop()->processEvents(TQEventLoop::AllEvents & ~TQEventLoop::WaitForMore);
+        tdeApp->eventLoop()->processEvents(TQEventLoop::AllEvents & ~TQEventLoop::WaitForMore);
     }
 
     emit signalProgressBarMode(StatusProgressBar::TextMode, TQString());   
diff --git a/src/digikam/folderview.cpp b/src/digikam/folderview.cpp
index 0e2d515d..0f750f2f 100644
--- a/src/digikam/folderview.cpp
+++ b/src/digikam/folderview.cpp
@@ -383,7 +383,7 @@ void FolderView::slotAllAlbumsLoaded()
 
 void FolderView::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     int selectedItem = config->readNumEntry("LastSelectedItem", 0);
@@ -430,7 +430,7 @@ void FolderView::loadViewState()
 
 void FolderView::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     FolderItem *item = dynamic_cast<FolderItem*>(selectedItem());
diff --git a/src/digikam/scanlib.cpp b/src/digikam/scanlib.cpp
index 71ea425c..86e90b3f 100644
--- a/src/digikam/scanlib.cpp
+++ b/src/digikam/scanlib.cpp
@@ -93,7 +93,7 @@ ScanLib::~ScanLib()
 void ScanLib::startScan()
 {
     struct timeval tv1, tv2;
-    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = tdeApp->iconLoader()->loadIcon(
                   "system-run", TDEIcon::NoGroup, 32);
 
     TQString message = i18n("Finding non-existent Albums");
@@ -145,7 +145,7 @@ void ScanLib::findFoldersWhichDoNotExist()
         }
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     if (!toBeDeleted.isEmpty())
     {
@@ -200,11 +200,11 @@ void ScanLib::findMissingItems()
     m_progressBar->setLabel(i18n("Scanning items, please wait..."));
     m_progressBar->progressBar()->setTotalSteps( countItemsInFolder( albumPath ) );
     if (!m_splash) m_progressBar->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     TQDir dir(albumPath);
     TQStringList fileList(dir.entryList(TQDir::Dirs));
-    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = tdeApp->iconLoader()->loadIcon(
                   "folder_image", TDEIcon::NoGroup, 32);
 
     AlbumDB* db = AlbumManager::instance()->albumDB();
@@ -222,7 +222,7 @@ void ScanLib::findMissingItems()
     db->commitTransaction();    
 
     m_progressBar->hide();
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void ScanLib::updateItemsWithoutDate()
@@ -244,7 +244,7 @@ void ScanLib::updateItemsWithoutDate()
     m_progressBar->progressBar()->setTotalSteps(urls.count());
     m_progressBar->setLabel(i18n("Updating items, please wait..."));
     m_progressBar->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     TQString basePath = AlbumManager::instance()->getLibraryPath();
     basePath = TQDir::cleanDirPath(basePath);
@@ -258,7 +258,7 @@ void ScanLib::updateItemsWithoutDate()
         ++counter;
         if ( counter % 30 == 0 )
         {
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
 
         TQFileInfo fi(*it);
@@ -290,7 +290,7 @@ void ScanLib::updateItemsWithoutDate()
     db->commitTransaction();    
     
     m_progressBar->hide();
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 int ScanLib::countItemsInFolder(const TQString& directory)
@@ -364,7 +364,7 @@ void ScanLib::allFiles(const TQString& directory)
     TQFileInfo *fi;
 
     m_progressBar->progressBar()->advance(list->count());
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     while ( (fi = it.current()) != 0 )
     {
diff --git a/src/digikam/syncjob.cpp b/src/digikam/syncjob.cpp
index b350aabc..edc7a22c 100644
--- a/src/digikam/syncjob.cpp
+++ b/src/digikam/syncjob.cpp
@@ -243,7 +243,7 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size)
     }
     else
     {
-        TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+        TDEIconLoader *iconLoader = tdeApp->iconLoader();
         *thumbnail_ = iconLoader->loadIcon(name, TDEIcon::NoGroup, thumbnailSize_,
                                            TDEIcon::DefaultState, 0, true);
     }
diff --git a/src/digikam/tageditdlg.cpp b/src/digikam/tageditdlg.cpp
index d77a0169..f801aa52 100644
--- a/src/digikam/tageditdlg.cpp
+++ b/src/digikam/tageditdlg.cpp
@@ -104,7 +104,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));
 
     d->topLabel = new TQLabel(page);
diff --git a/src/digikam/tagfilterview.cpp b/src/digikam/tagfilterview.cpp
index 2bebc2b8..e3675dbb 100644
--- a/src/digikam/tagfilterview.cpp
+++ b/src/digikam/tagfilterview.cpp
@@ -330,7 +330,7 @@ TagFilterView::TagFilterView(TQWidget* parent)
 
     // ------------------------------------------------------------------------
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Tag Filters View");
     d->matchingCond = (AlbumLister::MatchingCondition)(config->readNumEntry("Matching Condition",
                                                        AlbumLister::OrCondition));
@@ -340,7 +340,7 @@ TagFilterView::TagFilterView(TQWidget* parent)
 
 TagFilterView::~TagFilterView()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Tag Filters View");
     config->writeEntry("Matching Condition", (int)(d->matchingCond));
     config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags));
@@ -653,7 +653,7 @@ void TagFilterView::contentsDropEvent(TQDropEvent *e)
                 hub.write(info.filePath(), MetadataHub::FullWriteIfChanged);
 
                 emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0));
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             AlbumLister::instance()->blockSignals(false);
             AlbumManager::instance()->albumDB()->commitTransaction();
@@ -1134,13 +1134,13 @@ void TagFilterView::tagNew(TagFilterViewItem* item, const TQString& _title, cons
 
     if (title.isNull())
     {
-        if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
+        if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon))
             return;
     }
 
     TQMap<TQString, TQString> errMap;
     AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
-    TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
+    TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap);
 
     for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
     {
@@ -1165,7 +1165,7 @@ void TagFilterView::tagEdit(TagFilterViewItem* item)
         return;
 
     TQString title, icon;
-    if (!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon))
+    if (!TagEditDlg::tagEdit(tdeApp->activeWindow(), tag, title, icon))
     {
         return;
     }
@@ -1359,7 +1359,7 @@ void TagFilterView::slotResetTagFilters()
 
 void TagFilterView::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     int selectedItem = config->readNumEntry("LastSelectedItem", 0);
@@ -1406,7 +1406,7 @@ void TagFilterView::loadViewState()
 
 void TagFilterView::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     TagFilterViewItem *item = dynamic_cast<TagFilterViewItem*>(selectedItem());
diff --git a/src/digikam/tagfolderview.cpp b/src/digikam/tagfolderview.cpp
index c5d54331..c0b5aaa3 100644
--- a/src/digikam/tagfolderview.cpp
+++ b/src/digikam/tagfolderview.cpp
@@ -635,13 +635,13 @@ void TagFolderView::tagNew( TagFolderViewItem *item, const TQString& _title, con
 
     if (title.isNull())
     {
-        if(!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
+        if(!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon))
             return;
     }
 
     TQMap<TQString, TQString> errMap;
     AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
-    TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
+    TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap);
 
     for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
     {
@@ -667,7 +667,7 @@ void TagFolderView::tagEdit(TagFolderViewItem *item)
         return;
 
     TQString title, icon;
-    if(!TagEditDlg::tagEdit(kapp->activeWindow(), tag, title, icon))
+    if(!TagEditDlg::tagEdit(tdeApp->activeWindow(), tag, title, icon))
         return;
 
     if(tag->title() != title)
@@ -975,7 +975,7 @@ void TagFolderView::contentsDropEvent(TQDropEvent *e)
                 hub.write(info.filePath(), MetadataHub::FullWriteIfChanged);
 
                 emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0));
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             AlbumLister::instance()->blockSignals(false);
             d->albumMan->albumDB()->commitTransaction();
diff --git a/src/digikam/tagspopupmenu.cpp b/src/digikam/tagspopupmenu.cpp
index 8b9e4644..b0f47bad 100644
--- a/src/digikam/tagspopupmenu.cpp
+++ b/src/digikam/tagspopupmenu.cpp
@@ -71,7 +71,7 @@ public:
     {
         TQFont fn = m_popup->font();
         TQFontMetrics fm(fn);
-        int w = fm.width(m_txt) + 5 + kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
+        int w = fm.width(m_txt) + 5 + tdeApp->style().pixelMetric(TQStyle::PM_IndicatorWidth, 0);
         int h = TQMAX(fm.height(), m_pix.height());
         return TQSize( w, h );
     }
@@ -90,8 +90,8 @@ public:
             p->drawPixmap( pixRect.topLeft(), m_pix );
         }
 
-        int checkWidth  = kapp->style().pixelMetric(TQStyle::PM_IndicatorWidth,  0);
-        int checkHeight = kapp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
+        int checkWidth  = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorWidth,  0);
+        int checkHeight = tdeApp->style().pixelMetric(TQStyle::PM_IndicatorHeight, 0);
 
         TQStyle::SFlags flags = TQStyle::Style_Default;
         flags |= TQStyle::Style_On;
@@ -103,7 +103,7 @@ public:
         TQFont fn = m_popup->font();
         TQFontMetrics fm(fn);
         TQRect r(x + 5 + fm.width(m_txt), y + (h/2-checkHeight/2), checkWidth, checkHeight);
-        kapp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
+        tdeApp->style().drawPrimitive(TQStyle::PE_CheckMark, p, r, cg, flags);
     }
 
 private:
@@ -141,7 +141,7 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int
     d->addToID          = addToID;
     d->mode             = mode;
 
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();
     d->addTagPix            = iconLoader->loadIcon("tag",
                                         TDEIcon::NoGroup,
                                         TDEIcon::SizeSmall,
@@ -346,12 +346,12 @@ void TagsPopupMenu::slotActivated(int id)
         }
 
         TQString title, icon;
-        if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon))
+        if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parent, title, icon))
             return;
 
         TQMap<TQString, TQString> errMap;
         AlbumList tList = TagEditDlg::createTAlbum(parent, title, icon, errMap);
-        TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
+        TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap);
 
         for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
             emit signalTagActivated((*it)->id());
diff --git a/src/digikam/timelineview.cpp b/src/digikam/timelineview.cpp
index ae8a6bc2..7794c898 100644
--- a/src/digikam/timelineview.cpp
+++ b/src/digikam/timelineview.cpp
@@ -325,7 +325,7 @@ void TimeLineView::slotInit()
 
 void TimeLineView::readConfig()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("TimeLine SideBar");
 
     d->timeUnitCB->setCurrentItem(config->readNumEntry("Histogram TimeUnit", TimeLineWidget::Month));
@@ -341,7 +341,7 @@ void TimeLineView::readConfig()
 
 void TimeLineView::writeConfig()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("TimeLine SideBar");
     config->writeEntry("Histogram TimeUnit", d->timeUnitCB->currentItem());
     config->writeEntry("Histogram Scale", d->scaleBG->selectedId());
diff --git a/src/digikam/welcomepageview.cpp b/src/digikam/welcomepageview.cpp
index 6327c947..c7c5cf8c 100644
--- a/src/digikam/welcomepageview.cpp
+++ b/src/digikam/welcomepageview.cpp
@@ -65,7 +65,7 @@ WelcomePageView::WelcomePageView(TQWidget* parent)
     TQString locationHtml     = locate("data", "digikam/about/main.html");
     TQString locationCss      = locate("data", "digikam/about/kde_infopage.css");
     TQString locationRtl      = locate("data", "digikam/about/kde_infopage_rtl.css" );
-    TQString rtl              = kapp->reverseLayout() ? TQString("@import \"%1\";" ).arg(locationRtl)
+    TQString rtl              = tdeApp->reverseLayout() ? TQString("@import \"%1\";" ).arg(locationRtl)
                                                      : TQString();
 
     begin(KURL(locationHtml));
@@ -93,7 +93,7 @@ WelcomePageView::~WelcomePageView()
 
 void WelcomePageView::slotUrlOpen(const KURL &url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url.url());
+    tdeApp->invokeBrowser(url.url());
 }
 
 TQString WelcomePageView::infoPage()
diff --git a/src/imageplugins/adjustcurves/adjustcurves.cpp b/src/imageplugins/adjustcurves/adjustcurves.cpp
index ace9c9b3..dcda4da6 100644
--- a/src/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/src/imageplugins/adjustcurves/adjustcurves.cpp
@@ -456,7 +456,7 @@ void AdjustCurveDialog::slotEffect()
 
 void AdjustCurveDialog::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *orgData             = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -473,7 +473,7 @@ void AdjustCurveDialog::finalRendering()
     m_curves->curvesLutProcess(orgData, desData, w, h);
 
     iface->putOriginalImage(i18n("Adjust Curve"), desData);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     delete [] orgData;
     delete [] desData;
@@ -558,7 +558,7 @@ void AdjustCurveDialog::slotCurveTypeChanged(int type)
 
 void AdjustCurveDialog::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustcurves Tool Dialog");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -595,7 +595,7 @@ void AdjustCurveDialog::readUserSettings()
 
 void AdjustCurveDialog::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustcurves Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
diff --git a/src/imageplugins/adjustcurves/adjustcurvestool.cpp b/src/imageplugins/adjustcurves/adjustcurvestool.cpp
index 7bfd00f7..dbf2a08d 100644
--- a/src/imageplugins/adjustcurves/adjustcurvestool.cpp
+++ b/src/imageplugins/adjustcurves/adjustcurvestool.cpp
@@ -438,7 +438,7 @@ void AdjustCurvesTool::slotEffect()
 
 void AdjustCurvesTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *orgData    = iface->getOriginalImage();
     int w             = iface->originalWidth();
@@ -455,7 +455,7 @@ void AdjustCurvesTool::finalRendering()
     m_curvesWidget->curves()->curvesLutProcess(orgData, desData, w, h);
 
     iface->putOriginalImage(i18n("Adjust Curves"), desData);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     delete [] orgData;
     delete [] desData;
@@ -539,7 +539,7 @@ void AdjustCurvesTool::slotCurveTypeChanged(int type)
 
 void AdjustCurvesTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustcurves Tool");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -578,7 +578,7 @@ void AdjustCurvesTool::readSettings()
 
 void AdjustCurvesTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustcurves Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -620,14 +620,14 @@ void AdjustCurvesTool::slotLoadSettings()
     KURL loadCurvesFile;
 
     loadCurvesFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("Select Gimp Curves File to Load")) );
     if( loadCurvesFile.isEmpty() )
        return;
 
     if ( m_curvesWidget->curves()->loadCurvesFromGimpCurvesFile( loadCurvesFile ) == false )
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("Cannot load from the Gimp curves text file."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load from the Gimp curves text file."));
        return;
     }
 
@@ -641,14 +641,14 @@ void AdjustCurvesTool::slotSaveAsSettings()
     KURL saveCurvesFile;
 
     saveCurvesFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("Gimp Curves File to Save")) );
     if( saveCurvesFile.isEmpty() )
        return;
 
     if ( m_curvesWidget->curves()->saveCurvesToGimpCurvesFile( saveCurvesFile ) == false )
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("Cannot save to the Gimp curves text file."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save to the Gimp curves text file."));
        return;
     }
 
diff --git a/src/imageplugins/adjustlevels/adjustlevels.cpp b/src/imageplugins/adjustlevels/adjustlevels.cpp
index 72d5e46b..4a65b275 100644
--- a/src/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/src/imageplugins/adjustlevels/adjustlevels.cpp
@@ -288,12 +288,12 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
     m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame);    
 
     m_autoButton = new TQPushButton(gboxSettings);
-    m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));    TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) );
+    m_autoButton->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));    TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) );
     TQWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted "
                                         "automatically."));
 
     m_resetButton = new TQPushButton(i18n("&Reset"), gboxSettings);
-    m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar));     
+    m_resetButton->setPixmap(tdeApp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar));     
     TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) );
     TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values "
                                          "from the current selected channel "
@@ -596,7 +596,7 @@ void AdjustLevelDialog::slotEffect()
 
 void AdjustLevelDialog::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *orgData             = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -613,7 +613,7 @@ void AdjustLevelDialog::finalRendering()
     m_levels->levelsLutProcess(orgData, desData, w, h);
 
     iface->putOriginalImage(i18n("Adjust Level"), desData);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     delete [] orgData;
     delete [] desData;
@@ -690,7 +690,7 @@ void AdjustLevelDialog::slotScaleChanged(int scale)
 
 void AdjustLevelDialog::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustlevels Tool Dialog");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -728,7 +728,7 @@ void AdjustLevelDialog::readUserSettings()
 
 void AdjustLevelDialog::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustlevels Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
diff --git a/src/imageplugins/adjustlevels/adjustlevelstool.cpp b/src/imageplugins/adjustlevels/adjustlevelstool.cpp
index 28066774..c8697226 100644
--- a/src/imageplugins/adjustlevels/adjustlevelstool.cpp
+++ b/src/imageplugins/adjustlevels/adjustlevelstool.cpp
@@ -285,12 +285,12 @@ AdjustLevelsTool::AdjustLevelsTool(TQObject* parent)
     m_pickerColorButtonGroup->setFrameShape(TQFrame::NoFrame);
 
     m_autoButton = new TQPushButton(m_gboxSettings->plainPage());
-    m_autoButton->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));    TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) );
+    m_autoButton->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));    TQToolTip::add( m_autoButton, i18n( "Adjust all levels automatically." ) );
     TQWhatsThis::add( m_autoButton, i18n("<p>If you press this button, all channel levels will be adjusted "
                                         "automatically."));
 
     m_resetButton = new TQPushButton(i18n("&Reset"), m_gboxSettings->plainPage());
-    m_resetButton->setPixmap(kapp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar));
+    m_resetButton->setPixmap(tdeApp->iconLoader()->loadIcon("reload_page", (TDEIcon::Group)TDEIcon::Toolbar));
     TQToolTip::add( m_resetButton, i18n( "Reset current channel levels' values." ) );
     TQWhatsThis::add( m_resetButton, i18n("<p>If you press this button, all levels' values "
                                          "from the current selected channel "
@@ -579,7 +579,7 @@ void AdjustLevelsTool::slotEffect()
 
 void AdjustLevelsTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *orgData    = iface->getOriginalImage();
     int w             = iface->originalWidth();
@@ -596,7 +596,7 @@ void AdjustLevelsTool::finalRendering()
     m_levels->levelsLutProcess(orgData, desData, w, h);
 
     iface->putOriginalImage(i18n("Adjust Level"), desData);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     delete [] orgData;
     delete [] desData;
@@ -672,7 +672,7 @@ void AdjustLevelsTool::slotScaleChanged(int scale)
 
 void AdjustLevelsTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustlevels Tool");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -710,7 +710,7 @@ void AdjustLevelsTool::readSettings()
 
 void AdjustLevelsTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("adjustlevels Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -752,14 +752,14 @@ void AdjustLevelsTool::slotLoadSettings()
     KURL loadLevelsFile;
 
     loadLevelsFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("Select Gimp Levels File to Load")) );
     if( loadLevelsFile.isEmpty() )
        return;
 
     if ( m_levels->loadLevelsFromGimpLevelsFile( loadLevelsFile ) == false )
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("Cannot load from the Gimp levels text file."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load from the Gimp levels text file."));
        return;
     }
 
@@ -772,14 +772,14 @@ void AdjustLevelsTool::slotSaveAsSettings()
     KURL saveLevelsFile;
 
     saveLevelsFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("Gimp Levels File to Save")) );
     if( saveLevelsFile.isEmpty() )
        return;
 
     if ( m_levels->saveLevelsToGimpLevelsFile( saveLevelsFile ) == false )
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("Cannot save to the Gimp levels text file."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save to the Gimp levels text file."));
        return;
     }
 
diff --git a/src/imageplugins/antivignetting/antivignettingtool.cpp b/src/imageplugins/antivignetting/antivignettingtool.cpp
index d8f211c7..6f468794 100644
--- a/src/imageplugins/antivignetting/antivignettingtool.cpp
+++ b/src/imageplugins/antivignetting/antivignettingtool.cpp
@@ -212,7 +212,7 @@ void AntiVignettingTool::renderingFinished()
 
 void AntiVignettingTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("antivignettings Tool");
 
     m_densityInput->blockSignals(true);
@@ -241,7 +241,7 @@ void AntiVignettingTool::readSettings()
 
 void AntiVignettingTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("antivignettings Tool");
     config->writeEntry("DensityAjustment", m_densityInput->value());
     config->writeEntry("PowerAjustment", m_powerInput->value());
diff --git a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index 7d7a00c6..494fe430 100644
--- a/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/src/imageplugins/antivignetting/imageeffect_antivignetting.cpp
@@ -211,7 +211,7 @@ void ImageEffect_AntiVignetting::renderingFinished()
 
 void ImageEffect_AntiVignetting::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("antivignettings Tool Dialog");
 
     m_densityInput->blockSignals(true);
@@ -240,7 +240,7 @@ void ImageEffect_AntiVignetting::readUserSettings()
 
 void ImageEffect_AntiVignetting::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("antivignettings Tool Dialog");
     config->writeEntry("DensityAjustment", m_densityInput->value());
     config->writeEntry("PowerAjustment", m_powerInput->value());
diff --git a/src/imageplugins/blurfx/blurfxtool.cpp b/src/imageplugins/blurfx/blurfxtool.cpp
index 2998dbde..0f5a130a 100644
--- a/src/imageplugins/blurfx/blurfxtool.cpp
+++ b/src/imageplugins/blurfx/blurfxtool.cpp
@@ -196,7 +196,7 @@ void BlurFXTool::renderingFinished(void)
 
 void BlurFXTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("blurfx Tool");
     m_effectType->blockSignals(true);
     m_distanceInput->blockSignals(true);
@@ -213,7 +213,7 @@ void BlurFXTool::readSettings()
 
 void BlurFXTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("blurfx Tool");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("DistanceAjustment", m_distanceInput->value());
diff --git a/src/imageplugins/blurfx/imageeffect_blurfx.cpp b/src/imageplugins/blurfx/imageeffect_blurfx.cpp
index 62bcd525..be25bfff 100644
--- a/src/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/src/imageplugins/blurfx/imageeffect_blurfx.cpp
@@ -194,7 +194,7 @@ void ImageEffect_BlurFX::renderingFinished(void)
 
 void ImageEffect_BlurFX::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("blurfx Tool Dialog");
     m_effectType->blockSignals(true);
     m_distanceInput->blockSignals(true);
@@ -209,7 +209,7 @@ void ImageEffect_BlurFX::readUserSettings()
 
 void ImageEffect_BlurFX::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("blurfx Tool Dialog");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("DistanceAjustment", m_distanceInput->value());
diff --git a/src/imageplugins/border/bordertool.cpp b/src/imageplugins/border/bordertool.cpp
index 160f5b0a..0ae2ab30 100644
--- a/src/imageplugins/border/bordertool.cpp
+++ b/src/imageplugins/border/bordertool.cpp
@@ -204,7 +204,7 @@ void BorderTool::readSettings()
     m_secondColorButton->blockSignals(true);
     m_preserveAspectRatio->blockSignals(true);
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("border Tool");
 
     m_borderType->setCurrentItem(config->readNumEntry("Border Type", m_borderType->defaultItem()));
@@ -237,7 +237,7 @@ void BorderTool::readSettings()
 
 void BorderTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("border Tool");
 
     config->writeEntry("Border Type", m_borderType->currentItem());
diff --git a/src/imageplugins/border/imageeffect_border.cpp b/src/imageplugins/border/imageeffect_border.cpp
index 9f3dd6c3..61318b3b 100644
--- a/src/imageplugins/border/imageeffect_border.cpp
+++ b/src/imageplugins/border/imageeffect_border.cpp
@@ -204,7 +204,7 @@ void ImageEffect_Border::readUserSettings(void)
     m_secondColorButton->blockSignals(true);
     m_preserveAspectRatio->blockSignals(true);
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("border Tool Dialog");
     
     m_borderType->setCurrentItem(config->readNumEntry("Border Type", Border::SolidBorder));
@@ -237,7 +237,7 @@ void ImageEffect_Border::readUserSettings(void)
     
 void ImageEffect_Border::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("border Tool Dialog");
 
     config->writeEntry("Border Type", m_borderType->currentItem());
diff --git a/src/imageplugins/channelmixer/channelmixer.cpp b/src/imageplugins/channelmixer/channelmixer.cpp
index 849cc1e8..f7aee9de 100644
--- a/src/imageplugins/channelmixer/channelmixer.cpp
+++ b/src/imageplugins/channelmixer/channelmixer.cpp
@@ -450,7 +450,7 @@ void ChannelMixerDialog::slotEffect()
 
 void ChannelMixerDialog::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -480,7 +480,7 @@ void ChannelMixerDialog::finalRendering()
 
     iface->putOriginalImage(i18n("Channel Mixer"), data);
     delete [] data;
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
@@ -525,7 +525,7 @@ void ChannelMixerDialog::slotScaleChanged(int scale)
 
 void ChannelMixerDialog::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("channelmixer Tool Dialog");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -559,7 +559,7 @@ void ChannelMixerDialog::readUserSettings()
 
 void ChannelMixerDialog::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("channelmixer Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
diff --git a/src/imageplugins/channelmixer/channelmixertool.cpp b/src/imageplugins/channelmixer/channelmixertool.cpp
index c8215178..ac27be5c 100644
--- a/src/imageplugins/channelmixer/channelmixertool.cpp
+++ b/src/imageplugins/channelmixer/channelmixertool.cpp
@@ -443,7 +443,7 @@ void ChannelMixerTool::slotEffect()
 
 void ChannelMixerTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data       = iface->getOriginalImage();
     int w             = iface->originalWidth();
@@ -473,7 +473,7 @@ void ChannelMixerTool::finalRendering()
 
     iface->putOriginalImage(i18n("Channel Mixer"), data);
     delete [] data;
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ChannelMixerTool::slotChannelChanged(int channel)
@@ -517,7 +517,7 @@ void ChannelMixerTool::slotScaleChanged(int scale)
 
 void ChannelMixerTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("channelmixer Tool");
 
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
@@ -550,7 +550,7 @@ void ChannelMixerTool::readSettings()
 
 void ChannelMixerTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("channelmixer Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -619,7 +619,7 @@ void ChannelMixerTool::slotLoadSettings()
     bool monochrome;
 
     loadGainsFileUrl = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Select Gimp Gains Mixer File to Load")) );
     if( loadGainsFileUrl.isEmpty() )
        return;
@@ -692,7 +692,7 @@ void ChannelMixerTool::slotLoadSettings()
     }
     else
     {
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Gains Mixer text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Gains Mixer text file."));
         return;
     }
 }
@@ -703,7 +703,7 @@ void ChannelMixerTool::slotSaveAsSettings()
     FILE *fp = 0L;
 
     saveGainsFileUrl = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                               TQString( "*" ), kapp->activeWindow(),
+                                               TQString( "*" ), tdeApp->activeWindow(),
                                                TQString( i18n("Gimp Gains Mixer File to Save")) );
     if( saveGainsFileUrl.isEmpty() )
        return;
@@ -766,7 +766,7 @@ void ChannelMixerTool::slotSaveAsSettings()
     }
     else
     {
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Gains Mixer text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Gains Mixer text file."));
         return;
     }
 }
diff --git a/src/imageplugins/charcoal/charcoaltool.cpp b/src/imageplugins/charcoal/charcoaltool.cpp
index 75ee22df..75984cca 100644
--- a/src/imageplugins/charcoal/charcoaltool.cpp
+++ b/src/imageplugins/charcoal/charcoaltool.cpp
@@ -129,7 +129,7 @@ void CharcoalTool::renderingFinished()
 
 void CharcoalTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("charcoal Tool");
     m_pencilInput->blockSignals(true);
     m_smoothInput->blockSignals(true);
@@ -143,7 +143,7 @@ void CharcoalTool::readSettings()
 
 void CharcoalTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("charcoal Tool");
     config->writeEntry("PencilAjustment", m_pencilInput->value());
     config->writeEntry("SmoothAjustment", m_smoothInput->value());
diff --git a/src/imageplugins/charcoal/imageeffect_charcoal.cpp b/src/imageplugins/charcoal/imageeffect_charcoal.cpp
index 67a0269d..9a83f470 100644
--- a/src/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/src/imageplugins/charcoal/imageeffect_charcoal.cpp
@@ -123,7 +123,7 @@ void ImageEffect_Charcoal::renderingFinished()
 
 void ImageEffect_Charcoal::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("charcoal Tool Dialog");
     m_pencilInput->blockSignals(true);
     m_smoothInput->blockSignals(true);
@@ -135,7 +135,7 @@ void ImageEffect_Charcoal::readUserSettings()
 
 void ImageEffect_Charcoal::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("charcoal Tool Dialog");
     config->writeEntry("PencilAjustment", m_pencilInput->value());
     config->writeEntry("SmoothAjustment", m_smoothInput->value());
diff --git a/src/imageplugins/colorfx/colorfxtool.cpp b/src/imageplugins/colorfx/colorfxtool.cpp
index dd16e7cf..864e5da1 100644
--- a/src/imageplugins/colorfx/colorfxtool.cpp
+++ b/src/imageplugins/colorfx/colorfxtool.cpp
@@ -235,7 +235,7 @@ ColorFXTool::~ColorFXTool()
 
 void ColorFXTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("coloreffect Tool");
     m_effectType->setCurrentItem(config->readNumEntry("EffectType", m_effectType->defaultItem()));
     m_levelInput->setValue(config->readNumEntry("LevelAjustment", m_levelInput->defaultValue()));
@@ -249,7 +249,7 @@ void ColorFXTool::readSettings()
 
 void ColorFXTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("coloreffect Tool");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("LevelAjustment", m_levelInput->value());
@@ -359,7 +359,7 @@ void ColorFXTool::slotEffectTypeChanged(int type)
 
 void ColorFXTool::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -381,12 +381,12 @@ void ColorFXTool::slotEffect()
 
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ColorFXTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -421,7 +421,7 @@ void ColorFXTool::finalRendering()
         delete[] data;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ColorFXTool::colorEffect(uchar *data, int w, int h, bool sb)
diff --git a/src/imageplugins/colorfx/imageeffect_colorfx.cpp b/src/imageplugins/colorfx/imageeffect_colorfx.cpp
index a4ab6fe7..abf96f77 100644
--- a/src/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/src/imageplugins/colorfx/imageeffect_colorfx.cpp
@@ -242,7 +242,7 @@ ImageEffect_ColorFX::~ImageEffect_ColorFX()
 
 void ImageEffect_ColorFX::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("coloreffect Tool Dialog");
     m_effectType->setCurrentItem(config->readNumEntry("EffectType", ColorFX));
     m_levelInput->setValue(config->readNumEntry("LevelAjustment", 0));
@@ -252,7 +252,7 @@ void ImageEffect_ColorFX::readUserSettings()
 
 void ImageEffect_ColorFX::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("coloreffect Tool Dialog");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("LevelAjustment", m_levelInput->value());
@@ -349,7 +349,7 @@ void ImageEffect_ColorFX::slotEffectTypeChanged(int type)
 
 void ImageEffect_ColorFX::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -371,12 +371,12 @@ void ImageEffect_ColorFX::slotEffect()
    
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_ColorFX::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -411,7 +411,7 @@ void ImageEffect_ColorFX::finalRendering()
         delete [] data;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/autocorrectiontool.cpp b/src/imageplugins/coreplugin/autocorrectiontool.cpp
index 32f00b44..f9e35986 100644
--- a/src/imageplugins/coreplugin/autocorrectiontool.cpp
+++ b/src/imageplugins/coreplugin/autocorrectiontool.cpp
@@ -292,7 +292,7 @@ void AutoCorrectionTool::slotColorSelectedFromTarget(const DColor& color)
 
 void AutoCorrectionTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("autocorrection Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -304,7 +304,7 @@ void AutoCorrectionTool::readSettings()
 
 void AutoCorrectionTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("autocorrection Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -324,7 +324,7 @@ void AutoCorrectionTool::slotResetSettings()
 
 void AutoCorrectionTool::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -346,7 +346,7 @@ void AutoCorrectionTool::slotEffect()
 
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 TQPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type)
@@ -359,7 +359,7 @@ TQPixmap AutoCorrectionTool::getThumbnailForEffect(AutoCorrectionType type)
 
 void AutoCorrectionTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data       = iface->getOriginalImage();
     int w             = iface->originalWidth();
@@ -399,7 +399,7 @@ void AutoCorrectionTool::finalRendering()
        delete [] data;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void AutoCorrectionTool::autoCorrection(uchar *data, int w, int h, bool sb, int type)
diff --git a/src/imageplugins/coreplugin/bcgtool.cpp b/src/imageplugins/coreplugin/bcgtool.cpp
index 17ecf838..b33b16df 100644
--- a/src/imageplugins/coreplugin/bcgtool.cpp
+++ b/src/imageplugins/coreplugin/bcgtool.cpp
@@ -266,7 +266,7 @@ void BCGTool::slotColorSelectedFromTarget(const DColor &color)
 
 void BCGTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("bcgadjust Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -280,7 +280,7 @@ void BCGTool::readSettings()
 
 void BCGTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("bcgadjust Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -310,7 +310,7 @@ void BCGTool::slotResetSettings()
 
 void BCGTool::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     double b = (double) m_bInput->value() / 250.0;
     double c = (double) (m_cInput->value() / 100.0) + 1.00;
@@ -346,12 +346,12 @@ void BCGTool::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void BCGTool::finalRendering()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     ImageIface* iface = m_previewWidget->imageIface();
 
     double b = (double) m_bInput->value() / 250.0;
@@ -359,7 +359,7 @@ void BCGTool::finalRendering()
     double g = m_gInput->value();
 
     iface->setOriginalBCG(b, c, g);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamImagesPluginCore
diff --git a/src/imageplugins/coreplugin/blurtool.cpp b/src/imageplugins/coreplugin/blurtool.cpp
index 85e1dc19..c792e187 100644
--- a/src/imageplugins/coreplugin/blurtool.cpp
+++ b/src/imageplugins/coreplugin/blurtool.cpp
@@ -104,14 +104,14 @@ BlurTool::~BlurTool()
 
 void BlurTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("gaussianblur Tool");
     m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", m_radiusInput->defaultValue()));
 }
 
 void BlurTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("gaussianblur Tool");
     config->writeEntry("RadiusAjustment", m_radiusInput->value());
     config->sync();
diff --git a/src/imageplugins/coreplugin/bwsepiatool.cpp b/src/imageplugins/coreplugin/bwsepiatool.cpp
index 06c30462..54a53e80 100644
--- a/src/imageplugins/coreplugin/bwsepiatool.cpp
+++ b/src/imageplugins/coreplugin/bwsepiatool.cpp
@@ -630,7 +630,7 @@ void BWSepiaTool::slotColorSelectedFromTarget(const DColor &color)
 
 void BWSepiaTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("convertbw Tool");
 
     m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab));
@@ -673,7 +673,7 @@ void BWSepiaTool::readSettings()
 
 void BWSepiaTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("convertbw Tool");
     config->writeEntry("Settings Tab", m_tab->currentPageIndex());
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
@@ -742,7 +742,7 @@ void BWSepiaTool::slotResetSettings()
 
 void BWSepiaTool::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -789,12 +789,12 @@ void BWSepiaTool::slotEffect()
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
     delete [] targetData;
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void BWSepiaTool::finalRendering()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -835,7 +835,7 @@ void BWSepiaTool::finalRendering()
         delete [] targetData;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, int type)
@@ -1064,7 +1064,7 @@ void BWSepiaTool::blackAndWhiteConversion(uchar *data, int w, int h, bool sb, in
 void BWSepiaTool::slotLoadSettings()
 {
     KURL loadFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Black & White Settings File to Load")) );
     if( loadFile.isEmpty() )
        return;
@@ -1077,7 +1077,7 @@ void BWSepiaTool::slotLoadSettings()
 
         if (stream.readLine() != "# Black & White Configuration File")
         {
-           KMessageBox::error(kapp->activeWindow(),
+           KMessageBox::error(tdeApp->activeWindow(),
                               i18n("\"%1\" is not a Black & White settings text file.")
                               .arg(loadFile.fileName()));
            file.close();
@@ -1129,7 +1129,7 @@ void BWSepiaTool::slotLoadSettings()
         slotEffect();
     }
     else
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Cannot load settings from the Black & White text file."));
 
     file.close();
@@ -1140,7 +1140,7 @@ void BWSepiaTool::slotLoadSettings()
 void BWSepiaTool::slotSaveAsSettings()
 {
     KURL saveFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Black & White Settings File to Save")));
     if( saveFile.isEmpty() )
        return;
@@ -1168,7 +1168,7 @@ void BWSepiaTool::slotSaveAsSettings()
         }
     }
     else
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Cannot save settings to the Black & White text file."));
 
     file.close();
diff --git a/src/imageplugins/coreplugin/hsl/hsltool.cpp b/src/imageplugins/coreplugin/hsl/hsltool.cpp
index 5fa3d746..ff681c16 100644
--- a/src/imageplugins/coreplugin/hsl/hsltool.cpp
+++ b/src/imageplugins/coreplugin/hsl/hsltool.cpp
@@ -331,7 +331,7 @@ void HSLTool::slotSChanged(double s)
 
 void HSLTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("hsladjust Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -349,7 +349,7 @@ void HSLTool::readSettings()
 
 void HSLTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("hsladjust Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -382,7 +382,7 @@ void HSLTool::slotResetSettings()
 
 void HSLTool::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double hu  = m_hInput->value();
     double sa  = m_sInput->value();
@@ -419,12 +419,12 @@ void HSLTool::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void HSLTool::finalRendering()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     double hu  = m_hInput->value();
     double sa  = m_sInput->value();
@@ -446,7 +446,7 @@ void HSLTool::finalRendering()
     cmod.applyHSL(original);
 
     iface->putOriginalImage(i18n("HSL Adjustments"), original.bits());
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamImagesPluginCore
diff --git a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
index e179d36f..c2f1a752 100644
--- a/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
+++ b/src/imageplugins/coreplugin/hsl/imageeffect_hsl.cpp
@@ -315,7 +315,7 @@ void ImageEffect_HSL::slotSChanged(double s)
 
 void ImageEffect_HSL::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("hsladjust Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -330,7 +330,7 @@ void ImageEffect_HSL::readUserSettings()
 
 void ImageEffect_HSL::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("hsladjust Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -357,7 +357,7 @@ void ImageEffect_HSL::resetValues()
 
 void ImageEffect_HSL::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double hu  = m_hInput->value();
     double sa  = m_sInput->value();    
@@ -393,12 +393,12 @@ void ImageEffect_HSL::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_HSL::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double hu  = m_hInput->value();
     double sa  = m_sInput->value();    
@@ -420,7 +420,7 @@ void ImageEffect_HSL::finalRendering()
     cmod.applyHSL(original);
 
     iface->putOriginalImage(i18n("HSL Adjustments"), original.bits());
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/iccprooftool.cpp b/src/imageplugins/coreplugin/iccprooftool.cpp
index b74adf9a..d7026949 100644
--- a/src/imageplugins/coreplugin/iccprooftool.cpp
+++ b/src/imageplugins/coreplugin/iccprooftool.cpp
@@ -538,7 +538,7 @@ ICCProofTool::~ICCProofTool()
 void ICCProofTool::readSettings()
 {
     TQString defaultICCPath = TDEGlobalSettings::documentPath();
-    TDEConfig* config        = kapp->config();
+    TDEConfig* config        = tdeApp->config();
 
     // General settings of digiKam Color Management
     config->setGroup("Color Management");
@@ -563,7 +563,7 @@ void ICCProofTool::readSettings()
             TQString message = i18n("The ICC profiles path seems to be invalid. You won't be able to use the \"Default profile\"\
                                     options.<p>Please fix this in the digiKam ICC setup.");
             slotToggledWidgets( false );
-            KMessageBox::information(kapp->activeWindow(), message);
+            KMessageBox::information(tdeApp->activeWindow(), message);
         }
     }
 
@@ -615,7 +615,7 @@ void ICCProofTool::readSettings()
 
 void ICCProofTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colormanagement Tool");
     config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex());
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
@@ -652,7 +652,7 @@ void ICCProofTool::writeSettings()
 
 void ICCProofTool::processLCMSURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void ICCProofTool::slotSpotColorChanged(const DColor &color)
@@ -717,7 +717,7 @@ void ICCProofTool::slotResetSettings()
 
 void ICCProofTool::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     m_gboxSettings->enableButton(EditorToolSettings::Ok, true);
     m_histogramWidget->stopHistogramComputation();
 
@@ -754,7 +754,7 @@ void ICCProofTool::slotEffect()
         TQFileInfo info(tmpInPath);
         if (!info.exists() || !info.isReadable() || !info.isFile())
         {
-            KMessageBox::information(kapp->activeWindow(),
+            KMessageBox::information(tdeApp->activeWindow(),
                                      i18n("<p>The selected ICC input profile path seems to be invalid.<p>"
                                           "Please check it."));
             return;
@@ -773,7 +773,7 @@ void ICCProofTool::slotEffect()
         TQFileInfo info(tmpProofPath);
         if (!info.exists() || !info.isReadable() || !info.isFile())
         {
-            KMessageBox::information(kapp->activeWindow(),
+            KMessageBox::information(tdeApp->activeWindow(),
                                      i18n("<p>The selected ICC proof profile path seems to be invalid.<p>"
                                           "Please check it."));
             return;
@@ -795,7 +795,7 @@ void ICCProofTool::slotEffect()
         TQFileInfo info(tmpSpacePath);
         if (!info.exists() || !info.isReadable() || !info.isFile())
         {
-            KMessageBox::information(kapp->activeWindow(),
+            KMessageBox::information(tdeApp->activeWindow(),
                                      i18n("<p>Selected ICC workspace profile path seems to be invalid.<p>"
                                           "Please check it."));
             return;
@@ -833,14 +833,14 @@ void ICCProofTool::slotEffect()
 
     if ( proofCondition || spaceCondition )
     {
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
         TQString error = i18n("<p>Your settings are not sufficient.</p>"
                         "<p>To apply a color transform, you need at least two ICC profiles:</p>"
                         "<ul><li>An \"Input\" profile.</li>"
                         "<li>A \"Workspace\" profile.</li></ul>"
                         "<p>If you want to do a \"soft-proof\" transform, in addition to these profiles "
                         "you need a \"Proof\" profile.</p>");
-        KMessageBox::information(kapp->activeWindow(), error);
+        KMessageBox::information(tdeApp->activeWindow(), error);
         m_gboxSettings->enableButton(EditorToolSettings::Ok, false);
     }
     else
@@ -876,7 +876,7 @@ void ICCProofTool::slotEffect()
 
         memcpy(m_destinationPreviewData, preview2.bits(), preview2.numBytes());
         m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
     }
 }
 
@@ -884,7 +884,7 @@ void ICCProofTool::finalRendering()
 {
     if (!m_doSoftProofBox->isChecked())
     {
-        kapp->setOverrideCursor( KCursor::waitCursor() );
+        tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
         ImageIface *iface = m_previewWidget->imageIface();
         uchar *data                = iface->getOriginalImage();
@@ -916,7 +916,7 @@ void ICCProofTool::finalRendering()
                 TQFileInfo info(tmpInPath);
                 if (!info.exists() || !info.isReadable() || !info.isFile())
                 {
-                    KMessageBox::information(kapp->activeWindow(),
+                    KMessageBox::information(tdeApp->activeWindow(),
                                              i18n("<p>Selected ICC input profile path seems "
                                                   "to be invalid.<p>Please check it."));
                     return;
@@ -935,7 +935,7 @@ void ICCProofTool::finalRendering()
                 TQFileInfo info(tmpProofPath);
                 if (!info.exists() || !info.isReadable() || !info.isFile())
                 {
-                    KMessageBox::information(kapp->activeWindow(),
+                    KMessageBox::information(tdeApp->activeWindow(),
                                              i18n("<p>The selected ICC proof profile path seems "
                                                   "to be invalid.<p>Please check it."));
                     return;
@@ -957,7 +957,7 @@ void ICCProofTool::finalRendering()
                 TQFileInfo info(tmpSpacePath);
                 if (!info.exists() || !info.isReadable() || !info.isFile())
                 {
-                    KMessageBox::information(kapp->activeWindow(),
+                    KMessageBox::information(tdeApp->activeWindow(),
                                              i18n("<p>Selected ICC workspace profile path seems "
                                                   "to be invalid.<p>Please check it."));
                     return;
@@ -1027,7 +1027,7 @@ void ICCProofTool::finalRendering()
             delete [] data;
         }
 
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
     }
 }
 
@@ -1049,7 +1049,7 @@ void ICCProofTool::slotInICCInfo()
         TQString message = i18n("<p>You have selected the \"Default builtin sRGB profile\"</p>");
         message.append(i18n("<p>This profile is built on the fly, so there is no relevant information "
                             "about it.</p>"));
-        KMessageBox::information(kapp->activeWindow(), message);
+        KMessageBox::information(tdeApp->activeWindow(), message);
     }
     else if (useDefaultInProfile())
     {
@@ -1089,13 +1089,13 @@ void ICCProofTool::getICCInfo(const TQString& profile)
 {
     if (profile.isEmpty())
     {
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Sorry, there is no selected profile"),
                            i18n("Profile Error"));
         return;
     }
 
-    ICCProfileInfoDlg infoDlg(kapp->activeWindow(), profile);
+    ICCProfileInfoDlg infoDlg(tdeApp->activeWindow(), profile);
     infoDlg.exec();
 }
 
@@ -1103,13 +1103,13 @@ void ICCProofTool::getICCInfo(const TQByteArray& profile)
 {
     if (profile.isNull())
     {
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Sorry, it seems there is no embedded profile"),
                            i18n("Profile Error"));
         return;
     }
 
-    ICCProfileInfoDlg infoDlg(kapp->activeWindow(), TQString(), profile);
+    ICCProfileInfoDlg infoDlg(tdeApp->activeWindow(), TQString(), profile);
     infoDlg.exec();
 }
 
@@ -1119,7 +1119,7 @@ void ICCProofTool::slotCMDisabledWarning()
     {
         TQString message = i18n("<p>You have not enabled Color Management in the digiKam preferences.</p>");
         message.append(i18n("<p>\"Use of default profile\" options will be disabled now.</p>"));
-        KMessageBox::information(kapp->activeWindow(), message);
+        KMessageBox::information(tdeApp->activeWindow(), message);
         slotToggledWidgets(false);
     }
 }
@@ -1187,7 +1187,7 @@ bool ICCProofTool::useDefaultProofProfile()
 void ICCProofTool::slotLoadSettings()
 {
     KURL loadColorManagementFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                                           TQString("*"), kapp->activeWindow(),
+                                                           TQString("*"), tdeApp->activeWindow(),
                                                            TQString(i18n("Color Management Settings File to Load")));
     if (loadColorManagementFile.isEmpty())
         return;
@@ -1200,7 +1200,7 @@ void ICCProofTool::slotLoadSettings()
 
         if (stream.readLine() != "# Color Management Configuration File")
         {
-            KMessageBox::error(kapp->activeWindow(),
+            KMessageBox::error(tdeApp->activeWindow(),
                                i18n("\"%1\" is not a Color Management settings text file.")
                                .arg(loadColorManagementFile.fileName()));
             file.close();
@@ -1253,7 +1253,7 @@ void ICCProofTool::slotLoadSettings()
         slotEffect();
     }
     else
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Cannot load settings from the Color Management text file."));
 
     file.close();
@@ -1264,7 +1264,7 @@ void ICCProofTool::slotLoadSettings()
 void ICCProofTool::slotSaveAsSettings()
 {
     KURL saveColorManagementFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                                TQString( "*" ), kapp->activeWindow(),
+                                                TQString( "*" ), tdeApp->activeWindow(),
                                                 TQString(i18n("Color Management Settings File to Save")));
     if (saveColorManagementFile.isEmpty())
         return;
@@ -1301,7 +1301,7 @@ void ICCProofTool::slotSaveAsSettings()
         }
     }
     else
-        KMessageBox::error(kapp->activeWindow(),
+        KMessageBox::error(tdeApp->activeWindow(),
                            i18n("Cannot save settings to the Color Management text file."));
 
     file.close();
diff --git a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp
index 290b93cb..c76c20a9 100644
--- a/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_autocorrection.cpp
@@ -288,7 +288,7 @@ void ImageEffect_AutoCorrection::slotColorSelectedFromTarget( const Digikam::DCo
 
 void ImageEffect_AutoCorrection::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("autocorrection Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -299,7 +299,7 @@ void ImageEffect_AutoCorrection::readUserSettings()
 
 void ImageEffect_AutoCorrection::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("autocorrection Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -316,7 +316,7 @@ void ImageEffect_AutoCorrection::resetValues()
 
 void ImageEffect_AutoCorrection::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -338,7 +338,7 @@ void ImageEffect_AutoCorrection::slotEffect()
    
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 TQPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType type)
@@ -351,7 +351,7 @@ TQPixmap ImageEffect_AutoCorrection::getThumbnailForEffect(AutoCorrectionType ty
 
 void ImageEffect_AutoCorrection::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -391,7 +391,7 @@ void ImageEffect_AutoCorrection::finalRendering()
        delete [] data;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/imageeffect_bcg.cpp b/src/imageplugins/coreplugin/imageeffect_bcg.cpp
index 9d21115d..5d6d3a90 100644
--- a/src/imageplugins/coreplugin/imageeffect_bcg.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_bcg.cpp
@@ -256,7 +256,7 @@ void ImageEffect_BCG::slotColorSelectedFromTarget( const Digikam::DColor &color
 
 void ImageEffect_BCG::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("bcgadjust Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -269,7 +269,7 @@ void ImageEffect_BCG::readUserSettings()
 
 void ImageEffect_BCG::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("bcgadjust Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -294,7 +294,7 @@ void ImageEffect_BCG::resetValues()
 
 void ImageEffect_BCG::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double b = (double)m_bInput->value()/250.0;
     double c = (double)(m_cInput->value()/100.0) + 1.00;    
@@ -329,12 +329,12 @@ void ImageEffect_BCG::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_BCG::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
 
     double b = (double)m_bInput->value()/250.0;
@@ -342,7 +342,7 @@ void ImageEffect_BCG::finalRendering()
     double g = m_gInput->value();
 
     iface->setOriginalBCG(b, c, g);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/imageeffect_blur.cpp b/src/imageplugins/coreplugin/imageeffect_blur.cpp
index bd23854b..ea877ae2 100644
--- a/src/imageplugins/coreplugin/imageeffect_blur.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_blur.cpp
@@ -79,14 +79,14 @@ ImageEffect_Blur::~ImageEffect_Blur()
 
 void ImageEffect_Blur::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("gaussianblur Tool Dialog");
     m_radiusInput->setValue(config->readNumEntry("RadiusAjustment", 0));
 }
 
 void ImageEffect_Blur::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("gaussianblur Tool Dialog");
     config->writeEntry("RadiusAjustment", m_radiusInput->value());
     config->sync();
diff --git a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp
index 7dcdf0da..e2195a63 100644
--- a/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_bwsepia.cpp
@@ -634,7 +634,7 @@ void ImageEffect_BWSepia::slotColorSelectedFromTarget( const Digikam::DColor &co
 
 void ImageEffect_BWSepia::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("convertbw Tool Dialog");
 
     m_tab->setCurrentPage(config->readNumEntry("Settings Tab", BWFiltersTab));
@@ -676,7 +676,7 @@ void ImageEffect_BWSepia::readUserSettings()
 
 void ImageEffect_BWSepia::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("convertbw Tool Dialog");
     config->writeEntry("Settings Tab", m_tab->currentPageIndex());
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
@@ -736,7 +736,7 @@ void ImageEffect_BWSepia::resetValues()
 
 void ImageEffect_BWSepia::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     
     m_histogramWidget->stopHistogramComputation();
 
@@ -783,7 +783,7 @@ void ImageEffect_BWSepia::slotEffect()
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
     delete [] targetData;
     
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_BWSepia::slotTimer()
@@ -799,7 +799,7 @@ void ImageEffect_BWSepia::slotTimer()
 
 void ImageEffect_BWSepia::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -840,7 +840,7 @@ void ImageEffect_BWSepia::finalRendering()
         delete [] targetData;
     }
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp
index 79a09983..bee8560c 100644
--- a/src/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -528,7 +528,7 @@ ImageEffect_ICCProof::~ImageEffect_ICCProof()
 void ImageEffect_ICCProof::readUserSettings()
 {
     TQString defaultICCPath = TDEGlobalSettings::documentPath();
-    TDEConfig* config        = kapp->config();
+    TDEConfig* config        = tdeApp->config();
 
     // General settings of digiKam Color Management
     config->setGroup("Color Management");
@@ -604,7 +604,7 @@ void ImageEffect_ICCProof::readUserSettings()
 
 void ImageEffect_ICCProof::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colormanagement Tool Dialog");
     config->writeEntry("Settings Tab", m_toolBoxWidgets->currentIndex());
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
@@ -640,7 +640,7 @@ void ImageEffect_ICCProof::writeUserSettings()
 
 void ImageEffect_ICCProof::processLCMSURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void ImageEffect_ICCProof::slotSpotColorChanged(const Digikam::DColor &color)
@@ -701,7 +701,7 @@ void ImageEffect_ICCProof::resetValues()
 
 void ImageEffect_ICCProof::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     enableButtonOK(true);
     m_histogramWidget->stopHistogramComputation();
 
@@ -814,7 +814,7 @@ void ImageEffect_ICCProof::slotEffect()
 
     if ( proofCondition || spaceCondition )
     {
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
         TQString error = i18n("<p>Your settings are not sufficient.</p>"
                         "<p>To apply a color transform, you need at least two ICC profiles:</p>"
                         "<ul><li>An \"Input\" profile.</li>"
@@ -857,7 +857,7 @@ void ImageEffect_ICCProof::slotEffect()
 
         memcpy(m_destinationPreviewData, preview2.bits(), preview2.numBytes());
         m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
     }
 }
 
@@ -865,7 +865,7 @@ void ImageEffect_ICCProof::finalRendering()
 {
     if (!m_doSoftProofBox->isChecked())
     {
-        kapp->setOverrideCursor( KCursor::waitCursor() );
+        tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
         Digikam::ImageIface *iface = m_previewWidget->imageIface();
         uchar *data                = iface->getOriginalImage();
@@ -1005,7 +1005,7 @@ void ImageEffect_ICCProof::finalRendering()
             delete [] data;
         }
 
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
     }
 
     accept();
diff --git a/src/imageplugins/coreplugin/imageeffect_redeye.cpp b/src/imageplugins/coreplugin/imageeffect_redeye.cpp
index df3ae2e7..817a1893 100644
--- a/src/imageplugins/coreplugin/imageeffect_redeye.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_redeye.cpp
@@ -282,7 +282,7 @@ void ImageEffect_RedEye::slotColorSelectedFromTarget(const Digikam::DColor& colo
 
 void ImageEffect_RedEye::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("redeye Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -300,7 +300,7 @@ void ImageEffect_RedEye::readUserSettings()
 
 void ImageEffect_RedEye::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("redeye Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -338,7 +338,7 @@ void ImageEffect_RedEye::resetValues()
 
 void ImageEffect_RedEye::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -368,12 +368,12 @@ void ImageEffect_RedEye::slotEffect()
     memcpy(m_destinationPreviewData, selection.bits(), selection.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_RedEye::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getImageSelection();
@@ -388,7 +388,7 @@ void ImageEffect_RedEye::finalRendering()
 
     iface->putImageSelection(i18n("Red Eyes Correction"), selection.bits());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/imageeffect_rgb.cpp b/src/imageplugins/coreplugin/imageeffect_rgb.cpp
index fcff9c41..135ef8b6 100644
--- a/src/imageplugins/coreplugin/imageeffect_rgb.cpp
+++ b/src/imageplugins/coreplugin/imageeffect_rgb.cpp
@@ -294,7 +294,7 @@ void ImageEffect_RGB::slotColorSelectedFromTarget( const Digikam::DColor &color
 
 void ImageEffect_RGB::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colorbalance Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -308,7 +308,7 @@ void ImageEffect_RGB::readUserSettings()
 
 void ImageEffect_RGB::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colorbalance Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -351,7 +351,7 @@ void ImageEffect_RGB::adjustSliders(int r, int g, int b)
 
 void ImageEffect_RGB::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     enableButtonOK(m_rInput->value() != 0 ||
                    m_gInput->value() != 0 ||
@@ -386,12 +386,12 @@ void ImageEffect_RGB::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sixteenBit, 0, 0, 0, false);
     
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImageEffect_RGB::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double r = ((double)m_rInput->value() + 100.0)/100.0;
     double g = ((double)m_gInput->value() + 100.0)/100.0;
@@ -411,7 +411,7 @@ void ImageEffect_RGB::finalRendering()
     cmod.applyColorModifier(original, r, g, b, a);
 
     iface->putOriginalImage(i18n("Color Balance"), original.bits());
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();
 }
 
diff --git a/src/imageplugins/coreplugin/imageplugin_core.cpp b/src/imageplugins/coreplugin/imageplugin_core.cpp
index 22c63b34..ea1e060e 100644
--- a/src/imageplugins/coreplugin/imageplugin_core.cpp
+++ b/src/imageplugins/coreplugin/imageplugin_core.cpp
@@ -199,7 +199,7 @@ void ImagePlugin_Core::slotAutoCorrection()
 
 void ImagePlugin_Core::slotInvert()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     ImageIface iface(0, 0);
 
@@ -213,7 +213,7 @@ void ImagePlugin_Core::slotInvert()
     iface.putOriginalImage(i18n("Invert"), data);
     delete [] data;
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImagePlugin_Core::slotBW()
@@ -228,7 +228,7 @@ void ImagePlugin_Core::slotRedEye()
 
     if (!iface.selectedWidth() || !iface.selectedHeight())
     {
-        RedEyePassivePopup* popup = new RedEyePassivePopup(kapp->activeWindow());
+        RedEyePassivePopup* popup = new RedEyePassivePopup(tdeApp->activeWindow());
         popup->setView(i18n("Red-Eye Correction Tool"),
                        i18n("You need to select a region including the eyes to use "
                             "the red-eye correction tool"));
@@ -260,13 +260,13 @@ void ImagePlugin_Core::slotConvertTo8Bits()
 
     if (!iface.originalSixteenBit())
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("This image is already using a depth of 8 bits / color / pixel."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("This image is already using a depth of 8 bits / color / pixel."));
        return;
     }
     else
     {
        if (KMessageBox::warningContinueCancel(
-                        kapp->activeWindow(),
+                        tdeApp->activeWindow(),
                         i18n("Performing this operation will reduce image color quality. "
                              "Do you want to continue?"), TQString(),
                         KStdGuiItem::cont(), 
@@ -274,9 +274,9 @@ void ImagePlugin_Core::slotConvertTo8Bits()
            return;
     }
 
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     iface.convertOriginalColorDepth(32);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void ImagePlugin_Core::slotConvertTo16Bits()
@@ -285,11 +285,11 @@ void ImagePlugin_Core::slotConvertTo16Bits()
 
     if (iface.originalSixteenBit())
     {
-       KMessageBox::error(kapp->activeWindow(), i18n("This image is already using a depth of 16 bits / color / pixel."));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("This image is already using a depth of 16 bits / color / pixel."));
        return;
     }
 
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     iface.convertOriginalColorDepth(64);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
diff --git a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
index 64bc7a8e..92afaf1c 100644
--- a/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
+++ b/src/imageplugins/coreplugin/ratiocrop/imageeffect_ratiocrop.cpp
@@ -349,7 +349,7 @@ ImageEffect_RatioCrop::~ImageEffect_RatioCrop()
 void ImageEffect_RatioCrop::readSettings()
 {
     TQColor defaultGuideColor(250, 250, 255);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("aspectratiocrop Tool Dialog");
 
     // No guide lines per default.
@@ -424,7 +424,7 @@ void ImageEffect_RatioCrop::readSettings()
 
 void ImageEffect_RatioCrop::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("aspectratiocrop Tool Dialog");
 
     if (m_originalIsLandscape)
@@ -771,7 +771,7 @@ void ImageEffect_RatioCrop::slotCustomRatioChanged()
 
 void ImageEffect_RatioCrop::slotOk()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     TQRect currentRegion        = m_imageSelectionWidget->getRegionSelection();
     Digikam::ImageIface* iface = m_imageSelectionWidget->imageIface();
@@ -791,7 +791,7 @@ void ImageEffect_RatioCrop::slotOk()
 
     iface->putOriginalImage(i18n("Aspect Ratio Crop"), imOrg.bits(), imOrg.width(), imOrg.height());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     writeSettings();
     accept();
 }
diff --git a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
index ed0e670e..f48050ff 100644
--- a/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
+++ b/src/imageplugins/coreplugin/ratiocrop/ratiocroptool.cpp
@@ -398,7 +398,7 @@ RatioCropTool::~RatioCropTool()
 void RatioCropTool::readSettings()
 {
     TQColor defaultGuideColor(250, 250, 255);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("aspectratiocrop Tool");
 
     // No guide lines per default.
@@ -462,7 +462,7 @@ void RatioCropTool::readSettings()
 
 void RatioCropTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("aspectratiocrop Tool");
 
     if (m_originalIsLandscape)
@@ -823,7 +823,7 @@ void RatioCropTool::slotCustomRatioChanged()
 
 void RatioCropTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     TQRect currentRegion = m_imageSelectionWidget->getRegionSelection();
     ImageIface* iface   = m_imageSelectionWidget->imageIface();
@@ -846,7 +846,7 @@ void RatioCropTool::finalRendering()
 
     iface->putOriginalImage(i18n("Aspect Ratio Crop"), imOrg.bits(), imOrg.width(), imOrg.height());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     writeSettings();
 }
 
diff --git a/src/imageplugins/coreplugin/redeyetool.cpp b/src/imageplugins/coreplugin/redeyetool.cpp
index 5b5af7e7..72d9bca3 100644
--- a/src/imageplugins/coreplugin/redeyetool.cpp
+++ b/src/imageplugins/coreplugin/redeyetool.cpp
@@ -294,7 +294,7 @@ void RedEyeTool::slotColorSelectedFromTarget(const DColor& color)
 
 void RedEyeTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("redeye Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0)); // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -313,7 +313,7 @@ void RedEyeTool::readSettings()
 
 void RedEyeTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("redeye Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -352,7 +352,7 @@ void RedEyeTool::slotResetSettings()
 
 void RedEyeTool::slotEffect()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     m_histogramWidget->stopHistogramComputation();
 
@@ -382,12 +382,12 @@ void RedEyeTool::slotEffect()
     memcpy(m_destinationPreviewData, selection.bits(), selection.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sb, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void RedEyeTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getImageSelection();
@@ -402,7 +402,7 @@ void RedEyeTool::finalRendering()
 
     iface->putImageSelection(i18n("Red Eyes Correction"), selection.bits());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void RedEyeTool::redEyeFilter(DImg& selection)
diff --git a/src/imageplugins/coreplugin/rgbtool.cpp b/src/imageplugins/coreplugin/rgbtool.cpp
index e27e396e..d4f7dfe4 100644
--- a/src/imageplugins/coreplugin/rgbtool.cpp
+++ b/src/imageplugins/coreplugin/rgbtool.cpp
@@ -309,7 +309,7 @@ void RGBTool::slotColorSelectedFromTarget(const DColor &color)
 
 void RGBTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colorbalance Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -324,7 +324,7 @@ void RGBTool::readSettings()
 
 void RGBTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("colorbalance Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -372,7 +372,7 @@ void RGBTool::adjustSliders(int r, int g, int b)
 
 void RGBTool::slotEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     m_gboxSettings->enableButton(EditorToolSettings::Ok,
                                  (m_rInput->value() != 0 ||
@@ -408,12 +408,12 @@ void RGBTool::slotEffect()
     memcpy(m_destinationPreviewData, preview.bits(), preview.numBytes());
     m_histogramWidget->updateData(m_destinationPreviewData, w, h, sixteenBit, 0, 0, 0, false);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void RGBTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     double r = ((double) m_rInput->value() + 100.0) / 100.0;
     double g = ((double) m_gInput->value() + 100.0) / 100.0;
@@ -433,7 +433,7 @@ void RGBTool::finalRendering()
     cmod.applyColorModifier(original, r, g, b, a);
 
     iface->putOriginalImage(i18n("Color Balance"), original.bits());
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamImagesPluginCore
diff --git a/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
index b2ae9a62..45a9d8ad 100644
--- a/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/imageeffect_sharpen.cpp
@@ -332,7 +332,7 @@ void ImageEffect_Sharpen::slotSharpMethodActived(int w)
 
 void ImageEffect_Sharpen::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("sharpen Tool Dialog");
     m_radiusInput->blockSignals(true);
     m_radiusInput2->blockSignals(true);
@@ -369,7 +369,7 @@ void ImageEffect_Sharpen::readUserSettings()
 
 void ImageEffect_Sharpen::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("sharpen Tool Dialog");
     config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value());
     config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value());
diff --git a/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
index aee5d841..de0a3d3c 100644
--- a/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
+++ b/src/imageplugins/coreplugin/sharpnesseditor/sharpentool.cpp
@@ -375,7 +375,7 @@ void SharpenTool::slotSharpMethodActived(int w)
 
 void SharpenTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("sharpen Tool");
     m_radiusInput->blockSignals(true);
     m_radiusInput2->blockSignals(true);
@@ -415,7 +415,7 @@ void SharpenTool::readSettings()
 
 void SharpenTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("sharpen Tool");
     config->writeEntry("SimpleSharpRadiusAjustment", m_radiusInput->value());
     config->writeEntry("UnsharpMaskRadiusAjustment", m_radiusInput2->value());
@@ -679,7 +679,7 @@ void SharpenTool::putFinalData()
 void SharpenTool::slotLoadSettings()
 {
     KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                               TQString( "*" ), kapp->activeWindow(),
+                               TQString( "*" ), tdeApp->activeWindow(),
                                TQString( i18n("Photograph Refocus Settings File to Load")) );
     if ( loadRestorationFile.isEmpty() )
         return;
@@ -691,7 +691,7 @@ void SharpenTool::slotLoadSettings()
         TQTextStream stream( &file );
         if ( stream.readLine() != "# Photograph Refocus Configuration File" )
         {
-            KMessageBox::error(kapp->activeWindow(),
+            KMessageBox::error(tdeApp->activeWindow(),
                                i18n("\"%1\" is not a Photograph Refocus settings text file.")
                                .arg(loadRestorationFile.fileName()));
             file.close();
@@ -707,7 +707,7 @@ void SharpenTool::slotLoadSettings()
         blockSignals(false);
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Refocus text file."));
 
     file.close();
 }
@@ -715,7 +715,7 @@ void SharpenTool::slotLoadSettings()
 void SharpenTool::slotSaveAsSettings()
 {
     KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                               TQString( "*" ), kapp->activeWindow(),
+                               TQString( "*" ), tdeApp->activeWindow(),
                                TQString( i18n("Photograph Refocus Settings File to Save")) );
     if ( saveRestorationFile.isEmpty() )
         return;
@@ -733,7 +733,7 @@ void SharpenTool::slotSaveAsSettings()
         stream << m_noise->value() << "\n";
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Refocus text file."));
 
     file.close();
 }
diff --git a/src/imageplugins/distortionfx/distortionfxtool.cpp b/src/imageplugins/distortionfx/distortionfxtool.cpp
index 45ff0e45..22b3980a 100644
--- a/src/imageplugins/distortionfx/distortionfxtool.cpp
+++ b/src/imageplugins/distortionfx/distortionfxtool.cpp
@@ -228,7 +228,7 @@ void DistortionFXTool::renderingFinished()
 
 void DistortionFXTool::readSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("distortionfx Tool");
 
     m_effectType->blockSignals(true);
@@ -251,7 +251,7 @@ void DistortionFXTool::readSettings(void)
 
 void DistortionFXTool::writeSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("distortionfx Tool");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("IterationAjustment", m_iterationInput->value());
diff --git a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index 695e7749..03f3ccf4 100644
--- a/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/src/imageplugins/distortionfx/imageeffect_distortionfx.cpp
@@ -219,7 +219,7 @@ void ImageEffect_DistortionFX::renderingFinished()
 
 void ImageEffect_DistortionFX::readUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("distortionfx Tool Dialog");
 
     m_effectType->blockSignals(true);
@@ -239,7 +239,7 @@ void ImageEffect_DistortionFX::readUserSettings(void)
 
 void ImageEffect_DistortionFX::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("distortionfx Tool Dialog");
     config->writeEntry("EffectType", m_effectType->currentItem());
     config->writeEntry("IterationAjustment", m_iterationInput->value());
diff --git a/src/imageplugins/emboss/embosstool.cpp b/src/imageplugins/emboss/embosstool.cpp
index f16ef4de..03a22f96 100644
--- a/src/imageplugins/emboss/embosstool.cpp
+++ b/src/imageplugins/emboss/embosstool.cpp
@@ -111,7 +111,7 @@ void EmbossTool::renderingFinished()
 
 void EmbossTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("emboss Tool");
     m_depthInput->blockSignals(true);
     m_depthInput->setValue(config->readNumEntry("DepthAjustment", m_depthInput->defaultValue()));
@@ -120,7 +120,7 @@ void EmbossTool::readSettings()
 
 void EmbossTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("emboss Tool");
     config->writeEntry("DepthAjustment", m_depthInput->value());
     m_previewWidget->writeSettings();
diff --git a/src/imageplugins/emboss/imageeffect_emboss.cpp b/src/imageplugins/emboss/imageeffect_emboss.cpp
index b4557c80..fe4b1eed 100644
--- a/src/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/src/imageplugins/emboss/imageeffect_emboss.cpp
@@ -110,7 +110,7 @@ void ImageEffect_Emboss::renderingFinished()
 
 void ImageEffect_Emboss::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("emboss Tool Dialog");
     m_depthInput->blockSignals(true);
     m_depthInput->setValue(config->readNumEntry("DepthAjustment", 30));
@@ -119,7 +119,7 @@ void ImageEffect_Emboss::readUserSettings()
 
 void ImageEffect_Emboss::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("emboss Tool Dialog");
     config->writeEntry("DepthAjustment", m_depthInput->value());
     config->sync();
diff --git a/src/imageplugins/filmgrain/filmgraintool.cpp b/src/imageplugins/filmgrain/filmgraintool.cpp
index 5799d814..8fe07a24 100644
--- a/src/imageplugins/filmgrain/filmgraintool.cpp
+++ b/src/imageplugins/filmgrain/filmgraintool.cpp
@@ -131,7 +131,7 @@ void FilmGrainTool::renderingFinished()
 
 void FilmGrainTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("filmgrain Tool");
     m_sensibilitySlider->blockSignals(true);
     m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12));
@@ -141,7 +141,7 @@ void FilmGrainTool::readSettings()
 
 void FilmGrainTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("filmgrain Tool");
     config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value());
     m_previewWidget->writeSettings();
diff --git a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index e008095a..90f32959 100644
--- a/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/src/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@@ -131,7 +131,7 @@ void ImageEffect_FilmGrain::renderingFinished()
  
 void ImageEffect_FilmGrain::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("filmgrain Tool Dialog");
     m_sensibilitySlider->blockSignals(true);
     m_sensibilitySlider->setValue(config->readNumEntry("SensitivityAjustment", 12));
@@ -141,7 +141,7 @@ void ImageEffect_FilmGrain::readUserSettings()
 
 void ImageEffect_FilmGrain::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("filmgrain Tool Dialog");
     config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value());
     config->sync();
diff --git a/src/imageplugins/freerotation/freerotationtool.cpp b/src/imageplugins/freerotation/freerotationtool.cpp
index b25f2196..37bc168b 100644
--- a/src/imageplugins/freerotation/freerotationtool.cpp
+++ b/src/imageplugins/freerotation/freerotationtool.cpp
@@ -181,7 +181,7 @@ void FreeRotationTool::slotColorGuideChanged()
 
 void FreeRotationTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("freerotation Tool");
     m_angleInput->setValue(config->readNumEntry("Main Angle", m_angleInput->defaultValue()));
     m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", m_fineAngleInput->defaultValue()));
@@ -196,7 +196,7 @@ void FreeRotationTool::readSettings()
 
 void FreeRotationTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("freerotation Tool");
     config->writeEntry("Main Angle", m_angleInput->value());
     config->writeEntry("Fine Angle", m_fineAngleInput->value());
@@ -226,7 +226,7 @@ void FreeRotationTool::slotResetSettings()
 
 void FreeRotationTool::prepareEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_angleInput->setEnabled(false);
     m_fineAngleInput->setEnabled(false);
     m_antialiasInput->setEnabled(false);
@@ -312,7 +312,7 @@ void FreeRotationTool::renderingFinished()
     m_fineAngleInput->setEnabled(true);
     m_antialiasInput->setEnabled(true);
     m_autoCropCB->setEnabled(true);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamFreeRotationImagesPlugin
diff --git a/src/imageplugins/freerotation/imageeffect_freerotation.cpp b/src/imageplugins/freerotation/imageeffect_freerotation.cpp
index bce50f07..e5f76cfa 100644
--- a/src/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/src/imageplugins/freerotation/imageeffect_freerotation.cpp
@@ -175,7 +175,7 @@ ImageEffect_FreeRotation::~ImageEffect_FreeRotation()
 
 void ImageEffect_FreeRotation::readUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("freerotation Tool Dialog");
     m_angleInput->setValue(config->readNumEntry("Main Angle", 0));
     m_fineAngleInput->setValue(config->readDoubleNumEntry("Fine Angle", 0.0));
@@ -186,7 +186,7 @@ void ImageEffect_FreeRotation::readUserSettings(void)
 
 void ImageEffect_FreeRotation::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("freerotation Tool Dialog");
     config->writeEntry("Main Angle", m_angleInput->value());
     config->writeEntry("Fine Angle", m_fineAngleInput->value());
@@ -211,7 +211,7 @@ void ImageEffect_FreeRotation::resetValues()
 
 void ImageEffect_FreeRotation::prepareEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_angleInput->setEnabled(false);
     m_fineAngleInput->setEnabled(false);
     m_antialiasInput->setEnabled(false);
@@ -301,7 +301,7 @@ void ImageEffect_FreeRotation::renderingFinished()
     m_fineAngleInput->setEnabled(true);
     m_antialiasInput->setEnabled(true);
     m_autoCropCB->setEnabled(true);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamFreeRotationImagesPlugin
diff --git a/src/imageplugins/hotpixels/blackframeparser.cpp b/src/imageplugins/hotpixels/blackframeparser.cpp
index 7306f4e6..96a26138 100644
--- a/src/imageplugins/hotpixels/blackframeparser.cpp
+++ b/src/imageplugins/hotpixels/blackframeparser.cpp
@@ -75,7 +75,7 @@ void BlackFrameParser::parseHotPixels(const TQString &file)
 void BlackFrameParser::parseBlackFrame(const KURL &url)
 {
 #if KDE_IS_VERSION(3,2,0)
-    TDEIO::NetAccess::download(url, m_localFile, kapp->activeWindow());
+    TDEIO::NetAccess::download(url, m_localFile, tdeApp->activeWindow());
 #else
     TDEIO::NetAccess::download(url, m_localFile);
 #endif
diff --git a/src/imageplugins/hotpixels/hotpixelstool.cpp b/src/imageplugins/hotpixels/hotpixelstool.cpp
index fbcc6c9f..dd4dd8b9 100644
--- a/src/imageplugins/hotpixels/hotpixelstool.cpp
+++ b/src/imageplugins/hotpixels/hotpixelstool.cpp
@@ -135,7 +135,7 @@ HotPixelsTool::~HotPixelsTool()
 
 void HotPixelsTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("hotpixels Tool");
     m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString()));
     m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method",
@@ -166,7 +166,7 @@ void HotPixelsTool::slotLoadingComplete()
 
 void HotPixelsTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("hotpixels Tool");
     config->writeEntry("Last Black Frame File", m_blackFrameURL.url());
     config->writeEntry("Filter Method", m_filterMethodCombo->currentItem());
@@ -183,7 +183,7 @@ void HotPixelsTool::slotResetSettings()
 
 void HotPixelsTool::slotAddBlackFrame()
 {
-    KURL url = ImageDialog::getImageURL(kapp->activeWindow(), m_blackFrameURL, i18n("Select Black Frame Image"));
+    KURL url = ImageDialog::getImageURL(tdeApp->activeWindow(), m_blackFrameURL, i18n("Select Black Frame Image"));
 
     if (!url.isEmpty())
     {
diff --git a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index 67e9a1b2..4e73d981 100644
--- a/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/src/imageplugins/hotpixels/imageeffect_hotpixels.cpp
@@ -133,7 +133,7 @@ ImageEffect_HotPixels::~ImageEffect_HotPixels()
 
 void ImageEffect_HotPixels::readUserSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("hotpixels Tool Dialog");
     m_blackFrameURL = KURL(config->readEntry("Last Black Frame File", TQString()));
     m_filterMethodCombo->setCurrentItem(config->readNumEntry("Filter Method",
@@ -153,7 +153,7 @@ void ImageEffect_HotPixels::readUserSettings()
 
 void ImageEffect_HotPixels::writeUserSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("hotpixels Tool Dialog");
     config->writeEntry("Last Black Frame File", m_blackFrameURL.url());
     config->writeEntry("Filter Method", m_filterMethodCombo->currentItem());
diff --git a/src/imageplugins/infrared/imageeffect_infrared.cpp b/src/imageplugins/infrared/imageeffect_infrared.cpp
index f8069255..ae0adc9f 100644
--- a/src/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/src/imageplugins/infrared/imageeffect_infrared.cpp
@@ -150,7 +150,7 @@ void ImageEffect_Infrared::renderingFinished()
 
 void ImageEffect_Infrared::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("infrared Tool Dialog");
     m_sensibilitySlider->blockSignals(true);
     m_addFilmGrain->blockSignals(true);
@@ -163,7 +163,7 @@ void ImageEffect_Infrared::readUserSettings()
 
 void ImageEffect_Infrared::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("infrared Tool Dialog");
     config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value());
     config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked());
diff --git a/src/imageplugins/infrared/infraredtool.cpp b/src/imageplugins/infrared/infraredtool.cpp
index f34d1c8a..83e35d3b 100644
--- a/src/imageplugins/infrared/infraredtool.cpp
+++ b/src/imageplugins/infrared/infraredtool.cpp
@@ -150,7 +150,7 @@ void InfraredTool::renderingFinished()
 
 void InfraredTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("infrared Tool");
     m_sensibilitySlider->blockSignals(true);
     m_addFilmGrain->blockSignals(true);
@@ -163,7 +163,7 @@ void InfraredTool::readSettings()
 
 void InfraredTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("infrared Tool");
     config->writeEntry("SensitivityAjustment", m_sensibilitySlider->value());
     config->writeEntry("AddFilmGrain", m_addFilmGrain->isChecked());
diff --git a/src/imageplugins/inpainting/imageeffect_inpainting.cpp b/src/imageplugins/inpainting/imageeffect_inpainting.cpp
index d7f2f5fe..1ef057b1 100644
--- a/src/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/src/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -218,7 +218,7 @@ void ImageEffect_InPainting_Dialog::renderingFinished()
 
 void ImageEffect_InPainting_Dialog::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("inpainting Tool Dialog");
 
     Digikam::GreycstorationSettings settings;
@@ -249,7 +249,7 @@ void ImageEffect_InPainting_Dialog::readUserSettings()
 void ImageEffect_InPainting_Dialog::writeUserSettings()
 {
     Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings();
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("inpainting Tool Dialog");
     config->writeEntry("Preset", m_inpaintingTypeCB->currentItem());
     config->writeEntry("FastApprox", settings.fastApprox);
@@ -309,7 +309,7 @@ void ImageEffect_InPainting_Dialog::resetValues()
 
 void ImageEffect_InPainting_Dialog::processCImgURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void ImageEffect_InPainting_Dialog::prepareEffect()
@@ -380,7 +380,7 @@ void ImageEffect_InPainting_Dialog::prepareFinal()
     else
     {
         putFinalData();
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
         accept();
     }
 }
diff --git a/src/imageplugins/inpainting/imageplugin_inpainting.cpp b/src/imageplugins/inpainting/imageplugin_inpainting.cpp
index 2c1e30f3..6c4b4f0a 100644
--- a/src/imageplugins/inpainting/imageplugin_inpainting.cpp
+++ b/src/imageplugins/inpainting/imageplugin_inpainting.cpp
@@ -80,7 +80,7 @@ void ImagePlugin_InPainting::slotInPainting()
 
     if (!w || !h)
     {
-        InPaintingPassivePopup* popup = new InPaintingPassivePopup(kapp->activeWindow());
+        InPaintingPassivePopup* popup = new InPaintingPassivePopup(tdeApp->activeWindow());
         popup->setView(i18n("Inpainting Photograph Tool"),
                        i18n("You need to select a region to inpaint to use "
                             "this tool"));
diff --git a/src/imageplugins/inpainting/inpaintingtool.cpp b/src/imageplugins/inpainting/inpaintingtool.cpp
index 2ada52bf..906c1f65 100644
--- a/src/imageplugins/inpainting/inpaintingtool.cpp
+++ b/src/imageplugins/inpainting/inpaintingtool.cpp
@@ -179,7 +179,7 @@ void InPaintingTool::renderingFinished()
 
 void InPaintingTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("inpainting Tool");
 
     GreycstorationSettings settings;
@@ -212,7 +212,7 @@ void InPaintingTool::readSettings()
 void InPaintingTool::writeSettings()
 {
     GreycstorationSettings settings = m_settingsWidget->getSettings();
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("inpainting Tool");
     config->writeEntry("Preset", m_inpaintingTypeCB->currentItem());
     config->writeEntry("FastApprox", settings.fastApprox);
@@ -273,7 +273,7 @@ void InPaintingTool::slotResetSettings()
 
 void InPaintingTool::processCImgURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void InPaintingTool::prepareEffect()
@@ -381,7 +381,7 @@ void InPaintingTool::putFinalData()
 void InPaintingTool::slotLoadSettings()
 {
     KURL loadInpaintingFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Photograph Inpainting Settings File to Load")) );
     if( loadInpaintingFile.isEmpty() )
        return;
@@ -392,7 +392,7 @@ void InPaintingTool::slotLoadSettings()
     {
         if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Inpainting Configuration File V2")))
         {
-           KMessageBox::error(kapp->activeWindow(),
+           KMessageBox::error(tdeApp->activeWindow(),
                         i18n("\"%1\" is not a Photograph Inpainting settings text file.")
                         .arg(loadInpaintingFile.fileName()));
            file.close();
@@ -400,7 +400,7 @@ void InPaintingTool::slotLoadSettings()
         }
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Inpainting text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Inpainting text file."));
 
     file.close();
     m_inpaintingTypeCB->blockSignals(true);
@@ -412,7 +412,7 @@ void InPaintingTool::slotLoadSettings()
 void InPaintingTool::slotSaveAsSettings()
 {
     KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Photograph Inpainting Settings File to Save")) );
     if( saveRestorationFile.isEmpty() )
        return;
@@ -422,7 +422,7 @@ void InPaintingTool::slotSaveAsSettings()
     if ( file.open(IO_WriteOnly) )
         m_settingsWidget->saveSettings(file, TQString("# Photograph Inpainting Configuration File V2"));
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Inpainting text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Inpainting text file."));
 
     file.close();
 }
diff --git a/src/imageplugins/inserttext/imageeffect_inserttext.cpp b/src/imageplugins/inserttext/imageeffect_inserttext.cpp
index 3f88644b..6e353e68 100644
--- a/src/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/src/imageplugins/inserttext/imageeffect_inserttext.cpp
@@ -225,7 +225,7 @@ ImageEffect_InsertText::~ImageEffect_InsertText()
 
 void ImageEffect_InsertText::readUserSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("inserttext Tool Dialog");
     TQColor black(0, 0, 0);
     TQFont  defaultFont;
@@ -253,7 +253,7 @@ void ImageEffect_InsertText::readUserSettings()
 
 void ImageEffect_InsertText::writeUserSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("inserttext Tool Dialog");
 
     config->writeEntry( "Text Rotation", m_textRotation->currentItem() );
@@ -335,13 +335,13 @@ void ImageEffect_InsertText::slotUpdatePreview()
 void ImageEffect_InsertText::finalRendering()
 {
     accept();
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     Digikam::ImageIface iface(0, 0);
     Digikam::DImg dest = m_previewWidget->makeInsertText();
     iface.putOriginalImage(i18n("Insert Text"), dest.bits(), dest.width(), dest.height());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamInsertTextImagesPlugin
diff --git a/src/imageplugins/inserttext/inserttexttool.cpp b/src/imageplugins/inserttext/inserttexttool.cpp
index 3c854896..231697d1 100644
--- a/src/imageplugins/inserttext/inserttexttool.cpp
+++ b/src/imageplugins/inserttext/inserttexttool.cpp
@@ -215,7 +215,7 @@ InsertTextTool::~InsertTextTool()
 
 void InsertTextTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("inserttext Tool");
     TQColor black(0, 0, 0);
     TQFont  defaultFont;
@@ -243,7 +243,7 @@ void InsertTextTool::readSettings()
 
 void InsertTextTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("inserttext Tool");
 
     config->writeEntry("Text Rotation", m_textRotation->currentItem());
@@ -324,13 +324,13 @@ void InsertTextTool::slotUpdatePreview()
 
 void InsertTextTool::finalRendering()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
 
     ImageIface iface(0, 0);
     DImg dest = m_previewWidget->makeInsertText();
     iface.putOriginalImage(i18n("Insert Text"), dest.bits(), dest.width(), dest.height());
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamInsertTextImagesPlugin
diff --git a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index 89420a9c..15d4ca64 100644
--- a/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/src/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
@@ -197,7 +197,7 @@ ImageEffect_LensDistortion::~ImageEffect_LensDistortion()
 
 void ImageEffect_LensDistortion::readUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("lensdistortion Tool Dialog");
 
     m_mainInput->blockSignals(true);
@@ -220,7 +220,7 @@ void ImageEffect_LensDistortion::readUserSettings(void)
 
 void ImageEffect_LensDistortion::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("lensdistortion Tool Dialog");
     config->writeEntry("2nd Order Distortion", m_mainInput->value());
     config->writeEntry("4th Order Distortion", m_edgeInput->value());
diff --git a/src/imageplugins/lensdistortion/lensdistortiontool.cpp b/src/imageplugins/lensdistortion/lensdistortiontool.cpp
index 8d33e1df..9561ae61 100644
--- a/src/imageplugins/lensdistortion/lensdistortiontool.cpp
+++ b/src/imageplugins/lensdistortion/lensdistortiontool.cpp
@@ -205,7 +205,7 @@ void LensDistortionTool::slotColorGuideChanged()
 
 void LensDistortionTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("lensdistortion Tool");
 
     m_mainInput->blockSignals(true);
@@ -231,7 +231,7 @@ void LensDistortionTool::readSettings()
 
 void LensDistortionTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("lensdistortion Tool");
     config->writeEntry("2nd Order Distortion", m_mainInput->value());
     config->writeEntry("4th Order Distortion", m_edgeInput->value());
diff --git a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 707b05db..128c6679 100644
--- a/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/src/imageplugins/noisereduction/imageeffect_noisereduction.cpp
@@ -316,7 +316,7 @@ void ImageEffect_NoiseReduction::renderingFinished()
 
 void ImageEffect_NoiseReduction::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("noisereduction Tool Dialog");
     m_radiusInput->setEnabled(true);
     m_lumToleranceInput->setEnabled(true);
@@ -354,7 +354,7 @@ void ImageEffect_NoiseReduction::readUserSettings()
 
 void ImageEffect_NoiseReduction::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("noisereduction Tool Dialog");
     config->writeEntry("RadiusAjustment", m_radiusInput->value());
     config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value());
diff --git a/src/imageplugins/noisereduction/noisereductiontool.cpp b/src/imageplugins/noisereduction/noisereductiontool.cpp
index d1e4908a..b990e515 100644
--- a/src/imageplugins/noisereduction/noisereductiontool.cpp
+++ b/src/imageplugins/noisereduction/noisereductiontool.cpp
@@ -301,7 +301,7 @@ void NoiseReductionTool::renderingFinished()
 
 void NoiseReductionTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("noisereduction Tool");
 
     m_radiusInput->setEnabled(false);
@@ -340,7 +340,7 @@ void NoiseReductionTool::readSettings()
 
 void NoiseReductionTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("noisereduction Tool");
     config->writeEntry("RadiusAjustment", m_radiusInput->value());
     config->writeEntry("LumToleranceAjustment", m_lumToleranceInput->value());
@@ -463,7 +463,7 @@ void NoiseReductionTool::putFinalData()
 void NoiseReductionTool::slotLoadSettings()
 {
     KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                               TQString( "*" ), kapp->activeWindow(),
+                               TQString( "*" ), tdeApp->activeWindow(),
                                TQString( i18n("Photograph Noise Reduction Settings File to Load")) );
     if ( loadRestorationFile.isEmpty() )
         return;
@@ -475,7 +475,7 @@ void NoiseReductionTool::slotLoadSettings()
         TQTextStream stream( &file );
         if ( stream.readLine() != "# Photograph Noise Reduction Configuration File" )
         {
-            KMessageBox::error(kapp->activeWindow(),
+            KMessageBox::error(tdeApp->activeWindow(),
                                i18n("\"%1\" is not a Photograph Noise Reduction settings text file.")
                                .arg(loadRestorationFile.fileName()));
             file.close();
@@ -496,7 +496,7 @@ void NoiseReductionTool::slotLoadSettings()
         blockSignals(false);
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Noise Reduction text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Noise Reduction text file."));
 
     file.close();
 }
@@ -504,7 +504,7 @@ void NoiseReductionTool::slotLoadSettings()
 void NoiseReductionTool::slotSaveAsSettings()
 {
     KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                               TQString( "*" ), kapp->activeWindow(),
+                               TQString( "*" ), tdeApp->activeWindow(),
                                TQString( i18n("Photograph Noise Reduction Settings File to Save")) );
     if ( saveRestorationFile.isEmpty() )
         return;
@@ -528,7 +528,7 @@ void NoiseReductionTool::slotSaveAsSettings()
 
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Noise Reduction text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Noise Reduction text file."));
 
     file.close();
 }
diff --git a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index da07be05..46d3bf0c 100644
--- a/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/src/imageplugins/oilpaint/imageeffect_oilpaint.cpp
@@ -130,7 +130,7 @@ void ImageEffect_OilPaint::renderingFinished()
 
 void ImageEffect_OilPaint::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("oilpaint Tool Dialog");
     m_brushSizeInput->blockSignals(true);
     m_smoothInput->blockSignals(true);
@@ -142,7 +142,7 @@ void ImageEffect_OilPaint::readUserSettings()
 
 void ImageEffect_OilPaint::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("oilpaint Tool Dialog");
     config->writeEntry("BrushSize", m_brushSizeInput->value());
     config->writeEntry("SmoothAjustment", m_smoothInput->value());
diff --git a/src/imageplugins/oilpaint/oilpainttool.cpp b/src/imageplugins/oilpaint/oilpainttool.cpp
index 25bea302..c1e73698 100644
--- a/src/imageplugins/oilpaint/oilpainttool.cpp
+++ b/src/imageplugins/oilpaint/oilpainttool.cpp
@@ -134,7 +134,7 @@ void OilPaintTool::renderingFinished()
 
 void OilPaintTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("oilpaint Tool");
     m_brushSizeInput->blockSignals(true);
     m_smoothInput->blockSignals(true);
@@ -148,7 +148,7 @@ void OilPaintTool::readSettings()
 
 void OilPaintTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("oilpaint Tool");
     config->writeEntry("BrushSize", m_brushSizeInput->value());
     config->writeEntry("SmoothAjustment", m_smoothInput->value());
diff --git a/src/imageplugins/perspective/imageeffect_perspective.cpp b/src/imageplugins/perspective/imageeffect_perspective.cpp
index 15bef877..ac20bfa1 100644
--- a/src/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/src/imageplugins/perspective/imageeffect_perspective.cpp
@@ -199,7 +199,7 @@ ImageEffect_Perspective::~ImageEffect_Perspective()
 void ImageEffect_Perspective::readUserSettings(void)
 {
     TQColor defaultGuideColor(TQt::red);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("perspective Tool Dialog");
     m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true));
     m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false));
@@ -213,7 +213,7 @@ void ImageEffect_Perspective::readUserSettings(void)
 
 void ImageEffect_Perspective::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("perspective Tool Dialog");
     config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked());
     config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked());
@@ -229,10 +229,10 @@ void ImageEffect_Perspective::resetValues()
 
 void ImageEffect_Perspective::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_previewWidget->applyPerspectiveAdjustment();
     accept();   
-    kapp->restoreOverrideCursor();       
+    tdeApp->restoreOverrideCursor();       
 }
 
 void ImageEffect_Perspective::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle,
diff --git a/src/imageplugins/perspective/perspectivetool.cpp b/src/imageplugins/perspective/perspectivetool.cpp
index 30d0a2cf..96209942 100644
--- a/src/imageplugins/perspective/perspectivetool.cpp
+++ b/src/imageplugins/perspective/perspectivetool.cpp
@@ -193,7 +193,7 @@ PerspectiveTool::~PerspectiveTool()
 void PerspectiveTool::readSettings()
 {
     TQColor defaultGuideColor(TQt::red);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("perspective Tool");
     m_drawWhileMovingCheckBox->setChecked(config->readBoolEntry("Draw While Moving", true));
     m_drawGridCheckBox->setChecked(config->readBoolEntry("Draw Grid", false));
@@ -207,7 +207,7 @@ void PerspectiveTool::readSettings()
 
 void PerspectiveTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("perspective Tool");
     config->writeEntry("Draw While Moving", m_drawWhileMovingCheckBox->isChecked());
     config->writeEntry("Draw Grid", m_drawGridCheckBox->isChecked());
@@ -223,9 +223,9 @@ void PerspectiveTool::slotResetSettings()
 
 void PerspectiveTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_previewWidget->applyPerspectiveAdjustment();
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void PerspectiveTool::slotUpdateInfo(TQRect newSize, float topLeftAngle, float topRightAngle,
diff --git a/src/imageplugins/raindrop/imageeffect_raindrop.cpp b/src/imageplugins/raindrop/imageeffect_raindrop.cpp
index 8a82829d..a95b49dc 100644
--- a/src/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/src/imageplugins/raindrop/imageeffect_raindrop.cpp
@@ -153,7 +153,7 @@ void ImageEffect_RainDrop::renderingFinished()
 
 void ImageEffect_RainDrop::readUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("raindrops Tool Dialog");
 
     m_dropInput->blockSignals(true);
@@ -173,7 +173,7 @@ void ImageEffect_RainDrop::readUserSettings(void)
 
 void ImageEffect_RainDrop::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("raindrops Tool Dialog");
     config->writeEntry("DropAdjustment", m_dropInput->value());
     config->writeEntry("AmountAdjustment", m_amountInput->value());
diff --git a/src/imageplugins/raindrop/raindroptool.cpp b/src/imageplugins/raindrop/raindroptool.cpp
index 3d19238d..35f55cb7 100644
--- a/src/imageplugins/raindrop/raindroptool.cpp
+++ b/src/imageplugins/raindrop/raindroptool.cpp
@@ -146,7 +146,7 @@ void RainDropTool::renderingFinished()
 
 void RainDropTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("raindrops Tool");
 
     m_dropInput->blockSignals(true);
@@ -166,7 +166,7 @@ void RainDropTool::readSettings()
 
 void RainDropTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("raindrops Tool");
     config->writeEntry("DropAdjustment",    m_dropInput->value());
     config->writeEntry("AmountAdjustment",  m_amountInput->value());
diff --git a/src/imageplugins/restoration/imageeffect_restoration.cpp b/src/imageplugins/restoration/imageeffect_restoration.cpp
index 825ef23d..8173155d 100644
--- a/src/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/src/imageplugins/restoration/imageeffect_restoration.cpp
@@ -149,7 +149,7 @@ void ImageEffect_Restoration::renderingFinished()
 
 void ImageEffect_Restoration::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("restoration Tool Dialog");
 
     Digikam::GreycstorationSettings settings;
@@ -180,7 +180,7 @@ void ImageEffect_Restoration::readUserSettings()
 void ImageEffect_Restoration::writeUserSettings()
 {
     Digikam::GreycstorationSettings settings = m_settingsWidget->getSettings();
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("restoration Tool Dialog");
     config->writeEntry("Preset", m_restorationTypeCB->currentItem());
     config->writeEntry("FastApprox", settings.fastApprox);
@@ -246,7 +246,7 @@ void ImageEffect_Restoration::resetValues()
 
 void ImageEffect_Restoration::processCImgURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void ImageEffect_Restoration::prepareEffect()
diff --git a/src/imageplugins/restoration/restorationtool.cpp b/src/imageplugins/restoration/restorationtool.cpp
index a6896135..9a0111b0 100644
--- a/src/imageplugins/restoration/restorationtool.cpp
+++ b/src/imageplugins/restoration/restorationtool.cpp
@@ -159,7 +159,7 @@ void RestorationTool::renderingFinished()
 
 void RestorationTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("restoration Tool");
 
     GreycstorationSettings settings;
@@ -192,7 +192,7 @@ void RestorationTool::readSettings()
 void RestorationTool::writeSettings()
 {
     GreycstorationSettings settings = m_settingsWidget->getSettings();
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("restoration Tool");
     config->writeEntry("Preset", m_restorationTypeCB->currentItem());
     config->writeEntry("FastApprox", settings.fastApprox);
@@ -259,7 +259,7 @@ void RestorationTool::slotResetSettings()
 
 void RestorationTool::processCImgURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void RestorationTool::prepareEffect()
@@ -304,7 +304,7 @@ void RestorationTool::putFinalData()
 void RestorationTool::slotLoadSettings()
 {
     KURL loadRestorationFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Photograph Restoration Settings File to Load")) );
     if( loadRestorationFile.isEmpty() )
        return;
@@ -315,7 +315,7 @@ void RestorationTool::slotLoadSettings()
     {
         if (!m_settingsWidget->loadSettings(file, TQString("# Photograph Restoration Configuration File V2")))
         {
-           KMessageBox::error(kapp->activeWindow(),
+           KMessageBox::error(tdeApp->activeWindow(),
                         i18n("\"%1\" is not a Photograph Restoration settings text file.")
                         .arg(loadRestorationFile.fileName()));
            file.close();
@@ -325,7 +325,7 @@ void RestorationTool::slotLoadSettings()
         slotEffect();
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the Photograph Restoration text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the Photograph Restoration text file."));
 
     file.close();
     m_restorationTypeCB->blockSignals(true);
@@ -337,7 +337,7 @@ void RestorationTool::slotLoadSettings()
 void RestorationTool::slotSaveAsSettings()
 {
     KURL saveRestorationFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                            TQString( "*" ), kapp->activeWindow(),
+                                            TQString( "*" ), tdeApp->activeWindow(),
                                             TQString( i18n("Photograph Restoration Settings File to Save")) );
     if( saveRestorationFile.isEmpty() )
        return;
@@ -347,7 +347,7 @@ void RestorationTool::slotSaveAsSettings()
     if ( file.open(IO_WriteOnly) )
         m_settingsWidget->saveSettings(file, TQString("# Photograph Restoration Configuration File V2"));
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the Photograph Restoration text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the Photograph Restoration text file."));
 
     file.close();
 }
diff --git a/src/imageplugins/sheartool/imageeffect_sheartool.cpp b/src/imageplugins/sheartool/imageeffect_sheartool.cpp
index e65bd91b..1d59d9f7 100644
--- a/src/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/src/imageplugins/sheartool/imageeffect_sheartool.cpp
@@ -181,7 +181,7 @@ ImageEffect_ShearTool::~ImageEffect_ShearTool()
 
 void ImageEffect_ShearTool::readUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("sheartool Tool Dialog");
     m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", 0));
     m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", 0));
@@ -193,7 +193,7 @@ void ImageEffect_ShearTool::readUserSettings(void)
 
 void ImageEffect_ShearTool::writeUserSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("sheartool Tool Dialog");
     config->writeEntry("Main HAngle", m_mainHAngleInput->value());
     config->writeEntry("Main VAngle", m_mainVAngleInput->value());
@@ -224,7 +224,7 @@ void ImageEffect_ShearTool::resetValues()
 
 void ImageEffect_ShearTool::prepareEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_mainHAngleInput->setEnabled(false);
     m_mainVAngleInput->setEnabled(false);
     m_fineHAngleInput->setEnabled(false);
@@ -315,7 +315,7 @@ void ImageEffect_ShearTool::renderingFinished()
     m_fineHAngleInput->setEnabled(true);
     m_fineVAngleInput->setEnabled(true);
     m_antialiasInput->setEnabled(true);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamShearToolImagesPlugin
diff --git a/src/imageplugins/sheartool/sheartool.cpp b/src/imageplugins/sheartool/sheartool.cpp
index 9f65b6d3..01d72a88 100644
--- a/src/imageplugins/sheartool/sheartool.cpp
+++ b/src/imageplugins/sheartool/sheartool.cpp
@@ -186,7 +186,7 @@ void ShearTool::slotColorGuideChanged()
 
 void ShearTool::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("sheartool Tool");
     m_mainHAngleInput->setValue(config->readNumEntry("Main HAngle", m_mainHAngleInput->defaultValue()));
     m_mainVAngleInput->setValue(config->readNumEntry("Main VAngle", m_mainVAngleInput->defaultValue()));
@@ -202,7 +202,7 @@ void ShearTool::readSettings()
 
 void ShearTool::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("sheartool Tool");
     config->writeEntry("Main HAngle", m_mainHAngleInput->value());
     config->writeEntry("Main VAngle", m_mainVAngleInput->value());
@@ -238,7 +238,7 @@ void ShearTool::slotResetSettings()
 
 void ShearTool::prepareEffect()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_mainHAngleInput->setEnabled(false);
     m_mainVAngleInput->setEnabled(false);
     m_fineHAngleInput->setEnabled(false);
@@ -325,7 +325,7 @@ void ShearTool::renderingFinished()
     m_fineHAngleInput->setEnabled(true);
     m_fineVAngleInput->setEnabled(true);
     m_antialiasInput->setEnabled(true);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamShearToolImagesPlugin
diff --git a/src/imageplugins/superimpose/imageeffect_superimpose.cpp b/src/imageplugins/superimpose/imageeffect_superimpose.cpp
index 1cea3e08..e2dce011 100644
--- a/src/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/src/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -211,7 +211,7 @@ void ImageEffect_SuperImpose::populateTemplates(void)
 
 void ImageEffect_SuperImpose::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Album Settings");
     KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) );
     config->setGroup("superimpose Tool Dialog");
@@ -223,7 +223,7 @@ void ImageEffect_SuperImpose::readUserSettings()
 
 void ImageEffect_SuperImpose::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("superimpose Tool Dialog");
     config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() );
     config->writeEntry( "Templates URL", m_templatesUrl.path() );
@@ -236,7 +236,7 @@ void ImageEffect_SuperImpose::resetValues()
 
 void ImageEffect_SuperImpose::slotRootTemplateDirChanged(void)
 {
-    KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), kapp->activeWindow(),
+    KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), tdeApp->activeWindow(),
                                                  i18n("Select Template Root Directory to Use"));
 
     if( url.isValid() )
diff --git a/src/imageplugins/superimpose/superimposetool.cpp b/src/imageplugins/superimpose/superimposetool.cpp
index f035559c..934bf065 100644
--- a/src/imageplugins/superimpose/superimposetool.cpp
+++ b/src/imageplugins/superimpose/superimposetool.cpp
@@ -203,7 +203,7 @@ void SuperImposeTool::populateTemplates()
 
 void SuperImposeTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Album Settings");
     KURL albumDBUrl( config->readPathEntry("Album Path", TDEGlobalSettings::documentPath()) );
     config->setGroup("superimpose Tool");
@@ -215,7 +215,7 @@ void SuperImposeTool::readSettings()
 
 void SuperImposeTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("superimpose Tool");
     config->writeEntry( "Templates Root URL", m_dirSelect->rootPath().path() );
     config->writeEntry( "Templates URL", m_templatesUrl.path() );
@@ -229,7 +229,7 @@ void SuperImposeTool::slotResetSettings()
 
 void SuperImposeTool::slotRootTemplateDirChanged()
 {
-    KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), kapp->activeWindow(),
+    KURL url = KFileDialog::getExistingDirectory(m_templatesRootUrl.path(), tdeApp->activeWindow(),
                                                  i18n("Select Template Root Directory to Use"));
 
     if( url.isValid() )
@@ -252,7 +252,7 @@ void SuperImposeTool::slotTemplateDirChanged(const KURL& url)
 
 void SuperImposeTool::finalRendering()
 {
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     m_previewWidget->setEnabled(false);
     m_dirSelect->setEnabled(false);
     m_thumbnailsBar->setEnabled(false);
@@ -265,7 +265,7 @@ void SuperImposeTool::finalRendering()
     m_previewWidget->setEnabled(true);
     m_dirSelect->setEnabled(true);
     m_thumbnailsBar->setEnabled(true);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 }  // NameSpace DigikamSuperImposeImagesPlugin
diff --git a/src/imageplugins/texture/imageeffect_texture.cpp b/src/imageplugins/texture/imageeffect_texture.cpp
index 5f5d7e9f..a045f68d 100644
--- a/src/imageplugins/texture/imageeffect_texture.cpp
+++ b/src/imageplugins/texture/imageeffect_texture.cpp
@@ -143,7 +143,7 @@ void ImageEffect_Texture::renderingFinished()
 
 void ImageEffect_Texture::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("texture Tool Dialog");
     m_textureType->blockSignals(true);
     m_blendGain->blockSignals(true);
@@ -155,7 +155,7 @@ void ImageEffect_Texture::readUserSettings()
 
 void ImageEffect_Texture::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("texture Tool Dialog");
     config->writeEntry("TextureType", m_textureType->currentItem());
     config->writeEntry("BlendGain", m_blendGain->value());
diff --git a/src/imageplugins/texture/texturetool.cpp b/src/imageplugins/texture/texturetool.cpp
index 71e29aea..d2050930 100644
--- a/src/imageplugins/texture/texturetool.cpp
+++ b/src/imageplugins/texture/texturetool.cpp
@@ -144,7 +144,7 @@ void TextureTool::renderingFinished()
 
 void TextureTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("texture Tool");
 
     m_textureType->blockSignals(true);
@@ -159,7 +159,7 @@ void TextureTool::readSettings()
 
 void TextureTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("texture Tool");
     config->writeEntry("TextureType", m_textureType->currentItem());
     config->writeEntry("BlendGain", m_blendGain->value());
diff --git a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index f72609dd..7c065db3 100644
--- a/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/src/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -281,7 +281,7 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
                                                  " (E.V): </qt>"), gboxSettings);
     m_mainExposureLabel  = new TQLabel(i18n("Main:"), gboxSettings);
     m_autoAdjustExposure = new TQPushButton(gboxSettings);
-    m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));
+    m_autoAdjustExposure->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));
     TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) );
     TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure "
                                                 "and Black Point values."));
@@ -660,7 +660,7 @@ void ImageEffect_WhiteBalance::slotEffect()
 
 void ImageEffect_WhiteBalance::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     Digikam::ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
     int w                      = iface->originalWidth();
@@ -684,7 +684,7 @@ void ImageEffect_WhiteBalance::finalRendering()
 
     iface->putOriginalImage(i18n("White Balance"), data);
     delete [] data;
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     accept();       
 }
 
@@ -729,7 +729,7 @@ void ImageEffect_WhiteBalance::resetValues()
 
 void ImageEffect_WhiteBalance::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("whitebalance Tool Dialog");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", Digikam::HistogramWidget::LogScaleHistogram));
@@ -749,7 +749,7 @@ void ImageEffect_WhiteBalance::readUserSettings()
 
 void ImageEffect_WhiteBalance::writeUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("whitebalance Tool Dialog");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
diff --git a/src/imageplugins/whitebalance/whitebalancetool.cpp b/src/imageplugins/whitebalance/whitebalancetool.cpp
index fdbe723a..5f432721 100644
--- a/src/imageplugins/whitebalance/whitebalancetool.cpp
+++ b/src/imageplugins/whitebalance/whitebalancetool.cpp
@@ -285,7 +285,7 @@ WhiteBalanceTool::WhiteBalanceTool(TQObject* parent)
                                                  " (E.V): </qt>"), m_gboxSettings->plainPage());
     m_mainExposureLabel  = new TQLabel(i18n("Main:"), m_gboxSettings->plainPage());
     m_autoAdjustExposure = new TQPushButton(m_gboxSettings->plainPage());
-    m_autoAdjustExposure->setPixmap(kapp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));
+    m_autoAdjustExposure->setPixmap(tdeApp->iconLoader()->loadIcon("system-run", (TDEIcon::Group)TDEIcon::Toolbar));
     TQToolTip::add( m_autoAdjustExposure, i18n( "Auto exposure adjustments" ) );
     TQWhatsThis::add( m_autoAdjustExposure, i18n("<p>With this button, you can automatically adjust Exposure "
                                                 "and Black Point values."));
@@ -601,7 +601,7 @@ void WhiteBalanceTool::slotChannelChanged(int channel)
 
 void WhiteBalanceTool::slotAutoAdjustExposure()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data                = iface->getOriginalImage();
@@ -619,7 +619,7 @@ void WhiteBalanceTool::slotAutoAdjustExposure()
     m_mainExposureInput->setValue(exposureLevel);
     m_fineExposureInput->setValue(0.0);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     slotEffect();
 }
 
@@ -665,7 +665,7 @@ void WhiteBalanceTool::slotEffect()
 
 void WhiteBalanceTool::finalRendering()
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     ImageIface* iface = m_previewWidget->imageIface();
     uchar *data       = iface->getOriginalImage();
     int w             = iface->originalWidth();
@@ -689,7 +689,7 @@ void WhiteBalanceTool::finalRendering()
 
     iface->putOriginalImage(i18n("White Balance"), data);
     delete [] data;
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void WhiteBalanceTool::slotResetSettings()
@@ -737,7 +737,7 @@ void WhiteBalanceTool::slotResetSettings()
 
 void WhiteBalanceTool::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("whitebalance Tool");
     m_channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", 0));    // Luminosity.
     m_scaleBG->setButton(config->readNumEntry("Histogram Scale", HistogramWidget::LogScaleHistogram));
@@ -759,7 +759,7 @@ void WhiteBalanceTool::readSettings()
 
 void WhiteBalanceTool::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("whitebalance Tool");
     config->writeEntry("Histogram Channel", m_channelCB->currentItem());
     config->writeEntry("Histogram Scale", m_scaleBG->selectedId());
@@ -779,7 +779,7 @@ void WhiteBalanceTool::writeSettings()
 void WhiteBalanceTool::slotLoadSettings()
 {
     KURL loadWhiteBalanceFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("White Color Balance Settings File to Load")) );
     if( loadWhiteBalanceFile.isEmpty() )
        return;
@@ -792,7 +792,7 @@ void WhiteBalanceTool::slotLoadSettings()
 
         if ( stream.readLine() != "# White Color Balance Configuration File V2" )
         {
-           KMessageBox::error(kapp->activeWindow(),
+           KMessageBox::error(tdeApp->activeWindow(),
                         i18n("\"%1\" is not a White Color Balance settings text file.")
                         .arg(loadWhiteBalanceFile.fileName()));
            file.close();
@@ -813,7 +813,7 @@ void WhiteBalanceTool::slotLoadSettings()
         slotEffect();
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot load settings from the White Color Balance text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot load settings from the White Color Balance text file."));
 
     file.close();
 }
@@ -821,7 +821,7 @@ void WhiteBalanceTool::slotLoadSettings()
 void WhiteBalanceTool::slotSaveAsSettings()
 {
     KURL saveWhiteBalanceFile = KFileDialog::getSaveURL(TDEGlobalSettings::documentPath(),
-                                             TQString( "*" ), kapp->activeWindow(),
+                                             TQString( "*" ), tdeApp->activeWindow(),
                                              TQString( i18n("White Color Balance Settings File to Save")) );
     if( saveWhiteBalanceFile.isEmpty() )
        return;
@@ -842,7 +842,7 @@ void WhiteBalanceTool::slotSaveAsSettings()
         stream << m_greenInput->value() << "\n";
     }
     else
-        KMessageBox::error(kapp->activeWindow(), i18n("Cannot save settings to the White Color Balance text file."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot save settings to the White Color Balance text file."));
 
     file.close();
 }
diff --git a/src/libs/dialogs/ctrlpaneldlg.cpp b/src/libs/dialogs/ctrlpaneldlg.cpp
index 450d380f..9d218a99 100644
--- a/src/libs/dialogs/ctrlpaneldlg.cpp
+++ b/src/libs/dialogs/ctrlpaneldlg.cpp
@@ -101,7 +101,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
                           i18n("&Save As..."),
                           i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     
     d = new CtrlPanelDlgPriv;
@@ -143,7 +143,7 @@ CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
     // -------------------------------------------------------------
 
     TQTimer::singleShot(0, this, TQ_SLOT(slotInit()));
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 CtrlPanelDlg::~CtrlPanelDlg()
@@ -228,7 +228,7 @@ void CtrlPanelDlg::slotCancel()
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
     
     saveDialogSize(d->name + TQString(" Tool Dialog"));
@@ -242,7 +242,7 @@ void CtrlPanelDlg::closeEvent(TQCloseEvent *e)
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
 
     saveDialogSize(d->name + TQString(" Tool Dialog"));
@@ -271,7 +271,7 @@ void CtrlPanelDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
@@ -334,7 +334,7 @@ void CtrlPanelDlg::slotOk()
     enableButton(User3,   false);
     enableButton(Try,     false);
     enableButton(Default, false);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     m_imagePreviewWidget->setProgress(0);
 
     if (m_threadedFilter)
@@ -376,7 +376,7 @@ void CtrlPanelDlg::customEvent(TQCustomEvent *event)
               {
                  DDebug() << "Final" << d->name << " completed..." << endl;
                  putFinalData();
-                 kapp->restoreOverrideCursor();
+                 tdeApp->restoreOverrideCursor();
                  accept();
                  break;
               }
diff --git a/src/libs/dialogs/dprogressdlg.cpp b/src/libs/dialogs/dprogressdlg.cpp
index d4b0dc29..935b9f65 100644
--- a/src/libs/dialogs/dprogressdlg.cpp
+++ b/src/libs/dialogs/dprogressdlg.cpp
@@ -94,7 +94,7 @@ DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption)
     vlay->addWidget(d->title);
     vlay->addStretch();
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     d->logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));
 
     d->actionsList->addColumn("Thumb");   // no i18n here: hiden column
diff --git a/src/libs/dialogs/imagedialog.cpp b/src/libs/dialogs/imagedialog.cpp
index d052a2af..f56a6d91 100644
--- a/src/libs/dialogs/imagedialog.cpp
+++ b/src/libs/dialogs/imagedialog.cpp
@@ -229,7 +229,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix)
 
 void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/)
 {
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     d->imageLabel->setPixmap(iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, 128,
                              TDEIcon::DefaultState, 0, true));
 }
diff --git a/src/libs/dialogs/imagedlgbase.cpp b/src/libs/dialogs/imagedlgbase.cpp
index 61666406..3bdb8725 100644
--- a/src/libs/dialogs/imagedlgbase.cpp
+++ b/src/libs/dialogs/imagedlgbase.cpp
@@ -103,7 +103,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name,
                           i18n("&Save As..."),
                           i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     showButton(User1, false);
 
@@ -143,7 +143,7 @@ ImageDlgBase::ImageDlgBase(TQWidget* parent, TQString title, TQString name,
     d->mainLayout->setColStretch(0, 10);
     d->mainLayout->setRowStretch(2, 10);
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 ImageDlgBase::~ImageDlgBase()
@@ -160,7 +160,7 @@ ImageDlgBase::~ImageDlgBase()
 
 void ImageDlgBase::readSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     if(config->hasKey("SplitterSizes"))
         d->splitter->setSizes(config->readIntListEntry("SplitterSizes"));
@@ -170,7 +170,7 @@ void ImageDlgBase::readSettings(void)
 
 void ImageDlgBase::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     config->writeEntry("SplitterSizes", d->splitter->sizes());
     config->sync();
@@ -208,7 +208,7 @@ void ImageDlgBase::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
diff --git a/src/libs/dialogs/imageguidedlg.cpp b/src/libs/dialogs/imageguidedlg.cpp
index 9713a872..01937d8f 100644
--- a/src/libs/dialogs/imageguidedlg.cpp
+++ b/src/libs/dialogs/imageguidedlg.cpp
@@ -136,7 +136,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
                            i18n("&Save As..."),
                            i18n("&Load..."))
 {
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     setCaption(DImgInterface::defaultInterface()->getImageFileName() + TQString(" - ") + title);
     
     d = new ImageGuideDlgPriv;
@@ -253,7 +253,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
     d->settingsSideBar->loadViewState();
     
     // Reading splitter sizes here prevent flicker effect in dialog.
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     if(config->hasKey("SplitterSizes"))
         d->splitter->setSizes(config->readIntListEntry("SplitterSizes"));
@@ -261,7 +261,7 @@ ImageGuideDlg::ImageGuideDlg(TQWidget* parent, TQString title, TQString name,
     // -------------------------------------------------------------
 
     TQTimer::singleShot(0, this, TQ_SLOT(slotInit()));
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 ImageGuideDlg::~ImageGuideDlg()
@@ -282,7 +282,7 @@ ImageGuideDlg::~ImageGuideDlg()
 void ImageGuideDlg::readSettings(void)
 {
     TQColor defaultGuideColor(TQt::red);
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     d->guideColorBt->setColor(config->readColorEntry("Guide Color", &defaultGuideColor));
     d->guideSize->setValue(config->readNumEntry("Guide Width", 1));
@@ -292,7 +292,7 @@ void ImageGuideDlg::readSettings(void)
 
 void ImageGuideDlg::writeSettings(void)
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->name + TQString(" Tool Dialog"));
     config->writeEntry( "Guide Color", d->guideColorBt->color() );
     config->writeEntry( "Guide Width", d->guideSize->value() );
@@ -401,7 +401,7 @@ void ImageGuideDlg::slotCancel()
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
     
     writeSettings();
@@ -415,7 +415,7 @@ void ImageGuideDlg::closeEvent(TQCloseEvent *e)
        if (m_threadedFilter)
           m_threadedFilter->stopComputation();
 
-       kapp->restoreOverrideCursor();
+       tdeApp->restoreOverrideCursor();
     }
 
     writeSettings();
@@ -428,7 +428,7 @@ void ImageGuideDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
+        tdeApp->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
@@ -487,7 +487,7 @@ void ImageGuideDlg::slotOk()
     enableButton(User3,   false);
     enableButton(Default, false);
     enableButton(Try,     false);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     d->progressBar->setValue(0);
 
     if (m_threadedFilter)
@@ -529,7 +529,7 @@ void ImageGuideDlg::customEvent(TQCustomEvent *event)
                 {
                     DDebug() << "Final" << d->name << " completed..." << endl;
                     putFinalData();
-                    kapp->restoreOverrideCursor();
+                    tdeApp->restoreOverrideCursor();
                     accept();
                     break;
                 }
diff --git a/src/libs/dialogs/rawcameradlg.cpp b/src/libs/dialogs/rawcameradlg.cpp
index 298b47d4..0323c19e 100644
--- a/src/libs/dialogs/rawcameradlg.cpp
+++ b/src/libs/dialogs/rawcameradlg.cpp
@@ -93,9 +93,9 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
 
-    if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
+    if (tdeApp->aboutData()->appName() == TQString("digikam"))
         logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));
     else
         logo->setPixmap(iconLoader->loadIcon("showfoto", TDEIcon::NoGroup, 96, TDEIcon::DefaultState, 0, true));
diff --git a/src/libs/dimg/filters/icctransform.cpp b/src/libs/dimg/filters/icctransform.cpp
index 0a1324db..0aa2b666 100644
--- a/src/libs/dimg/filters/icctransform.cpp
+++ b/src/libs/dimg/filters/icctransform.cpp
@@ -141,14 +141,14 @@ TQString IccTransform::getProfileDescription(const TQString& profile)
 
 int IccTransform::getRenderingIntent()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
     return config->readNumEntry("RenderingIntent", 0);
 }
 
 bool IccTransform::getUseBPC()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
     return config->readBoolEntry("BPCAlgorithm", false);
 }
diff --git a/src/libs/imageproperties/imagedescedittab.cpp b/src/libs/imageproperties/imagedescedittab.cpp
index f79b1d7c..3a70563b 100644
--- a/src/libs/imageproperties/imagedescedittab.cpp
+++ b/src/libs/imageproperties/imagedescedittab.cpp
@@ -186,7 +186,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar)
 
     d->assignedTagsBtn = new TQToolButton(tagsSearch);
     TQToolTip::add(d->assignedTagsBtn, i18n("Tags already assigned"));
-    d->assignedTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-assigned",
+    d->assignedTagsBtn->setIconSet(tdeApp->iconLoader()->loadIcon("tag-assigned",
                                    TDEIcon::NoGroup, TDEIcon::SizeSmall,
                                    TDEIcon::DefaultState, 0, true));
     d->assignedTagsBtn->setToggleButton(true);
@@ -194,7 +194,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar)
     d->recentTagsBtn      = new TQToolButton(tagsSearch);
     TQPopupMenu *popupMenu = new TQPopupMenu(d->recentTagsBtn);
     TQToolTip::add(d->recentTagsBtn, i18n("Recent Tags"));
-    d->recentTagsBtn->setIconSet(kapp->iconLoader()->loadIcon("tag-recents",
+    d->recentTagsBtn->setIconSet(tdeApp->iconLoader()->loadIcon("tag-recents",
                                  TDEIcon::NoGroup, TDEIcon::SizeSmall,
                                  TDEIcon::DefaultState, 0, true));
     d->recentTagsBtn->setUsesBigPixmap(false);
@@ -343,7 +343,7 @@ ImageDescEditTab::ImageDescEditTab(TQWidget *parent, bool navBar)
 
     // -- read config ---------------------------------------------------------
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Tag List View");
     d->toggleAutoTags = (TagFilterView::ToggleAutoTags)(config->readNumEntry("Toggle Auto Tags",
                                                        TagFilterView::NoToggleAuto));
@@ -361,7 +361,7 @@ ImageDescEditTab::~ImageDescEditTab()
     }
     */
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Tag List View");
     config->writeEntry("Toggle Auto Tags", (int)(d->toggleAutoTags));
     config->sync();
@@ -474,7 +474,7 @@ void ImageDescEditTab::slotApplyAllChanges()
                                i18n("Applying changes to images. Please wait..."));
     MetadataWriteSettings writeSettings = MetadataHub::defaultWriteSettings();
 
-    // debugging - use this to indicate reentry from event loop (kapp->processEvents)
+    // debugging - use this to indicate reentry from event loop (tdeApp->processEvents)
     // remove before final release
     if (d->ignoreImageAttributesWatch)
     {
@@ -495,7 +495,7 @@ void ImageDescEditTab::slotApplyAllChanges()
 
         emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0));
         if (progressInfo)
-            kapp->processEvents();
+            tdeApp->processEvents();
     }
     AlbumLister::instance()->blockSignals(false);
     AlbumManager::instance()->albumDB()->commitTransaction();
@@ -588,7 +588,7 @@ void ImageDescEditTab::slotReadFromFileMetadataToDatabase()
         fileHub.write(info);
 
         emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0));
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
     AlbumManager::instance()->albumDB()->commitTransaction();
     d->ignoreImageAttributesWatch = false;
@@ -615,7 +615,7 @@ void ImageDescEditTab::slotWriteToFileMetadataFromDatabase()
         fileHub.write(info->filePath());
 
         emit signalProgressValue((int)((i++/(float)d->currInfos.count())*100.0));
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     emit signalProgressBarMode(StatusProgressBar::TextMode, TQString());
@@ -1071,13 +1071,13 @@ void ImageDescEditTab::tagNew(TAlbum* parAlbum, const TQString& _title, const TQ
 
     if (title.isNull())
     {
-        if (!TagEditDlg::tagCreate(kapp->activeWindow(), parAlbum, title, icon))
+        if (!TagEditDlg::tagCreate(tdeApp->activeWindow(), parAlbum, title, icon))
             return;
     }
 
     TQMap<TQString, TQString> errMap;
     AlbumList tList = TagEditDlg::createTAlbum(parAlbum, title, icon, errMap);
-    TagEditDlg::showtagsListCreationError(kapp->activeWindow(), errMap);
+    TagEditDlg::showtagsListCreationError(tdeApp->activeWindow(), errMap);
 
     for (AlbumList::iterator it = tList.begin(); it != tList.end(); ++it)
     {
@@ -1171,7 +1171,7 @@ void ImageDescEditTab::tagEdit(TAlbum* album)
     TQString title;
     TQString icon;
 
-    if (!TagEditDlg::tagEdit(kapp->activeWindow(), album, title, icon))
+    if (!TagEditDlg::tagEdit(tdeApp->activeWindow(), album, title, icon))
         return;
 
     AlbumManager *albumMan = AlbumManager::instance();
diff --git a/src/libs/imageproperties/imagepropertiescolorstab.cpp b/src/libs/imageproperties/imagepropertiescolorstab.cpp
index af85953b..01fd06d2 100644
--- a/src/libs/imageproperties/imagepropertiescolorstab.cpp
+++ b/src/libs/imageproperties/imagepropertiescolorstab.cpp
@@ -381,7 +381,7 @@ ImagePropertiesColorsTab::ImagePropertiesColorsTab(TQWidget* parent, bool navBar
 
     // -- read config ---------------------------------------------------------
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Image Properties SideBar");
     d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesColors Tab",
                            ImagePropertiesColorsTabPriv::HISTOGRAM));
@@ -400,7 +400,7 @@ ImagePropertiesColorsTab::~ImagePropertiesColorsTab()
     // stop it before the d->image data are deleted automatically!
     d->histogramWidget->stopHistogramComputation();
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Image Properties SideBar");
     config->writeEntry("ImagePropertiesColors Tab", d->tab->currentPageIndex());
     config->writeEntry("Histogram Channel", d->channelCB->currentItem());
diff --git a/src/libs/imageproperties/imagepropertiesmetadatatab.cpp b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp
index 5a48aaec..cb843265 100644
--- a/src/libs/imageproperties/imagepropertiesmetadatatab.cpp
+++ b/src/libs/imageproperties/imagepropertiesmetadatatab.cpp
@@ -117,7 +117,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na
 
     // -- read config ---------------------------------------------------------
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Image Properties SideBar");
     d->tab->setCurrentPage(config->readNumEntry("ImagePropertiesMetaData Tab",
                            ImagePropertiesMetadataTabPriv::EXIF));
@@ -134,7 +134,7 @@ ImagePropertiesMetaDataTab::ImagePropertiesMetaDataTab(TQWidget* parent, bool na
 
 ImagePropertiesMetaDataTab::~ImagePropertiesMetaDataTab()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Image Properties SideBar");
     config->writeEntry("ImagePropertiesMetaData Tab", d->tab->currentPageIndex());
     config->writeEntry("EXIF Level", d->exifWidget->getMode());
diff --git a/src/libs/imageproperties/talbumlistview.cpp b/src/libs/imageproperties/talbumlistview.cpp
index 1369d228..098f85ab 100644
--- a/src/libs/imageproperties/talbumlistview.cpp
+++ b/src/libs/imageproperties/talbumlistview.cpp
@@ -408,7 +408,7 @@ void TAlbumListView::contentsDropEvent(TQDropEvent *e)
                 hub.write(info.filePath(), MetadataHub::FullWriteIfChanged);
 
                 emit signalProgressValue((int)((i++/(float)imageIDs.count())*100.0));
-                kapp->processEvents();
+                tdeApp->processEvents();
             }
             AlbumLister::instance()->blockSignals(false);
             AlbumManager::instance()->albumDB()->commitTransaction();
@@ -458,7 +458,7 @@ void TAlbumListView::slotRefresh(const TQMap<int, int>& tagsStatMap)
 
 void TAlbumListView::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     int selectedItem = config->readNumEntry("LastSelectedItem", 0);
@@ -505,7 +505,7 @@ void TAlbumListView::loadViewState()
 
 void TAlbumListView::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name());
 
     TAlbumCheckListItem *item = dynamic_cast<TAlbumCheckListItem*>(selectedItem());
diff --git a/src/libs/themeengine/themeengine.cpp b/src/libs/themeengine/themeengine.cpp
index 331ffa5d..7445cec1 100644
--- a/src/libs/themeengine/themeengine.cpp
+++ b/src/libs/themeengine/themeengine.cpp
@@ -283,7 +283,7 @@ void ThemeEngine::changePalette()
         plt = d->defaultPalette;
     else
     {
-        plt = kapp->palette();
+        plt = tdeApp->palette();
         int h, s, v;
         const TQColor fg(ThemeEngine::instance()->textRegColor());
         const TQColor bg(ThemeEngine::instance()->baseColor());
@@ -325,7 +325,7 @@ void ThemeEngine::changePalette()
         plt.setDisabled(cg);
     }
 
-    kapp->setPalette(plt, true);
+    tdeApp->setPalette(plt, true);
 }
 
 Theme* ThemeEngine::getCurrentTheme() const
@@ -342,7 +342,7 @@ void ThemeEngine::buildDefaultTheme()
 {
     Theme* t = d->defaultTheme;
 
-    d->defaultPalette      = kapp->palette();
+    d->defaultPalette      = tdeApp->palette();
     TQColorGroup cg         = d->defaultPalette.active();
 
     t->baseColor           = cg.base();
diff --git a/src/libs/thumbbar/thumbbar.cpp b/src/libs/thumbbar/thumbbar.cpp
index f5b32767..3bac9b3b 100644
--- a/src/libs/thumbbar/thumbbar.cpp
+++ b/src/libs/thumbbar/thumbbar.cpp
@@ -801,7 +801,7 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url)
     if (!item)
         return;
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     TQPixmap pix = iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, ThumbnailSize::Huge);
 
     if (item->d->pixmap)
diff --git a/src/libs/widgets/common/dlogoaction.cpp b/src/libs/widgets/common/dlogoaction.cpp
index 73bf4b7d..47ef084f 100644
--- a/src/libs/widgets/common/dlogoaction.cpp
+++ b/src/libs/widgets/common/dlogoaction.cpp
@@ -53,7 +53,7 @@ DLogoAction::DLogoAction(TQObject* parent, const char* name)
 
 int DLogoAction::plug(TQWidget *widget, int index)
 {
-    if (kapp && !kapp->authorizeTDEAction(name()))
+    if (tdeApp && !tdeApp->authorizeTDEAction(name()))
         return -1;
 
     if ( widget->inherits( "TDEToolBar" ) )
@@ -91,7 +91,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
 
 void DLogoAction::slotProcessURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 } // namespace Digikam
diff --git a/src/libs/widgets/common/dpopupmenu.cpp b/src/libs/widgets/common/dpopupmenu.cpp
index f41404ce..befee139 100644
--- a/src/libs/widgets/common/dpopupmenu.cpp
+++ b/src/libs/widgets/common/dpopupmenu.cpp
@@ -68,7 +68,7 @@ void DPopupMenu::generateSidePixmap()
     {
         s_dpopupmenu_sidePixmapColor = newColor;
 
-        if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
+        if (tdeApp->aboutData()->appName() == TQString("digikam"))
             s_dpopupmenu_sidePixmap.load( locate( "data","digikam/data/menusidepixmap.png" ) );
         else
             s_dpopupmenu_sidePixmap.load( locate( "data","showfoto/menusidepixmap.png" ) );
diff --git a/src/libs/widgets/common/filesaveoptionsbox.cpp b/src/libs/widgets/common/filesaveoptionsbox.cpp
index 26985fb5..b00fd184 100644
--- a/src/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/src/libs/widgets/common/filesaveoptionsbox.cpp
@@ -156,7 +156,7 @@ void FileSaveOptionsBox::toggleFormatOptions(const TQString& format)
 
 void FileSaveOptionsBox::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue());
     config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue());
@@ -169,7 +169,7 @@ void FileSaveOptionsBox::applySettings()
 
 void FileSaveOptionsBox::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) );
     d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) );  // Medium subsampling
diff --git a/src/libs/widgets/common/searchtextbar.cpp b/src/libs/widgets/common/searchtextbar.cpp
index 1a81c03b..f66a3667 100644
--- a/src/libs/widgets/common/searchtextbar.cpp
+++ b/src/libs/widgets/common/searchtextbar.cpp
@@ -164,7 +164,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
     d->clearButton = new TQToolButton(this);
     d->clearButton->setEnabled(false);
     d->clearButton->setAutoRaise(true);
-    d->clearButton->setIconSet(kapp->iconLoader()->loadIcon("clear_left",
+    d->clearButton->setIconSet(tdeApp->iconLoader()->loadIcon("clear_left",
                                TDEIcon::Toolbar, TDEIcon::SizeSmall));
 
     d->searchEdit     = new DLineEdit(msg, this);
@@ -185,7 +185,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
     connect(d->searchEdit, TQ_SIGNAL(textChanged(const TQString&)),
             this, TQ_SLOT(slotTextChanged(const TQString&)));
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name + TQString(" Search Text Tool"));
     d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", 
                                       (int)TDEGlobalSettings::CompletionAuto));
@@ -193,7 +193,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
 
 SearchTextBar::~SearchTextBar()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(name() + TQString(" Search Text Tool"));
     config->writeEntry("AutoCompletionMode", (int)d->searchEdit->completionMode());
     config->sync();
diff --git a/src/libs/widgets/common/sidebar.cpp b/src/libs/widgets/common/sidebar.cpp
index a1bcd752..2b00d670 100644
--- a/src/libs/widgets/common/sidebar.cpp
+++ b/src/libs/widgets/common/sidebar.cpp
@@ -140,7 +140,7 @@ TQSplitter* Sidebar::splitter() const
 
 void Sidebar::loadViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(TQString("%1").arg(name()));
 
     int tab        = config->readNumEntry("ActiveTab", 0);
@@ -167,7 +167,7 @@ void Sidebar::loadViewState()
 
 void Sidebar::saveViewState()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(TQString("%1").arg(name()));
     config->writeEntry("ActiveTab", d->activeTab);
     config->writeEntry("Minimized", d->minimized);
diff --git a/src/libs/widgets/imageplugins/imagepanelwidget.cpp b/src/libs/widgets/imageplugins/imagepanelwidget.cpp
index 4551e09e..6e62dae1 100644
--- a/src/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/src/libs/widgets/imageplugins/imagepanelwidget.cpp
@@ -212,7 +212,7 @@ ImageRegionWidget *ImagePanelWidget::previewWidget() const
 
 void ImagePanelWidget::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
     int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert);
     mode     = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode);
@@ -231,7 +231,7 @@ void ImagePanelWidget::readSettings()
 
 void ImagePanelWidget::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry( "Separate View", d->separateView->selectedId() );
     config->sync();
diff --git a/src/libs/widgets/imageplugins/imagepannelwidget.cpp b/src/libs/widgets/imageplugins/imagepannelwidget.cpp
index cebf0f3c..336d59ef 100644
--- a/src/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/src/libs/widgets/imageplugins/imagepannelwidget.cpp
@@ -291,7 +291,7 @@ ImagePannelWidget::~ImagePannelWidget()
 
 void ImagePannelWidget::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
     int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert);
     mode     = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode);
@@ -310,7 +310,7 @@ void ImagePannelWidget::readSettings()
     
 void ImagePannelWidget::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry( "Separate View", d->separateView->selectedId() );
     config->sync();
diff --git a/src/libs/widgets/imageplugins/imagewidget.cpp b/src/libs/widgets/imageplugins/imagewidget.cpp
index ab73bbf7..949b19aa 100644
--- a/src/libs/widgets/imageplugins/imagewidget.cpp
+++ b/src/libs/widgets/imageplugins/imagewidget.cpp
@@ -322,7 +322,7 @@ void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint &
 
 void ImageWidget::readSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
 
     d->underExposureButton->setOn(config->readBoolEntry("Under Exposure Indicator", false));
@@ -336,7 +336,7 @@ void ImageWidget::readSettings()
     
 void ImageWidget::writeSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry("Separate View", getRenderingPreviewMode());
     config->writeEntry("Under Exposure Indicator", d->underExposureButton->isOn());
diff --git a/src/libs/widgets/metadata/gpswidget.cpp b/src/libs/widgets/metadata/gpswidget.cpp
index 033423e9..3957e2f1 100644
--- a/src/libs/widgets/metadata/gpswidget.cpp
+++ b/src/libs/widgets/metadata/gpswidget.cpp
@@ -212,7 +212,7 @@ void GPSWidget::slotGPSDetails()
         }
     }
     
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 TQString GPSWidget::getMetadataTitle()
diff --git a/src/libs/widgets/metadata/metadatawidget.cpp b/src/libs/widgets/metadata/metadatawidget.cpp
index d0bd5b19..adcc8904 100644
--- a/src/libs/widgets/metadata/metadatawidget.cpp
+++ b/src/libs/widgets/metadata/metadatawidget.cpp
@@ -100,7 +100,7 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
     d = new MetadataWidgetPriv;
 
     d->mainLayout = new TQGridLayout(this, 3, 4, KDialog::spacingHint(), KDialog::spacingHint());
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();
 
     d->levelButtons = new TQHButtonGroup(this);
     d->levelButtons->setInsideMargin( 0 );
diff --git a/src/showfoto/setup/setup.cpp b/src/showfoto/setup/setup.cpp
index 85ec82d2..978967f7 100644
--- a/src/showfoto/setup/setup.cpp
+++ b/src/showfoto/setup/setup.cpp
@@ -122,7 +122,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
         showPage((int) page);
     else 
     {
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("General Settings");
         showPage(config->readNumEntry("Setup Page", EditorPage));        
     }
@@ -132,7 +132,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
 
 Setup::~Setup()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("General Settings");
     config->writeEntry("Setup Page", activePageIndex());
     config->sync();    
diff --git a/src/showfoto/setup/setupeditor.cpp b/src/showfoto/setup/setupeditor.cpp
index 19bab8fb..9e2c17cf 100644
--- a/src/showfoto/setup/setupeditor.cpp
+++ b/src/showfoto/setup/setupeditor.cpp
@@ -202,7 +202,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e)
 
 void SetupEditor::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     TQColor Black(TQt::black);
     TQColor White(TQt::white);
     config->setGroup("ImageViewer Settings");
@@ -224,7 +224,7 @@ void SetupEditor::readSettings()
 
 void SetupEditor::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked());
     config->writeEntry("BackgroundColor",         d->backgroundColor->color());
diff --git a/src/showfoto/setup/setuptooltip.cpp b/src/showfoto/setup/setuptooltip.cpp
index d3a08678..3e5cc047 100644
--- a/src/showfoto/setup/setuptooltip.cpp
+++ b/src/showfoto/setup/setuptooltip.cpp
@@ -177,7 +177,7 @@ SetupToolTip::~SetupToolTip()
 
 void SetupToolTip::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     d->showToolTipsBox->setChecked(config->readBoolEntry("Show ToolTips", true));
@@ -202,7 +202,7 @@ void SetupToolTip::readSettings()
 
 void SetupToolTip::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     config->writeEntry("Show ToolTips", d->showToolTipsBox->isChecked());
diff --git a/src/showfoto/showfoto.cpp b/src/showfoto/showfoto.cpp
index 42575833..605524a6 100644
--- a/src/showfoto/showfoto.cpp
+++ b/src/showfoto/showfoto.cpp
@@ -162,12 +162,12 @@ ShowFoto::ShowFoto(const KURL::List& urlList)
 
     // -- Show splash at start ----------------------------
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     TDEGlobal::dirs()->addResourceType("data", TDEGlobal::dirs()->kde_default("data") + "digikam");
     TDEGlobal::iconLoader()->addAppDir("digikam");
 
-    if(config->readBoolEntry("ShowSplash", true) && !kapp->isRestored())
+    if(config->readBoolEntry("ShowSplash", true) && !tdeApp->isRestored())
     {
         d->splash = new Digikam::SplashScreen("showfoto-splash.png");
         d->splash->show();
@@ -356,7 +356,7 @@ void ShowFoto::show()
 
     // Report errors from ICC repository path.
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     if(!d->validIccPath)
     {
         TQString message = i18n("<qt><p>The ICC profile path seems to be invalid.</p>"
@@ -407,7 +407,7 @@ void ShowFoto::setupConnections()
 
 void ShowFoto::setupUserArea()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     TQWidget* widget = new TQWidget(this);
@@ -509,7 +509,7 @@ void ShowFoto::readSettings()
 {
     readStandardSettings();
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     d->showBarAction->setChecked(config->readBoolEntry("Show Thumbnails", true));
@@ -531,7 +531,7 @@ void ShowFoto::saveSettings()
 {
     saveStandardSettings();
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     config->writeEntry("Last Opened Directory", d->lastOpenedDirectory.path() );
@@ -549,7 +549,7 @@ void ShowFoto::applySettings()
 {
     applyStandardSettings();
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     // Current image deleted go to trash ?
@@ -754,7 +754,7 @@ bool ShowFoto::setup(bool iccSetupPage)
     if (setup.exec() != TQDialog::Accepted)
         return false;
 
-    kapp->config()->sync();
+    tdeApp->config()->sync();
 
     applySettings();
 
@@ -873,7 +873,7 @@ void ShowFoto::openFolder(const KURL& url)
 
     // Determine sort ordering for the entries from configuration setting:
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     int flag;
 
@@ -1190,7 +1190,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett
 {
     if (!d->thumbBar->countItems()) return;
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     settings.exifRotate = config->readBoolEntry("EXIF Rotate", true);
@@ -1214,7 +1214,7 @@ void ShowFoto::slideShow(bool startWithCurrent, Digikam::SlideShowSettings& sett
         settings.pictInfoMap.insert(*it, pictInfo);
 
         m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     m_nameLabel->progressBarMode(Digikam::StatusProgressBar::TextMode, TQString());
diff --git a/src/themedesigner/mainwindow.cpp b/src/themedesigner/mainwindow.cpp
index f51a4f64..ae4ef0d7 100644
--- a/src/themedesigner/mainwindow.cpp
+++ b/src/themedesigner/mainwindow.cpp
@@ -231,7 +231,7 @@ MainWindow::MainWindow()
     m_folderView->setResizeMode(TQListView::LastColumn);
     m_folderView->setRootIsDecorated(true);
 
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();    
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();    
     for (int i=0; i<10; i++)
     {
         FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").arg(i));
diff --git a/src/themedesigner/themediconitem.cpp b/src/themedesigner/themediconitem.cpp
index 2ed7df80..9e90beda 100644
--- a/src/themedesigner/themediconitem.cpp
+++ b/src/themedesigner/themediconitem.cpp
@@ -135,7 +135,7 @@ void ThemedIconItem::paintItem()
 
     {
         r = view->itemPixmapRect();
-        TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();    
+        TDEIconLoader *iconLoader = tdeApp->iconLoader();    
         TQPixmap thumbnail = iconLoader->loadIcon("colors", TDEIcon::NoGroup,
                                                  100, TDEIcon::DefaultState, 0, true);
         
diff --git a/src/utilities/batch/batchalbumssyncmetadata.cpp b/src/utilities/batch/batchalbumssyncmetadata.cpp
index fba18d34..fab48652 100644
--- a/src/utilities/batch/batchalbumssyncmetadata.cpp
+++ b/src/utilities/batch/batchalbumssyncmetadata.cpp
@@ -128,7 +128,7 @@ void BatchAlbumsSyncMetadata::parseAlbum()
 
 void BatchAlbumsSyncMetadata::slotAlbumParsed(const ImageInfoList& list)
 {
-    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = tdeApp->iconLoader()->loadIcon(
                   "folder_image", TDEIcon::NoGroup, 32);
 
     ImageInfoList imageInfoList = list;
diff --git a/src/utilities/batch/batchsyncmetadata.cpp b/src/utilities/batch/batchsyncmetadata.cpp
index 50e2ad7a..a9403f10 100644
--- a/src/utilities/batch/batchsyncmetadata.cpp
+++ b/src/utilities/batch/batchsyncmetadata.cpp
@@ -144,7 +144,7 @@ void BatchSyncMetadata::parsePicture()
 
         d->imageInfo = d->imageInfoList.next();
 
-        kapp->processEvents();
+        tdeApp->processEvents();
         parsePicture();
     }
 }
diff --git a/src/utilities/cameragui/albumselectdialog.cpp b/src/utilities/cameragui/albumselectdialog.cpp
index 486c4711..eed8b627 100644
--- a/src/utilities/cameragui/albumselectdialog.cpp
+++ b/src/utilities/cameragui/albumselectdialog.cpp
@@ -101,7 +101,7 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect,
     TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 1, 0, spacingHint());
 
     TQLabel *logo = new TQLabel(plainPage());
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));
 
     TQLabel *message = new TQLabel(plainPage());
@@ -216,7 +216,7 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
         return;
     }
 
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();
     TQPixmap icon            = iconLoader->loadIcon("folder", TDEIcon::NoGroup,
                                                    AlbumSettings::instance()->getDefaultTreeIconSize(),
                                                    TDEIcon::DefaultState, 0, true);
diff --git a/src/utilities/cameragui/camerafolderdialog.cpp b/src/utilities/cameragui/camerafolderdialog.cpp
index 93feb0ab..2cd48e5d 100644
--- a/src/utilities/cameragui/camerafolderdialog.cpp
+++ b/src/utilities/cameragui/camerafolderdialog.cpp
@@ -64,7 +64,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV
     TQLabel *logo    = new TQLabel(page);
     TQLabel *message = new TQLabel(page);
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));    
     message->setText(i18n("<p>Please select the camera folder "
                           "where you want to upload the images.</p>"));
diff --git a/src/utilities/cameragui/cameraiconview.cpp b/src/utilities/cameragui/cameraiconview.cpp
index ba496217..7b6b9fba 100644
--- a/src/utilities/cameragui/cameraiconview.cpp
+++ b/src/utilities/cameragui/cameraiconview.cpp
@@ -309,7 +309,7 @@ void CameraIconView::addItem(const GPItemInfo& info)
     }
     else
     {
-        TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+        TDEIconLoader *iconLoader = tdeApp->iconLoader();
         thumb = iconLoader->loadIcon("application-x-zerosize", TDEIcon::Desktop,
                                      ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true)
                                      .convertToImage();
@@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
     if (d->cameraUI->isBusy())
         return;
 
-    TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
+    TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard);
     if(!data || !TQUriDrag::canDecode(data))
         return;
 
diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp
index 8b531ea2..157dbaea 100644
--- a/src/utilities/cameragui/cameraui.cpp
+++ b/src/utilities/cameragui/cameraui.cpp
@@ -450,7 +450,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
     // -------------------------------------------------------------------------
 
     TQPushButton *helpButton = actionButton( Help );
-    d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false);
+    d->helpMenu = new KHelpMenu(this, tdeApp->aboutData(), false);
     d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"),
                                     this, TQ_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0);
     helpButton->setPopup( d->helpMenu->menu() );
@@ -591,7 +591,7 @@ CameraUI::~CameraUI()
 
 void CameraUI::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Camera Settings");
     d->advBox->setCurrentIndex(config->readNumEntry("Settings Tab", CameraUIPriv::RENAMEFILEPAGE));
     d->autoRotateCheck->setChecked(config->readBoolEntry("AutoRotate", true));
@@ -623,7 +623,7 @@ void CameraUI::saveSettings()
 {
     saveDialogSize("Camera Settings");
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Camera Settings");
     config->writeEntry("Settings Tab", d->advBox->currentIndex());
     config->writeEntry("AutoRotate", d->autoRotateCheck->isChecked());
@@ -642,7 +642,7 @@ void CameraUI::saveSettings()
 
 void CameraUI::slotProcessURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 bool CameraUI::isBusy() const
diff --git a/src/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp
index a906ccb1..4d593959 100644
--- a/src/utilities/cameragui/renamecustomizer.cpp
+++ b/src/utilities/cameragui/renamecustomizer.cpp
@@ -464,7 +464,7 @@ void RenameCustomizer::slotDateTimeButtonClicked()
 
 void RenameCustomizer::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     
     config->setGroup("Camera Settings");
     bool def         = config->readBoolEntry("Rename Use Default", true);
@@ -507,7 +507,7 @@ void RenameCustomizer::readSettings()
 
 void RenameCustomizer::saveSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("Camera Settings");
     config->writeEntry("Rename Use Default", d->renameDefault->isChecked());
diff --git a/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index 1403773f..199c9f5d 100644
--- a/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/src/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
@@ -105,7 +105,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
     
     previewOriginal->setPixmap(preview->convertToPixmap());
     previewTarget->setPixmap(preview->convertToPixmap(m_iccTrans));
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));    
     
     grid->addMultiCellWidget(originalTitle, 0, 0, 0, 0);
diff --git a/src/utilities/imageeditor/editor/editortool.cpp b/src/utilities/imageeditor/editor/editortool.cpp
index b840e673..9117a780 100644
--- a/src/utilities/imageeditor/editor/editortool.cpp
+++ b/src/utilities/imageeditor/editor/editortool.cpp
@@ -331,7 +331,7 @@ void EditorToolThreaded::customEvent(TQCustomEvent *e)
                     DDebug() << "Final" << toolName() << " completed..." << endl;
                     putFinalData();
                     EditorToolIface::editorToolIface()->setToolStopProgress();
-                    kapp->restoreOverrideCursor();
+                    tdeApp->restoreOverrideCursor();
                     emit okClicked();
                     break;
                 }
@@ -388,7 +388,7 @@ void EditorToolThreaded::slotOk()
     toolSettings()->enableButton(EditorToolSettings::Try,     false);
 
     EditorToolIface::editorToolIface()->setToolStartProgress(d->progressMess.isEmpty() ? toolName() : d->progressMess);
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
 
     if (d->threadedFilter)
     {
@@ -429,7 +429,7 @@ void EditorToolThreaded::slotCancel()
 {
     writeSettings();
     slotAbort();
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     emit cancelClicked();
 }
 
diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp
index eed7cfea..657a0eae 100644
--- a/src/utilities/imageeditor/editor/editorwindow.cpp
+++ b/src/utilities/imageeditor/editor/editorwindow.cpp
@@ -618,7 +618,7 @@ void EditorWindow::printImage(KURL url)
     DImg image(w, h, sixteenBit, hasAlpha, ptr);
 
     KPrinter printer;
-    TQString appName = TDEApplication::kApplication()->aboutData()->appName();
+    TQString appName = tdeApp->aboutData()->appName();
     printer.setDocName( url.filename() );
     printer.setCreator( appName );
 #if KDE_IS_VERSION(3,2,0)
@@ -837,7 +837,7 @@ void EditorWindow::unLoadImagePlugins()
 
 void EditorWindow::readStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     // Restore full screen Mode ?
@@ -856,7 +856,7 @@ void EditorWindow::readStandardSettings()
 
 void EditorWindow::applyStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     // -- Settings for Color Management stuff ----------------------------------------------
 
@@ -966,7 +966,7 @@ void EditorWindow::applyStandardSettings()
 
 void EditorWindow::saveStandardSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     config->writeEntry("AutoZoom", d->zoomFitToWindowAction->isChecked());
@@ -1557,7 +1557,7 @@ bool EditorWindow::startingSaveAs(const KURL& url)
     imageFileSaveDialog.setFilter(mimetypes);
 
     TQFileInfo info(m_savingContext->srcURL.fileName());
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     TQString ext      = config->readEntry("LastSavedImageTypeMime", "png");
     TQString fileName = info.baseName(false) + TQString(".") + ext;
@@ -1763,7 +1763,7 @@ void EditorWindow::slotToggleColorManagedView()
         // Save Color Managed View setting in config file. For performance
         // reason, no need to flush file, it cached in memory and will be flushed
         // to disk at end of session.
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("Color Management");
         config->writeEntry("ManagedView", cmv);
     }
@@ -1839,17 +1839,17 @@ void EditorWindow::setOverExposureToolTip(bool oei)
 
 void EditorWindow::slotDonateMoney()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void EditorWindow::slotContribute()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void EditorWindow::slotToggleSlideShow()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false);
 
@@ -1886,7 +1886,7 @@ void EditorWindow::slotThemeChanged()
 
     m_themeMenuAction->setCurrentItem(index);
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
 
     if (!config->readBoolEntry("UseThemeBackgroundColor", true))
diff --git a/src/utilities/imageeditor/editor/imagewindow.cpp b/src/utilities/imageeditor/editor/imagewindow.cpp
index 2c10a6f6..94dc584b 100644
--- a/src/utilities/imageeditor/editor/imagewindow.cpp
+++ b/src/utilities/imageeditor/editor/imagewindow.cpp
@@ -772,7 +772,7 @@ bool ImageWindow::setup(bool iccSetupPage)
     if (setup.exec() != TQDialog::Accepted)
         return false;
 
-    kapp->config()->sync();
+    tdeApp->config()->sync();
 
     applySettings();
     return true;
@@ -1084,7 +1084,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
             settings.pictInfoMap.insert(info->kurl(), pictInfo);
 
             m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
     else
@@ -1106,7 +1106,7 @@ void ImageWindow::slideShow(bool startWithCurrent, SlideShowSettings& settings)
             settings.pictInfoMap.insert(*it, pictInfo);
 
             m_nameLabel->setProgressValue((int)((i++/cnt)*100.0));
-            kapp->processEvents();
+            tdeApp->processEvents();
         }
     }
 
diff --git a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp
index bf0ee67e..ac7ca43e 100644
--- a/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp
+++ b/src/utilities/imageeditor/rawimport/rawsettingsbox.cpp
@@ -507,7 +507,7 @@ CurvesWidget* RawSettingsBox::curve() const
 
 void RawSettingsBox::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("RAW Import Settings");
 
     d->channelCB->setCurrentItem(config->readNumEntry("Histogram Channel", RawSettingsBoxPriv::LuminosityChannel));
@@ -582,7 +582,7 @@ void RawSettingsBox::readSettings()
 
 void RawSettingsBox::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("RAW Import Settings");
 
     config->writeEntry("Histogram Channel",          d->channelCB->currentItem());
diff --git a/src/utilities/imageeditor/tools/imageprint.cpp b/src/utilities/imageeditor/tools/imageprint.cpp
index 5cab236b..f1ffef05 100644
--- a/src/utilities/imageeditor/tools/imageprint.cpp
+++ b/src/utilities/imageeditor/tools/imageprint.cpp
@@ -204,7 +204,7 @@ bool ImagePrint::printImageWithTQt()
     
         if (size.width() > w || size.height() > h) 
         {
-            int resp = KMessageBox::warningYesNoCancel(TDEApplication::kApplication()->mainWidget(),
+            int resp = KMessageBox::warningYesNoCancel(tdeApp->mainWidget(),
                 i18n("The image will not fit on the page, what do you want to do?"),
                 TQString(),KStdGuiItem::cont(),
                 i18n("Shrink") );
@@ -300,7 +300,7 @@ TQString ImagePrint::minimizeString( TQString text, const TQFontMetrics& metrics
 
 void ImagePrint::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("Color Management");
 
@@ -740,7 +740,7 @@ void ImageEditorPrintDialogPage::slotUnitChanged(const TQString& string)
 
 void ImageEditorPrintDialogPage::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
     d->cmEnabled = config->readBoolEntry("EnableCM", false);
 }
diff --git a/src/utilities/imageeditor/tools/imageresize.cpp b/src/utilities/imageeditor/tools/imageresize.cpp
index c779b71e..a681d187 100644
--- a/src/utilities/imageeditor/tools/imageresize.cpp
+++ b/src/utilities/imageeditor/tools/imageresize.cpp
@@ -303,7 +303,7 @@ void ImageResize::slotRestorationToggled(bool b)
 
 void ImageResize::readUserSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("resize Tool Dialog");
 
     GreycstorationSettings settings;
@@ -350,7 +350,7 @@ void ImageResize::readUserSettings()
 void ImageResize::writeUserSettings()
 {
     GreycstorationSettings settings = d->settingsWidget->getSettings();
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("resize Tool Dialog");
     config->writeEntry("FastApprox", settings.fastApprox);
     config->writeEntry("Interpolation", settings.interp);
@@ -482,7 +482,7 @@ void ImageResize::slotCancel()
 
 void ImageResize::processCImgURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void ImageResize::closeEvent(TQCloseEvent *e)
diff --git a/src/utilities/lighttable/lighttablewindow.cpp b/src/utilities/lighttable/lighttablewindow.cpp
index 58409aef..961bb82b 100644
--- a/src/utilities/lighttable/lighttablewindow.cpp
+++ b/src/utilities/lighttable/lighttablewindow.cpp
@@ -129,7 +129,7 @@ LightTableWindow::~LightTableWindow()
 
 void LightTableWindow::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("LightTable Settings");
 
     if(config->hasKey("Vertical Splitter Sizes"))
@@ -144,7 +144,7 @@ void LightTableWindow::readSettings()
 
 void LightTableWindow::writeSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("LightTable Settings");
     config->writeEntry("Vertical Splitter Sizes", d->vSplitter->sizes());
     config->writeEntry("Horizontal Splitter Sizes", d->hSplitter->sizes());
@@ -154,7 +154,7 @@ void LightTableWindow::writeSettings()
 
 void LightTableWindow::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("LightTable Settings");
 
     d->autoLoadOnRightPanel  = config->readBoolEntry("Auto Load Right Panel",   true);
@@ -1261,7 +1261,7 @@ void LightTableWindow::slotFitToWindow()
 
 void LightTableWindow::slotToggleSlideShow()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     bool startWithCurrent = config->readBoolEntry("SlideShowStartCurrent", false);
 
@@ -1309,7 +1309,7 @@ void LightTableWindow::slideShow(bool startWithCurrent, SlideShowSettings& setti
         settings.fileList.append(info->kurl());
 
         d->statusProgressBar->setProgressValue((int)((i++/(float)list.count())*100.0));
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     d->statusProgressBar->progressBarMode(StatusProgressBar::TextMode, TQString());
@@ -1491,12 +1491,12 @@ void LightTableWindow::unplugActionAccel(TDEAction* action)
 
 void LightTableWindow::slotDonateMoney()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void LightTableWindow::slotContribute()
 {
-    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    tdeApp->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void LightTableWindow::slotEditKeys()
@@ -1529,7 +1529,7 @@ void LightTableWindow::slotSetup()
     if (setup.exec() != TQDialog::Accepted)
         return;
 
-    kapp->config()->sync();
+    tdeApp->config()->sync();
 
     applySettings();
 }
diff --git a/src/utilities/setup/cameraselection.cpp b/src/utilities/setup/cameraselection.cpp
index 2cf2635c..4c564040 100644
--- a/src/utilities/setup/cameraselection.cpp
+++ b/src/utilities/setup/cameraselection.cpp
@@ -102,7 +102,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 {
     d = new CameraSelectionPriv;
 
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     setHelp("cameraselection.anchor", "digikam");
     d->UMSCameraNameActual = TQString("Directory Browse");   // Don't be i18n!
     d->UMSCameraNameShown  = i18n("Mounted Camera");
@@ -180,7 +180,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 
     TQLabel* logo = new TQLabel( box2 );
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 64, 
                     TDEIcon::DefaultState, 0, true));
 
@@ -246,7 +246,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 
     getCameraList();
     getSerialPortList();
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 CameraSelection::~CameraSelection()
diff --git a/src/utilities/setup/setup.cpp b/src/utilities/setup/setup.cpp
index bd47796f..e871c955 100644
--- a/src/utilities/setup/setup.cpp
+++ b/src/utilities/setup/setup.cpp
@@ -206,7 +206,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
         showPage((int) page);
     else 
     {
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("General Settings");
         showPage(config->readNumEntry("Setup Page", General));
     }
@@ -216,7 +216,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
 
 Setup::~Setup()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("General Settings");
     config->writeEntry("Setup Page", activePageIndex());
     config->sync();
diff --git a/src/utilities/setup/setupcamera.cpp b/src/utilities/setup/setupcamera.cpp
index 1b8d0bb8..6dc4edff 100644
--- a/src/utilities/setup/setupcamera.cpp
+++ b/src/utilities/setup/setupcamera.cpp
@@ -178,7 +178,7 @@ SetupCamera::~SetupCamera()
 
 void SetupCamera::processGphotoURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupCamera::slotSelectionChanged()
@@ -236,9 +236,9 @@ void SetupCamera::slotAutoDetectCamera()
 {
     TQString model, port;
     
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     int ret = GPCamera::autoDetect(model, port);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     
     if (ret != 0) 
     {
diff --git a/src/utilities/setup/setupdcraw.cpp b/src/utilities/setup/setupdcraw.cpp
index 57f9cb2d..7aa0cae2 100644
--- a/src/utilities/setup/setupdcraw.cpp
+++ b/src/utilities/setup/setupdcraw.cpp
@@ -102,7 +102,7 @@ void SetupDcraw::slotSixteenBitsImageToggled(bool)
 
 void SetupDcraw::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("SixteenBitsImage",        d->dcrawSettings->sixteenBits());
     config->writeEntry("WhiteBalance",            d->dcrawSettings->whiteBalance());
@@ -124,7 +124,7 @@ void SetupDcraw::applySettings()
 
 void SetupDcraw::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     d->dcrawSettings->setSixteenBits(config->readBoolEntry("SixteenBitsImage", false));
     d->dcrawSettings->setNoiseReduction(config->readBoolEntry("EnableNoiseReduction", false));
diff --git a/src/utilities/setup/setupeditor.cpp b/src/utilities/setup/setupeditor.cpp
index 337b5655..98381b22 100644
--- a/src/utilities/setup/setupeditor.cpp
+++ b/src/utilities/setup/setupeditor.cpp
@@ -148,7 +148,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e)
 
 void SetupEditor::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     TQColor Black(TQt::black);
     TQColor White(TQt::white);
     config->setGroup("ImageViewer Settings");
@@ -162,7 +162,7 @@ void SetupEditor::readSettings()
 
 void SetupEditor::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked());
     config->writeEntry("BackgroundColor",         d->backgroundColor->color());
diff --git a/src/utilities/setup/setupicc.cpp b/src/utilities/setup/setupicc.cpp
index b08750c1..3ff258ab 100644
--- a/src/utilities/setup/setupicc.cpp
+++ b/src/utilities/setup/setupicc.cpp
@@ -378,12 +378,12 @@ SetupICC::~SetupICC()
 
 void SetupICC::processLCMSURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupICC::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     config->writeEntry("EnableCM", d->enableColorManagement->isChecked());
@@ -417,7 +417,7 @@ void SetupICC::applySettings()
 
 void SetupICC::readSettings(bool restore)
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     if (!restore)
@@ -706,7 +706,7 @@ void SetupICC::slotToggleManagedView(bool b)
 
 bool SetupICC::iccRepositoryIsValid()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     // If color management is disable, no need to check anymore.
diff --git a/src/utilities/setup/setupiofiles.cpp b/src/utilities/setup/setupiofiles.cpp
index 6cdf23de..1e59dcac 100644
--- a/src/utilities/setup/setupiofiles.cpp
+++ b/src/utilities/setup/setupiofiles.cpp
@@ -111,7 +111,7 @@ SetupIOFiles::~SetupIOFiles()
 
 void SetupIOFiles::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue());
     config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue());
@@ -124,7 +124,7 @@ void SetupIOFiles::applySettings()
 
 void SetupIOFiles::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) );
     d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) ); // Medium subsampling
diff --git a/src/utilities/setup/setuplighttable.cpp b/src/utilities/setup/setuplighttable.cpp
index 0ed01eab..5134a930 100644
--- a/src/utilities/setup/setuplighttable.cpp
+++ b/src/utilities/setup/setuplighttable.cpp
@@ -108,7 +108,7 @@ SetupLightTable::~SetupLightTable()
 
 void SetupLightTable::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     TQColor Black(TQt::black);
     TQColor White(TQt::white);
     config->setGroup("LightTable Settings");
@@ -120,7 +120,7 @@ void SetupLightTable::readSettings()
 
 void SetupLightTable::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("LightTable Settings");
     config->writeEntry("FullScreen Hide ToolBar", d->hideToolBar->isChecked());
     config->writeEntry("Auto Sync Preview", d->autoSyncPreview->isChecked());
diff --git a/src/utilities/setup/setupmetadata.cpp b/src/utilities/setup/setupmetadata.cpp
index e4f74ede..185dfafe 100644
--- a/src/utilities/setup/setupmetadata.cpp
+++ b/src/utilities/setup/setupmetadata.cpp
@@ -186,7 +186,7 @@ SetupMetadata::~SetupMetadata()
 
 void SetupMetadata::processExiv2URL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupMetadata::applySettings()
diff --git a/src/utilities/setup/setupslideshow.cpp b/src/utilities/setup/setupslideshow.cpp
index 970d9c67..c42b8b10 100644
--- a/src/utilities/setup/setupslideshow.cpp
+++ b/src/utilities/setup/setupslideshow.cpp
@@ -130,7 +130,7 @@ SetupSlideShow::~SetupSlideShow()
 
 void SetupSlideShow::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("ImageViewer Settings");
     config->writeEntry("SlideShowDelay", d->delayInput->value());
@@ -147,7 +147,7 @@ void SetupSlideShow::applySettings()
 
 void SetupSlideShow::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
  
     config->setGroup("ImageViewer Settings");
     d->delayInput->setValue(config->readNumEntry("SlideShowDelay", 5));
diff --git a/src/utilities/slideshow/slideshow.cpp b/src/utilities/slideshow/slideshow.cpp
index 33cf9edc..08a4f997 100644
--- a/src/utilities/slideshow/slideshow.cpp
+++ b/src/utilities/slideshow/slideshow.cpp
@@ -438,7 +438,7 @@ void SlideShow::updatePixmap()
     {
         // End of Slide Show.
 
-        TQPixmap logo = kapp->iconLoader()->loadIcon("digikam", TDEIcon::NoGroup, 128,
+        TQPixmap logo = tdeApp->iconLoader()->loadIcon("digikam", TDEIcon::NoGroup, 128,
                                                     TDEIcon::DefaultState, 0, true);
 
         TQFont fn(font());
diff --git a/src/utilities/slideshow/toolbar.cpp b/src/utilities/slideshow/toolbar.cpp
index dbecd4ad..15956f42 100644
--- a/src/utilities/slideshow/toolbar.cpp
+++ b/src/utilities/slideshow/toolbar.cpp
@@ -75,7 +75,7 @@ ToolBar::ToolBar(TQWidget* parent)
     d->stopBtn = new TQToolButton(this);
     d->playBtn->setToggleButton(true);
 
-    TDEIconLoader* loader = kapp->iconLoader();
+    TDEIconLoader* loader = tdeApp->iconLoader();
     d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
     d->prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
     d->nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
@@ -153,14 +153,14 @@ void ToolBar::slotPlayBtnToggled()
     if (d->playBtn->isOn())
     {
         d->canHide = false;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }
     else
     {
         d->canHide = true;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         d->playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
         emit signalPlay();
     }
@@ -172,7 +172,7 @@ void ToolBar::slotNexPrevClicked()
     {
         d->playBtn->setOn(true);
         d->canHide = false;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         d->playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }