diff --git a/kcal/htmlexportsettings.kcfg b/kcal/htmlexportsettings.kcfg
index 9ba8e8503..8d61c7674 100644
--- a/kcal/htmlexportsettings.kcfg
+++ b/kcal/htmlexportsettings.kcfg
@@ -1,149 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <include>kcal/kcal_export.h</include>
-  <include>klocale.h</include>
   <kcfgfile name="libkcal_htmlexportrc">
     <parameter name="application" />
   </kcfgfile>
 
   <group name="$(application)-General">
     <entry type="String" key="Name">
       <label>Full name of the calendar owner</label>
       <whatsthis>WhatsThis text for FullName setting</whatsthis>
     </entry>
     <entry type="String" key="EMail">
       <label>Email of the calendar owner</label>
       <whatsthis>WhatsThis text for Email setting</whatsthis>
     </entry>
     <entry type="String" key="Credit Name">
       <label>Creator application</label>
       <whatsthis>Creator application of the calendar</whatsthis>
     </entry>
     <entry type="String" key="Credit URL">
       <label>Creator URL</label>
       <whatsthis>URL of the creator application of the calendar.</whatsthis>
       <default></default>
     </entry>
     <entry type="String" key="Page Title">
       <label>Page Title</label>
       <default code="true">i18n("Calendar")</default>
     </entry>
 
     <entry type="DateTime" key="Date Start">
       <label>Date start</label>
       <whatsthis>First day of the range that shall be exported to HTML.</whatsthis>
     </entry>
     <entry type="DateTime" key="Date End">
       <label>Date end</label>
       <whatsthis>Last day of the range that shall be exported to HTML.</whatsthis>
     </entry>
 
     <entry type="Path" key="Output File">
       <label>Output filename</label>
       <whatsthis>The output file name for the HTML export.</whatsthis>
       <default>$HOME/calendar.html</default>
     </entry>
     <entry type="String" key="Style Sheet">
       <label>Style sheet</label>
       <whatsthis>CSS style sheet to be used by the final HTML page. This string contains the actual contents of the CSS, not a path to the style sheet.</whatsthis>
     </entry>
 
     <entry type="Bool" key="Exclude Private">
       <label>Exclude private incidences from the export</label>
       <default>true</default>
     </entry>
     <entry type="Bool" key="Exclude Confidential">
       <label>Exclude confidential incidences from the export</label>
       <default>true</default>
     </entry>
 
   </group>
 
   <group name="$(application)-Events">
     <entry type="Bool" key="Event View">
       <label>Export events as list</label>
       <default>false</default>
     </entry>
     <entry type="Bool" key="Month View">
       <label>Export in month view</label>
       <default>true</default>
     </entry>
     <entry type="Bool" key="Week View">
       <label>Export in week view</label>
       <default>false</default>
     </entry>
     <entry type="String" name="EventTitle" key="Title">
       <label>Title of the calendar</label>
       <default code="true">i18n("Calendar")</default>
     </entry>
 
     <entry type="Bool" name="EventLocation" key="Export Location">
       <label>Export location of the events</label>
       <default>true</default>
     </entry>
     <entry type="Bool" name="EventCategories" key="Export Categories">
       <label>Export categories of the events</label>
       <default>true</default>
     </entry>
     <entry type="Bool" name="EventAttendees" key="Export Attendees">
       <label>Export attendees of the events</label>
       <default>false</default>
     </entry>
 
   </group>
 
   <group name="$(application)-Todos">
     <entry type="Bool" key="Todo View">
       <label>Export to-do list</label>
       <default>true</default>
     </entry>
     <entry type="String" key="TodoList Title">
       <label>Title of the to-do list</label>
       <default code="true">i18n("To-do List")</default>
     </entry>
 
     <entry type="Bool" name="TaskDueDate" key="Export Due Date">
       <label>Export due dates of the to-dos</label>
       <default>true</default>
     </entry>
     <entry type="Bool" name="TaskLocation" key="Export Location">
       <label>Export location of the to-dos</label>
       <default>true</default>
     </entry>
     <entry type="Bool" name="TaskCategories" key="Export Categories">
       <label>Export categories of the to-dos</label>
       <default>true</default>
     </entry>
     <entry type="Bool" name="TaskAttendees" key="Export Attendees">
       <label>Export attendees of the to-dos</label>
       <default>false</default>
     </entry>
 
   </group>
 
   <group name="$(application)-Journals">
     <entry type="Bool" key="Journal View">
       <label>Export journals</label>
       <default>false</default>
     </entry>
     <entry type="String" key="Journal Title">
       <label>Title of the journal list</label>
       <default code="true">i18n("Journals")</default>
     </entry>
   </group>
 
   <group name="$(application)-FreeBusy">
     <entry type="Bool" key="FreeBusy View">
       <label>Export journals</label>
       <default>false</default>
     </entry>
     <entry type="String" name="FreeBusyTitle" key="Free/Busy Title">
       <label>Title of the free/busy list</label>
       <default code="true">i18n("Busy times")</default>
     </entry>
   </group>
 
 </kcfg>
diff --git a/mailtransport/mailtransport.kcfg b/mailtransport/mailtransport.kcfg
index 05859e71d..d4bad38ed 100644
--- a/mailtransport/mailtransport.kcfg
+++ b/mailtransport/mailtransport.kcfg
@@ -1,113 +1,112 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <kcfgfile name="mailtransports">
     <parameter name="transportId" />
   </kcfgfile>
-  <include>KLocale</include>
 
   <group name="Transport $(transportId)">
     <entry name="id" type="Int">
       <label>Unique identifier</label>
       <default>0</default>
     </entry>
     <entry name="name" type="String">
       <label>User-visible transport name</label>
       <whatsthis>The name that will be used when referring to this server.</whatsthis>
       <default code="true">i18n("Unnamed")</default>
     </entry>
     <entry name="type" type="Enum">
       <choices>
         <choice name="SMTP">
           <label>SMTP Server</label>
         </choice>
         <choice name="Sendmail">
           <label>Local sendmail</label>
         </choice>
       </choices>
       <label>Transport type</label>
       <default>SMTP</default>
     </entry>
     <entry name="host" type="String">
       <label>Host name of the server</label>
       <whatsthis>The domain name or numerical address of the SMTP server.</whatsthis>
     </entry>
     <entry name="port" type="UInt">
       <label>Port number of the server</label>
       <whatsthis>The port number that the SMTP server is listening on. The default port is 25.</whatsthis>
       <default>25</default>
     </entry>
     <entry name="userName" type="String" key="user">
       <label>User name needed for login</label>
       <whatsthis>The user name to send to the server for authorization.</whatsthis>
     </entry>
     <entry name="precommand" type="String">
       <label>Command to execute before sending a mail</label>
       <whatsthis>
         A command to run locally, prior to sending email.
         This can be used to set up SSH tunnels, for example.
         Leave it empty if no command should be run.
       </whatsthis>
     </entry>
     <entry name="requiresAuthentication" type="Bool" key="auth">
       <label>Server requires authentication</label>
       <whatsthis>
         Check this option if your SMTP server requires authentication before accepting mail.
         This is known as 'Authenticated SMTP' or simply ASMTP.
       </whatsthis>
       <default>false</default>
     </entry>
     <entry name="storePassword" type="Bool" key="storepass">
       <label>Store password</label>
       <whatsthis>
         Check this option to have your password stored.
         If KWallet is available the password will be stored there which is considered safe.
         However, if KWallet is not available, the password will be stored in the configuration file.
         The password is stored in an obfuscated format, but should not be considered secure from decryption efforts if access to the configuration file is obtained.
       </whatsthis>
       <default>false</default>
     </entry>
     <entry name="encryption" type="Enum">
       <label>Encryption method used for communication</label>
       <choices>
         <choice name="None">
           <label>No encryption</label>
         </choice>
         <choice name="SSL">
           <label>SSL encryption</label>
         </choice>
         <choice name="TLS">
           <label>TLS encryption</label>
         </choice>
       </choices>
     </entry>
     <entry name="authenticationType" type="Enum" key="authtype">
       <label>Authentication method</label>
       <choices>
         <!-- TODO - -> _ conversion? -->
         <choice name="LOGIN"/>
         <choice name="PLAIN"/>
         <choice name="CRAM_MD5"/>
         <choice name="DIGEST_MD5"/>
         <choice name="GSSAPI"/>
         <choice name="NTLM"/>
         <choice name="APOP" />
         <choice name="CLEAR" />
         <choice name="ANONYMOUS" />
       </choices>
       <default>PLAIN</default>
     </entry>
     <entry name="specifyHostname" type="Bool">
       <label><!-- TODO --></label>
       <whatsthis>Check this option to use a custom hostname when identifying to the mail server. This is useful when your system's hostname may not be set correctly or to mask your system's true hostname.</whatsthis>
       <default>false</default>
     </entry>
     <entry name="localHostname" type="String">
       <label><!-- TODO --></label>
       <whatsthis>Enter the hostname that should be used when identifying to the server.</whatsthis>
     </entry>
   </group>
 
 </kcfg>