File 4_3_BRANCH.diff of Package kdepim4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_3_BRANCH.diff of Package kdepim4 (Revision be33e285c8d7a8b0f53dd9679709d8c8)

Currently displaying revision be33e285c8d7a8b0f53dd9679709d8c8 , Show latest

package: kdepim-4.3.1.tar.bz2
kdemod: kdepim
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 1027708
+svn di between //tags/KDE/4.3.1/kdepim and //branches/KDE/4.3/kdepim
--- akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop
+++ akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop
@@ -9,6 +9,7 @@
 Name[da]=Metakit lagringsgrænseflade
 Name[de]=Metakit Archiv-Modul
 Name[el]=Σύστημα υποστήριξης αποθήκευσης Metakit
+Name[en_GB]=Metakit storage backend
 Name[eo]=Metakit datumstora maŝino
 Name[es]=Motor de almacenamiento Metakit
 Name[et]=Metakiti salvestamisrakendus
@@ -18,7 +19,7 @@
 Name[fr]=Stockage avec Metakit
 Name[fy]=Metakit-opslachefterein
 Name[ga]=Inneall stórála Metakit
-Name[gl]=Manexador do almacenador Metakit
+Name[gl]=Infraestrutura do almacenador Metakit
 Name[hu]=Metakit tároló
 Name[is]=Metakit geymslu bakendi
 Name[it]=Backend archiviazione metakit
@@ -41,6 +42,7 @@
 Name[pt_BR]=Infraestrutura de armazenamento Metakit
 Name[ro]=Suport de stocare Metakit
 Name[ru]=Хранилище Metakit
+Name[sk]=Metakit storage backend
 Name[sl]=Shranjevanje Metakit
 Name[sv]=Metakit lagringsgränssnitt
 Name[tr]=Metakit depolama arka ucu
@@ -57,8 +59,10 @@
 Comment[br]=Lugent evit Akregator
 Comment[ca]=Connector per a l'Akregator
 Comment[cs]=Modul pro Akregator
+Comment[da]=Plugin for Akregator
 Comment[de]=Modul für Akregator
 Comment[el]=Πρόσθετο για το Akregator
+Comment[en_GB]=Plugin for Akregator
 Comment[eo]=Kromprogramo por Akregator
 Comment[es]=Complemento para Akregator
 Comment[et]=Akregatori plugin
--- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
+++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
@@ -7,6 +7,7 @@
 Name[da]=Akregator-understøttelse af online feed-læser
 Name[de]=Akregator-Unterstützung für Online-Leser
 Name[el]=Υποστήριξη αναγνώστη ροών Akregator
+Name[en_GB]=Akregator Online Feed Reader Support
 Name[es]=Soporte para el lector de fuentes en línea de Akregator
 Name[et]=Akregatori uudistevoogude võrgulugejate toetus
 Name[fr]=Prise en charge des lecteurs en ligne pour Akregator
@@ -43,8 +44,10 @@
 Comment[br]=Lugent evit Akregator
 Comment[ca]=Connector per a l'Akregator
 Comment[cs]=Modul pro Akregator
+Comment[da]=Plugin for Akregator
 Comment[de]=Modul für Akregator
 Comment[el]=Πρόσθετο για το Akregator
+Comment[en_GB]=Plugin for Akregator
 Comment[eo]=Kromprogramo por Akregator
 Comment[es]=Complemento para Akregator
 Comment[et]=Akregatori plugin
--- akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
+++ akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
@@ -18,6 +18,7 @@
 Name[da]=Onlinelæsere
 Name[de]=Online-Leser
 Name[el]=Αναγνώστης διαδικτύου
+Name[en_GB]=Online Readers
 Name[es]=Lectores en línea
 Name[et]=Võrgulugejad
 Name[fr]=Lecteurs en ligne
@@ -54,6 +55,7 @@
 Comment[da]=Indstil onlinelæsere
 Comment[de]=Online-Leser einrichten
 Comment[el]=Ρύθμιση αναγνωστών διαδικτύου
+Comment[en_GB]=Configure Online Readers
 Comment[es]=Configurar los lectores en línea
 Comment[et]=Võrgulugejate seadistamine
 Comment[fr]=Configurer les lecteurs en ligne
--- akregator/src/akregator.notifyrc
+++ akregator/src/akregator.notifyrc
@@ -1,10 +1,58 @@
 [Global]
 IconName=akregator
 Comment=Akregator
+Comment[af]=Akregator
 Comment[ar]=اكريغاتور
+Comment[bg]=Akregator
+Comment[br]=Akregator
+Comment[ca]=Akregator
+Comment[cs]=Akregator
+Comment[da]=Akregator
+Comment[de]=Akregator
+Comment[el]=Akregator
+Comment[en_GB]=Akregator
+Comment[eo]=Akregator
+Comment[es]=Akregator
+Comment[et]=Akregator
+Comment[eu]=Akregator
+Comment[fi]=Akregator
+Comment[fr]=Akregator
+Comment[fy]=Akregator
+Comment[ga]=Akregator
+Comment[gl]=Akregator
+Comment[he]=Akregator
+Comment[hu]=Akregator
+Comment[is]=Akregator
+Comment[it]=Akregator
+Comment[ja]=Akregator
+Comment[ka]=Akregator
+Comment[km]=Akregator
+Comment[ko]=Akregator
+Comment[lt]=Akregator
+Comment[lv]=Akregator
+Comment[ms]=Akregator
+Comment[nb]=Akregator
 Comment[nds]=Tosamensteller
+Comment[nl]=Akregator
+Comment[nn]=Akregator
+Comment[oc]=Akregator
 Comment[pa]=ਅਕਰੀਗੇਟਰ
+Comment[pl]=Akregator
+Comment[pt]=Akregator
+Comment[pt_BR]=Akregator
+Comment[ro]=Akregator
+Comment[ru]=Akregator
+Comment[sk]=Akregator
+Comment[sl]=Akregator
+Comment[sv]=Akregator
+Comment[ta]=Akregator
+Comment[tr]=Akregator
+Comment[uk]=Akregator
+Comment[uz]=Akregator
+Comment[uz@cyrillic]=Akregator
 Comment[x-test]=xxAkregatorxx
+Comment[zh_CN]=Akregator
+Comment[zh_TW]=Akregator
 
 [Event/FeedAdded]
 Name=Feed added
@@ -15,6 +63,7 @@
 Name[da]=Feed tilføjet
 Name[de]=Nachrichtenquelle hinzugefügt
 Name[el]=Προστέθηκε ροή
+Name[en_GB]=Feed added
 Name[eo]=Fluo aldonita
 Name[es]=Fuente añadida
 Name[et]=Uudistevoog lisatud
@@ -64,6 +113,7 @@
 Comment[da]=En ny feed blev tilføjet eksternt til Akregator
 Comment[de]=Eine neue Nachrichtenquelle wurde von außerhalb zu Akregator hinzugefügt
 Comment[el]=Μια νέα ροή προστέθηκε εξωτερικά στον Akregator
+Comment[en_GB]=A new feed was remotely added to Akregator
 Comment[es]=Se ha añadido remotamente una nueva fuente a Akregator
 Comment[et]=Akregatorile lisati väljastpoolt uus uudistevoog
 Comment[eu]=Iturri berri bat gehitu da urrunetik Akregator-era
@@ -116,6 +166,7 @@
 Name[da]=Nye artikler
 Name[de]=Neue Artikel
 Name[el]=Νέα άρθρα
+Name[en_GB]=New Articles
 Name[eo]=Novaj Artikoloj
 Name[es]=Artículos nuevos
 Name[et]=Uued artiklid
@@ -167,6 +218,7 @@
 Comment[da]=Nye artikler blev hentet
 Comment[de]=Neue Artikel wurden abgeholt
 Comment[el]=Λήφθησαν νέα άρθρα
+Comment[en_GB]=New articles were fetched
 Comment[eo]=Novaj artikoloj estis alprenataj
 Comment[es]=Se han obtenido nuevos artículos
 Comment[et]=Tõmmati uued artiklid
--- akregator/src/akregator_part.h
+++ akregator/src/akregator_part.h
@@ -166,6 +166,7 @@
 
         void slotOnShutdown();
         void slotSettingsChanged();
+        void slotSetStatusText( const QString &statusText );
 
         void feedListLoaded( const boost::shared_ptr<Akregator::FeedList>& list );
 
--- akregator/src/mainwindow.cpp
+++ akregator/src/mainwindow.cpp
@@ -29,6 +29,8 @@
 #include "statusbarprogresswidget.h"
 #include "trayicon.h"
 
+#include <libkdepim/broadcaststatus.h>
+
 #include <KAction>
 #include <KActionCollection>
 #include <KApplication>
@@ -85,6 +87,9 @@
     setStandardToolBarMenuEnabled(true);
     createStandardStatusBarAction();
     autoReadProperties();
+
+    connect( KPIM::BroadcastStatus::instance(), SIGNAL( statusMsg( const QString& ) ),
+             this, SLOT( slotSetStatusBarText(const QString&) ) );
 }
 
 bool MainWindow::loadPart()
--- akregator/src/akregator_plugin.desktop
+++ akregator/src/akregator_plugin.desktop
@@ -9,8 +9,10 @@
 Comment[br]=Lugent evit Akregator
 Comment[ca]=Connector per a l'Akregator
 Comment[cs]=Modul pro Akregator
+Comment[da]=Plugin for Akregator
 Comment[de]=Modul für Akregator
 Comment[el]=Πρόσθετο για το Akregator
+Comment[en_GB]=Plugin for Akregator
 Comment[eo]=Kromprogramo por Akregator
 Comment[es]=Complemento para Akregator
 Comment[et]=Akregatori plugin
--- akregator/src/akregator_part.cpp
+++ akregator/src/akregator_part.cpp
@@ -43,6 +43,8 @@
 #include "trayicon.h"
 #include "dummystorage/storagefactorydummyimpl.h"
 
+#include <libkdepim/broadcaststatus.h>
+
 #include <knotifyconfigwidget.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
@@ -213,7 +215,7 @@
     m_extension = new BrowserExtension(this, "ak_extension");
 
     connect(Kernel::self()->frameManager(), SIGNAL(signalCaptionChanged(const QString&)), this, SIGNAL(setWindowCaption(const QString&)));
-    connect(Kernel::self()->frameManager(), SIGNAL(signalStatusText(const QString&)), this, SIGNAL(setStatusBarText(const QString&)));
+    connect(Kernel::self()->frameManager(), SIGNAL(signalStatusText(const QString&)), this, SLOT(slotSetStatusText(const QString&)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalLoadingProgress(int)), m_extension, SIGNAL(loadingProgress(int)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalCanceled(const QString&)), this, SIGNAL(canceled(const QString&)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalStarted()), this, SLOT(slotStarted()));
@@ -307,6 +309,12 @@
     saveSettings();
     emit signalSettingsChanged();
 }
+
+void Part::slotSetStatusText( const QString& statusText )
+{
+  KPIM::BroadcastStatus::instance()->setStatusMsg( statusText );
+}
+
 void Part::saveSettings()
 {
     m_mainWidget->saveSettings();
--- akregator/src/akregator.desktop
+++ akregator/src/akregator.desktop
@@ -1,9 +1,61 @@
 [Desktop Entry]
 Name=Akregator
+Name[af]=Akregator
 Name[ar]=اكريغاتور
+Name[be]=Akregator
+Name[bg]=Akregator
+Name[br]=Akregator
+Name[ca]=Akregator
+Name[cs]=Akregator
+Name[da]=Akregator
+Name[de]=Akregator
+Name[el]=Akregator
+Name[en_GB]=Akregator
+Name[eo]=Akregator
+Name[es]=Akregator
+Name[et]=Akregator
+Name[eu]=Akregator
+Name[fi]=Akregator
+Name[fr]=Akregator
+Name[fy]=Akregator
+Name[ga]=Akregator
+Name[gl]=Akregator
+Name[he]=Akregator
+Name[hu]=Akregator
+Name[is]=Akregator
+Name[it]=Akregator
+Name[ja]=Akregator
+Name[ka]=Akregator
+Name[kk]=Akregator
+Name[km]=Akregator
+Name[ko]=Akregator
+Name[lt]=Akregator
+Name[lv]=Akregator
+Name[ms]=Akregator
+Name[nb]=Akregator
+Name[nds]=Akregator
 Name[ne]=एक्रिगेटर
+Name[nl]=Akregator
+Name[nn]=Akregator
+Name[oc]=Akregator
 Name[pa]=ਅਕਰੀਗੇਟਰ
+Name[pl]=Akregator
+Name[pt]=Akregator
+Name[pt_BR]=Akregator
+Name[ro]=Akregator
+Name[ru]=Akregator
+Name[se]=Akregator
+Name[sk]=Akregator
+Name[sl]=Akregator
+Name[sv]=Akregator
+Name[ta]=Akregator
+Name[tr]=Akregator
+Name[uk]=Akregator
+Name[uz]=Akregator
+Name[uz@cyrillic]=Akregator
 Name[x-test]=xxAkregatorxx
+Name[zh_CN]=Akregator
+Name[zh_TW]=Akregator
 Exec=akregator %i -caption "%c"
 Icon=akregator
 Type=Application
@@ -15,6 +67,7 @@
 GenericName[da]=Feed-læser
 GenericName[de]=Nachrichtenbetrachter
 GenericName[el]=Αναγνώστης ροών
+GenericName[en_GB]=Feed Reader
 GenericName[es]=Lector de fuentes
 GenericName[et]=Uudistevoogude lugemisvahend
 GenericName[fr]=Lecteur de flux
@@ -26,6 +79,7 @@
 GenericName[km]=កម្មវិធីអានមតិព័ត៌មាន
 GenericName[ko]=피드 리더
 GenericName[lt]=Kanalų skaitytuvė
+GenericName[lv]=Feed Reader
 GenericName[nb]=Kildeleser
 GenericName[nds]=Mellenstroom-Kieker
 GenericName[nl]=Feedlezer
@@ -52,6 +106,7 @@
 Comment[da]=En feed-læser for KDE
 Comment[de]=Ein RSS-Nachrichtensammler für KDE
 Comment[el]=Μία εφαρμογή ανάγνωσης ροών για το KDE
+Comment[en_GB]=A Feed Reader for KDE
 Comment[es]=Un lector de fuentes
 Comment[et]=KDE uudistevoogude lugemisvahend
 Comment[fr]=Un lecteur de flux pour KDE
--- akregator/src/tabwidget.cpp
+++ akregator/src/tabwidget.cpp
@@ -323,6 +323,9 @@
         for( int i = 0; i < q->count(); ++i)
         {
             Frame* f = frames.value(q->widget(i));
+            if ( !f ) {
+                continue; // frames is out of sync, e.g. because tabInserted wasn't called yet - #185597
+            }
             newTitle = f->title();
             int index = q->indexOf(q->widget( i ));
             q->setTabToolTip( index, QString() );
--- akregator/src/akregator_part.desktop
+++ akregator/src/akregator_part.desktop
@@ -1,15 +1,60 @@
 [Desktop Entry]
 Name=aKregatorPart
+Name[af]=aKregatorPart
+Name[ar]=aKregatorPart
 Name[be]=аKregatorPart
+Name[bg]=aKregatorPart
+Name[br]=aKregatorPart
+Name[ca]=aKregatorPart
 Name[cs]=Komponenta aKregator
 Name[da]=AkregatorPart
 Name[de]=aKregator-Komponente
+Name[el]=aKregatorPart
+Name[en_GB]=aKregatorPart
+Name[eo]=aKregatorPart
+Name[es]=aKregatorPart
+Name[et]=aKregatorPart
+Name[eu]=aKregatorPart
+Name[fi]=aKregatorPart
+Name[fr]=aKregatorPart
+Name[fy]=aKregatorPart
+Name[ga]=aKregatorPart
+Name[gl]=aKregatorPart
+Name[he]=aKregatorPart
+Name[hu]=aKregatorPart
+Name[is]=aKregatorPart
+Name[it]=aKregatorPart
+Name[ja]=aKregatorPart
+Name[ka]=aKregatorPart
+Name[kk]=aKregatorPart
+Name[km]=aKregatorPart
+Name[ko]=aKregatorPart
+Name[lt]=aKregatorPart
+Name[lv]=aKregatorPart
+Name[ms]=aKregatorPart
+Name[nb]=aKregatorPart
 Name[nds]=aKregator-Komponent
+Name[ne]=aKregatorPart
+Name[nl]=aKregatorPart
 Name[nn]=aKregator-del
+Name[pa]=aKregatorPart
+Name[pl]=aKregatorPart
+Name[pt]=aKregatorPart
 Name[pt_BR]=Componente do aKregator
+Name[ro]=aKregatorPart
+Name[ru]=aKregatorPart
+Name[se]=aKregatorPart
+Name[sk]=aKregatorPart
+Name[sl]=aKregatorPart
 Name[sv]=aKregator-delprogram
 Name[ta]=aKregatorபகுதி
+Name[tr]=aKregatorPart
+Name[uk]=aKregatorPart
+Name[uz]=aKregatorPart
+Name[uz@cyrillic]=aKregatorPart
 Name[x-test]=xxaKregatorPartxx
+Name[zh_CN]=aKregatorPart
+Name[zh_TW]=aKregatorPart
 X-KDE-ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=akregatorpart
 Type=Service
--- akregator/configuration/akregator_config_browser.desktop
+++ akregator/configuration/akregator_config_browser.desktop
@@ -14,7 +14,10 @@
 Name[ar]=المتصفح
 Name[ca]=Navegador
 Name[cs]=Prohlížeč
+Name[da]=Browser
+Name[de]=Browser
 Name[el]=Περιηγητής
+Name[en_GB]=Browser
 Name[es]=Navegador
 Name[et]=Sirvija
 Name[fr]=Navigateur
@@ -30,6 +33,7 @@
 Name[mai]=ब्राउज़र
 Name[nb]=Nettleser
 Name[nds]=Kieker
+Name[nl]=Browser
 Name[nn]=Nettlesar
 Name[oc]=Navigador
 Name[pa]=ਬਰਾਊਜ਼ਰ
@@ -53,10 +57,11 @@
 Comment[da]=Indstil intern browserkomponent
 Comment[de]=Einrichtung der internen Browser-Komponente
 Comment[el]=Ρύθμιση εσωτερικού συστατικού περιηγητή
+Comment[en_GB]=Configure Internal Browser Component
 Comment[es]=Configurar el componente navegador interno
 Comment[et]=Sisemise sirvimiskomponendi seadistamine
 Comment[fr]=Configurer le navigateur web interne
-Comment[gl]=Configurar o componente navegador interno
+Comment[gl]=Configurar o compoñente do navegador interno
 Comment[hu]=A belső böngészőkomponens beállítása
 Comment[it]=Configura il componente interno di navigazione internet
 Comment[ja]=内部ブラウザコンポーネントの設定
--- akregator/configuration/akregator_config_appearance.desktop
+++ akregator/configuration/akregator_config_appearance.desktop
@@ -11,6 +11,7 @@
 X-KDE-Weight=300
 
 Name=Appearance
+Name[af]=Appearance
 Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
@@ -21,6 +22,7 @@
 Name[da]=Udseende
 Name[de]=Erscheinungsbild
 Name[el]=Εμφάνιση
+Name[en_GB]=Appearance
 Name[eo]=Prezentado
 Name[es]=Apariencia
 Name[et]=Välimus
@@ -79,6 +81,7 @@
 Comment[da]=Indstil udseendet af feed-læser
 Comment[de]=Erscheinungsbild des Nachrichtenbetrachters einrichten
 Comment[el]=Ρύθμιση της εμφάνισης του αναγνώστη ροών ειδήσεων
+Comment[en_GB]=Configure the Feed Reader Appearance
 Comment[es]=Configurar la apariencia del lector de fuentes
 Comment[et]=Uudistevoogude lugeja välimuse seadistamine
 Comment[fr]=Configurer l'apparence du lecteur de flux
--- akregator/configuration/akregator_config_advanced.desktop
+++ akregator/configuration/akregator_config_advanced.desktop
@@ -17,6 +17,7 @@
 Name[da]=Avanceret
 Name[de]=Erweitert
 Name[el]=Προχωρημένα
+Name[en_GB]=Advanced
 Name[es]=Avanzado
 Name[et]=Muu
 Name[fr]=Avancé
@@ -57,6 +58,7 @@
 Comment[da]=Avanceret indstilling af feed-læser
 Comment[de]=Erweiterte Einstellungen für den Nachrichtenbetrachter
 Comment[el]=Προχωρημένες ρυθμίσεις αναγνώστη ροών ειδήσεων
+Comment[en_GB]=Advanced Feed Reader Settings
 Comment[es]=Configuración avanzada del lector de fuentes
 Comment[et]=Uudistevoogude lugeja muud seadistused
 Comment[fr]=Configuration avancé du lecteur de flux
--- akregator/configuration/akregator_config_general.desktop
+++ akregator/configuration/akregator_config_general.desktop
@@ -16,12 +16,15 @@
 Name[be]=Агульныя
 Name[bg]=Общи
 Name[br]=Pennañ
+Name[ca]=General
 Name[cs]=Obecné
 Name[cy]=Cyffredinol
 Name[da]=Generelt
 Name[de]=Allgemein
 Name[el]=Γενικά
+Name[en_GB]=General
 Name[eo]=Ĝenerala
+Name[es]=General
 Name[et]=Üldine
 Name[eu]=Orokorra
 Name[fa]=عمومی
@@ -49,10 +52,12 @@
 Name[ne]=साधारण
 Name[nl]=Algemeen
 Name[nn]=Generelt
+Name[oc]=General
 Name[pa]=ਸਧਾਰਨ
 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral
+Name[ro]=General
 Name[ru]=Главное
 Name[se]=Oppalaš
 Name[sk]=Všeobecné
@@ -66,6 +71,7 @@
 Name[uz@cyrillic]=Умумий
 Name[x-test]=xxGeneralxx
 Name[zh_CN]=常规
+Name[zh_TW]=General
 Comment=Configure Feeds
 Comment[ar]=اضبط التلقيمات
 Comment[ca]=Configura les fonts
@@ -73,6 +79,7 @@
 Comment[da]=Indstil feeds
 Comment[de]=Einrichtung der Nachrichtenquellen
 Comment[el]=Ρύθμιση ροών ειδήσεων
+Comment[en_GB]=Configure Feeds
 Comment[es]=Configurar fuentes
 Comment[et]=Uudistevoogude seadistamine
 Comment[fr]=Configurer les flux
--- akregator/configuration/akregator_config_archive.desktop
+++ akregator/configuration/akregator_config_archive.desktop
@@ -17,8 +17,10 @@
 Name[da]=Arkiv
 Name[de]=Archiv
 Name[el]=Αρχειοθήκη
+Name[en_GB]=Archive
 Name[es]=Archivo
 Name[et]=Arhiveerimine
+Name[fr]=Archive
 Name[ga]=Cartlann
 Name[gl]=Arquivo
 Name[hu]=Archívum
@@ -54,6 +56,7 @@
 Comment[da]=Indstil feed-arkiv
 Comment[de]=Einrichtung des Nachrichten-Archivs
 Comment[el]=Ρύθμιση αρχειοθήκης ροών ειδήσεων
+Comment[en_GB]=Configure Feed Archive
 Comment[es]=Configurar el archivo de fuentes
 Comment[et]=Uudistevoogude arhiveerimise seadistamine
 Comment[fr]=Configurer les archives des flux
--- libkleo/libkleopatrarc.desktop
+++ libkleo/libkleopatrarc.desktop
@@ -9,6 +9,7 @@
 Name[da]=Ikke godkendt nøgle
 Name[de]=Ungeprüfter Schlüssel
 Name[el]=Μη επικυρωμένο κλειδί
+Name[en_GB]=Not Validated Key
 Name[eo]=Ŝlosilo Ne Validigita
 Name[es]=Clave no validada
 Name[et]=Võtme ehtsus kontrollimatu
@@ -66,6 +67,7 @@
 Name[da]=Udløbet nøgle
 Name[de]=Abgelaufener Schlüssel
 Name[el]=Ληγμένο κλειδί
+Name[en_GB]=Expired Key
 Name[eo]=Ŝlosilo Eksvalidiĝinta
 Name[es]=Clave caducada
 Name[et]=Aegunud võti
@@ -121,6 +123,7 @@
 Name[da]=Fjernet nøgle
 Name[de]=Widerrufener Schlüssel
 Name[el]=Ακυρωμένο κλειδί
+Name[en_GB]=Revoked Key
 Name[eo]=Ŝlosilo Revokita
 Name[es]=Clave revocada
 Name[et]=Tühistatud võti
@@ -177,6 +180,7 @@
 Name[da]=Root-certifikat der stoles på
 Name[de]=Vertrauenswürdiges Wurzelzertifikat
 Name[el]=Έμπιστο βασικό πιστοποιητικό
+Name[en_GB]=Trusted Root Certificate
 Name[eo]=Fidinda Radika Certifikato
 Name[es]=Certificado raíz de confianza
 Name[et]=Usaldusväärne juursertifikaat
@@ -185,7 +189,7 @@
 Name[fi]=Luotettu juurivarmenne
 Name[fr]=Certificat racine de confiance
 Name[fy]=Fertroude haadsertifikaat
-Name[gl]=Certificado raiz autentificado
+Name[gl]=Certificado raíz autenticado
 Name[hu]=Megbízható gyökértanúsítvány
 Name[is]=Treyst rótarskilríki
 Name[it]=Certificato radice affidabile
@@ -235,6 +239,7 @@
 Name[da]=Root-certifikat der ikke stoles på
 Name[de]=Nicht vertrauenswürdiges Wurzelzertifikat
 Name[el]=Μη έμπιστο βασικό πιστοποιητικό
+Name[en_GB]=Not Trusted Root Certificate
 Name[eo]=Ne Fidinda Radika Certifikato
 Name[es]=Certificado raíz no de confianza
 Name[et]=Ebausaldusväärne juursertifikaat
@@ -243,7 +248,7 @@
 Name[fi]=Ei-luotettu juurivarmenne
 Name[fr]=Certificat racine non fiable
 Name[fy]=Net fertroude haadsertifikaat
-Name[gl]=Certificado raiz non autentificado
+Name[gl]=Certificado raíz non autenticado
 Name[hu]=Nem megbízható gyökértanúsítvány
 Name[is]=Ekki traust rótarskilríki
 Name[it]=Certificato radice non affidabile
@@ -289,6 +294,7 @@
 Name[da]=Nøgler til kvalificerede signaturer
 Name[de]=Schlüssel für qualifizierte Signaturen
 Name[el]=Κλειδιά για αναγνωρισμένες υπογραφές
+Name[en_GB]=Keys for Qualified Signatures
 Name[es]=Claves para firmas cualificadas
 Name[et]=Kvalifitseeritud allkirjade võtmed
 Name[fr]=Clés pour les signatures qualifiées
@@ -327,6 +333,7 @@
 Name[da]=Andre nøgler
 Name[de]=Andere Schlüssel
 Name[el]=Άλλα κλειδιά
+Name[en_GB]=Other Keys
 Name[es]=Otras claves
 Name[et]=Muud võtmed
 Name[fr]=Autres clés
--- libkleo/backends/qgpgme/threadedjobmixin.cpp
+++ libkleo/backends/qgpgme/threadedjobmixin.cpp
@@ -57,8 +57,8 @@
   assert( !data.isNull() );
   if ( ( err = ctx->getAuditLog( data, GetAuditLogFlags ) ) )
     return QString::fromLocal8Bit( err.asString() );
-  else
-    return QString::fromUtf8( dp.data().data() );
+  const QByteArray ba = dp.data();
+  return QString::fromUtf8( ba.data(), ba.size() );
 }
 
 static QList<QByteArray> from_sl( const QStringList & sl ) {
--- libkleo/ui/messagebox_p.h
+++ libkleo/ui/messagebox_p.h
@@ -55,6 +55,7 @@
         void slotUser2();
 
     private:
+        QString m_log;
         QTextEdit * m_textEdit;
     };
 
--- libkleo/ui/messagebox.cpp
+++ libkleo/ui/messagebox.cpp
@@ -78,6 +78,7 @@
 
 AuditLogViewer::AuditLogViewer( const QString & log, QWidget * parent, Qt::WindowFlags f )
     : KDialog( parent, f ),
+      m_log( /* sic */ ),
       m_textEdit( new QTextEdit( this ) )
 {
     setCaption( i18n("View GnuPG Audit Log") );
@@ -99,7 +100,10 @@
 AuditLogViewer::~AuditLogViewer() {}
 
 void AuditLogViewer::setAuditLog( const QString & log ) {
-    m_textEdit->setHtml( log );
+  if ( log == m_log )
+    return;
+  m_log = log;
+  m_textEdit->setHtml( "<qt>" + log + "</qt>" );
 }
 
 void AuditLogViewer::slotUser1() {
@@ -116,7 +120,15 @@
 
     if ( file.open() ) {
         QTextStream s( &file );
-        s << m_textEdit->toPlainText() << endl;
+        s << "<html><head>";
+        if ( !windowTitle().isEmpty() ) {
+          s << "\n<title>"
+            << Qt::escape( windowTitle() )
+            << "</title>\n";
+        }
+        s << "</head><body>\n"
+          << m_log
+          << "\n</body></html>" << endl;
         s.flush();
         file.finalize();
     }
@@ -167,7 +179,7 @@
 
 // static
 void MessageBox::auditLog( QWidget * parent, const QString & log, const QString & caption ) {
-    AuditLogViewer * const alv = new AuditLogViewer( "<qt>" + log + "</qt>", parent, Qt::WDestructiveClose );
+    AuditLogViewer * const alv = new AuditLogViewer( log, parent, Qt::WDestructiveClose );
     alv->setObjectName( "alv" );
     alv->setCaption( caption );
     alv->show();
--- kleopatra/kleopatra_import.desktop
+++ kleopatra/kleopatra_import.desktop
@@ -6,13 +6,66 @@
 Categories=Qt;KDE;Utility;Security;X-KDE-Utilities-PIM;
 
 Name=Kleopatra
+Name[af]=Kleopatra
 Name[ar]=كليوبترا
+Name[be]=Kleopatra
+Name[bg]=Kleopatra
+Name[br]=Kleopatra
+Name[ca]=Kleopatra
+Name[cs]=Kleopatra
+Name[cy]=Kleopatra
+Name[da]=Kleopatra
+Name[de]=Kleopatra
+Name[el]=Kleopatra
+Name[en_GB]=Kleopatra
+Name[eo]=Kleopatra
+Name[es]=Kleopatra
+Name[et]=Kleopatra
+Name[eu]=Kleopatra
+Name[fi]=Kleopatra
+Name[fr]=Kleopatra
+Name[fy]=Kleopatra
+Name[ga]=Kleopatra
+Name[gl]=Kleopatra
+Name[he]=Kleopatra
+Name[hu]=Kleopatra
 Name[is]=Kleópatra
+Name[it]=Kleopatra
+Name[ja]=Kleopatra
+Name[ka]=Kleopatra
+Name[kk]=Kleopatra
+Name[km]=Kleopatra
+Name[ko]=Kleopatra
+Name[lt]=Kleopatra
+Name[lv]=Kleopatra
 Name[mk]=Клеопатра
+Name[ms]=Kleopatra
+Name[nb]=Kleopatra
+Name[nds]=Kleopatra
 Name[ne]=क्लेओपेट्रा
+Name[nl]=Kleopatra
+Name[nn]=Kleopatra
+Name[oc]=Kleopatra
 Name[pa]=ਕਲੀਉਪਾਟਰਾ
+Name[pl]=Kleopatra
+Name[pt]=Kleopatra
+Name[pt_BR]=Kleopatra
+Name[ro]=Kleopatra
+Name[ru]=Kleopatra
+Name[se]=Kleopatra
+Name[sk]=Kleopatra
+Name[sl]=Kleopatra
+Name[sv]=Kleopatra
 Name[ta]=க்ளியோபட்ரா
+Name[tg]=Kleopatra
+Name[tr]=Kleopatra
+Name[uk]=Kleopatra
+Name[uz]=Kleopatra
+Name[uz@cyrillic]=Kleopatra
+Name[wa]=Kleopatra
 Name[x-test]=xxKleopatraxx
+Name[zh_CN]=Kleopatra
+Name[zh_TW]=Kleopatra
 Comment=Certificate Manager and Unified Crypto GUI
 Comment[ar]=الواجهة الرسومية لمدير الشهادة و الشفرة الموحدة
 Comment[ca]=Gestor de certificats i IGU criptogràfica unificada
@@ -20,6 +73,7 @@
 Comment[da]=Certifikathåndtering og forenet krypterings-GUI
 Comment[de]=Zertifikatsverwaltung und Kryptografie-Oberfläche
 Comment[el]=Διαχειριστής πιστοποιητικών και GUI ενοποιημένης κρυπτογράφησης
+Comment[en_GB]=Certificate Manager and Unified Crypto GUI
 Comment[es]=Gestor de certificados e interfaz gráfica unificada de criptografía
 Comment[et]=Sertifikaadihaldur ja ühendatud krüptimise graafiline kasutajaliides
 Comment[fr]=Interface de gestion des certificats et cryptographie unifiée
--- kleopatra/conf/kleopatra_config_smimevalidation.desktop
+++ kleopatra/conf/kleopatra_config_smimevalidation.desktop
@@ -19,6 +19,7 @@
 Name[da]=S/MIME-validering
 Name[de]=S/MIME-Prüfung
 Name[el]=Επαλήθευση S/MIME
+Name[en_GB]=S/MIME Validation
 Name[es]=Validación S/MIME
 Name[et]=S/MIME valideerimine
 Name[fr]=Validation S/MIME
@@ -54,6 +55,7 @@
 Comment[da]=Indstilling af tilvalg for S/MIME-certifikatvalidering
 Comment[de]=Einrichtung der Optionen zur S/MIME-Zertifikatüberprüfung
 Comment[el]=Ρύθμιση επιλογών επαλήθευσης πιστοποιητικών S/MIME
+Comment[en_GB]=Configuration of S/MIME certificate validation options
 Comment[es]=Configuración de las opciones de los certificados de validación S/MIME
 Comment[et]=S/MIME sertifikaatide valideerimise valikute seadistamine
 Comment[fr]=Configuration des options de validation des certificats S/MIME
--- kleopatra/conf/kleopatra_config_gnupgsystem.desktop
+++ kleopatra/conf/kleopatra_config_gnupgsystem.desktop
@@ -19,6 +19,7 @@
 Name[da]=GnuPG-system
 Name[de]=GnuPG-System
 Name[el]=Σύστημα GnuPG
+Name[en_GB]=GnuPG System
 Name[es]=Sistema GnuPG
 Name[et]=GnuPG süsteem
 Name[fr]=Système GnuPG
@@ -50,6 +51,7 @@
 Comment[da]=Konfiguration af GnuPG systemindstillinger
 Comment[de]=Einrichtung der Optionen zum GnuPG-System
 Comment[el]=Ρύθμιση επιλογών συστήματος GnuPG
+Comment[en_GB]=Configuration of GnuPG System options
 Comment[es]=Configuración de las opciones del sistema GnuPG
 Comment[et]=GnuPG süsteemi valikute seadistamine
 Comment[fr]=Configuration des options du système GnuPG
--- kleopatra/conf/kleopatra_config_dnorder.desktop
+++ kleopatra/conf/kleopatra_config_dnorder.desktop
@@ -13,6 +13,7 @@
 X-KDE-CfgDlgHierarchy=Kleopatra
 
 Name=DN-Attribute Order
+Name[af]=DN-Attribute Order
 Name[ar]=ترتيب صفة DN
 Name[bg]=Подредба
 Name[ca]=Ordre d'atributs DN
@@ -20,6 +21,7 @@
 Name[da]=DN-Attributrækkefølge
 Name[de]=DN-Attribut-Ordnung
 Name[el]=Σειρά ιδιότητας DN
+Name[en_GB]=DN-Attribute Order
 Name[eo]=DN-Atributa Sinsekvo
 Name[es]=Orden de atributos DN
 Name[et]=DN-atribuutide järjekord
@@ -72,6 +74,7 @@
 Comment[da]=Indstil rækkefølgen i hvilken DN-attributter vises
 Comment[de]=Einrichtung für die Anzeigereihenfolge der DN-Attribute
 Comment[el]=Ρύθμιση της σειράς εμφάνισης των ιδιοτήτων DN
+Comment[en_GB]=Configure the order in which DN attributes are shown
 Comment[eo]=Agordi la sinsekvon en kiu DN-atributoj aperas
 Comment[es]=Configura el orden en el que se muestran los atributos DN
 Comment[et]=DN-atribuutide näitamise järjekorra seadistamine
--- kleopatra/conf/kleopatra_config_appear.desktop
+++ kleopatra/conf/kleopatra_config_appear.desktop
@@ -13,6 +13,7 @@
 X-KDE-CfgDlgHierarchy=Kleopatra
 
 Name=Appearance
+Name[af]=Appearance
 Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
@@ -23,6 +24,7 @@
 Name[da]=Udseende
 Name[de]=Erscheinungsbild
 Name[el]=Εμφάνιση
+Name[en_GB]=Appearance
 Name[eo]=Prezentado
 Name[es]=Apariencia
 Name[et]=Välimus
--- kleopatra/conf/kleopatra_config_dirserv.desktop
+++ kleopatra/conf/kleopatra_config_dirserv.desktop
@@ -13,6 +13,7 @@
 X-KDE-CfgDlgHierarchy=Kleopatra
 
 Name=Directory Services
+Name[af]=Directory Services
 Name[ar]=دليل الخدمات
 Name[bg]=Директорийни услуги
 Name[ca]=Serveis de directori
@@ -20,6 +21,7 @@
 Name[da]=Directory-tjenester
 Name[de]=Zertifikatsserver
 Name[el]=Υπηρεσίες καταλόγου
+Name[en_GB]=Directory Services
 Name[eo]=Dosierujaj Servoj
 Name[es]=Servicios de directorio
 Name[et]=Kataloogiteenused
@@ -72,6 +74,7 @@
 Comment[da]=Indstilling af directory-tjenester
 Comment[de]=Einrichtung von Zertifikatsservern
 Comment[el]=Ρυθμίσεις των υπηρεσιών καταλόγου
+Comment[en_GB]=Configuration of directory services
 Comment[es]=Configuración de los servicios de directorio
 Comment[et]=Kataloogiteenuste seadistused
 Comment[fr]=Configuration des annuaires
--- kleopatra/kleopatra_decryptverifyfolders.desktop
+++ kleopatra/kleopatra_decryptverifyfolders.desktop
@@ -9,6 +9,7 @@
 Name[da]=Kleopatra dekryptér/verificér all filer i mappe
 Name[de]=Kleopatra - Alle Dateien in einem Ordner entschlüsseln/überprüfen
 Name[el]=Αποκρυπτογράφηση/επαλήθευση αρχείων σε φάκελο μέσω Kleopatra
+Name[en_GB]=Kleopatra Decrypt/Verify All Files In Folder
 Name[es]=Kleopatra Descifrar/verificar todos los archivos en la carpeta
 Name[et]=Kleopatra kõigi kataloogi failide lahtikrüptimine/kontrollimine
 Name[fr]=Kleopatra vérification et déchiffrement de tous les fichiers dans un dossier
@@ -47,6 +48,7 @@
 Name[da]=Dekryptér/verificér alle filer i mappe
 Name[de]=Alle Dateien im Ordner entschlüsseln/überprüfen
 Name[el]=Αποκρυπτογράφηση/επαλήθευση αρχείων σε φάκελο
+Name[en_GB]=Decrypt/Verify All Files In Folder
 Name[es]=Descifrar/verificar todos los archivos en la carpeta
 Name[et]=Kõigi kataloogi failide lahtikrüptimine/kontrollimine
 Name[fr]=Vérifier et déchiffrer tous les fichiers dans un dossier
--- kleopatra/kleopatra_decryptverifyfiles.desktop
+++ kleopatra/kleopatra_decryptverifyfiles.desktop
@@ -10,6 +10,7 @@
 Name[da]=Kleopatra dekryptér/verificér filer
 Name[de]=Kleopatra - Dateien entschlüsseln/überprüfen
 Name[el]=Αποκρυπτογράφηση/επαλήθευση αρχείων μέσω Kleopatra
+Name[en_GB]=Kleopatra Decrypt/Verify Files
 Name[es]=Kleopatra Descifrar/verificar archivos
 Name[et]=Kleopatra failide lahtikrüptimine/kontrollimine
 Name[fr]=Kleopatra vérification et déchiffrement de fichiers
@@ -48,6 +49,7 @@
 Name[da]=Dekryptér/verificér filer
 Name[de]=Datei entschlüsseln/überprüfen
 Name[el]=Αποκρυπτογράφηση/επαλήθευση αρχείου
+Name[en_GB]=Decrypt/Verify File
 Name[es]=Descifrar/verificar archivo
 Name[et]=Faili lahtikrüptimine/kontrollimine
 Name[fr]=Vérifier et déchiffrer le fichier
--- kleopatra/kleopatra_signencryptfolders.desktop
+++ kleopatra/kleopatra_signencryptfolders.desktop
@@ -10,6 +10,7 @@
 Name[da]=Kleopatra signér/kryptér mapper
 Name[de]=Kleopatra - Ordner Signieren/Verschlüsseln
 Name[el]=Υπογραφή/κρυπτογράφηση φακέλων μέσω Kleopatra
+Name[en_GB]=Kleopatra Sign/Encrypt Folders
 Name[es]=Kleopatra Firmar/cifrar carpetas
 Name[et]=Kleopatra kataloogide allkirjastamine/krüptimine
 Name[fr]=Kleopatra signature et chiffrement de dossiers
@@ -47,6 +48,7 @@
 Name[da]=Arkivér, signér og kryptér mappe
 Name[de]=Ordner packen, signieren & verschlüsseln
 Name[el]=Αρχειοθέτηση, υπογραφή & κρυπτογράφηση φακέλου
+Name[en_GB]=Archive, Sign & Encrypt Folder
 Name[es]=Archivar, firmar y cifrar carpeta
 Name[et]=Kataloogi arhiveerimine, allkirjastamine ja krüptimine
 Name[fr]=Archiver, signer et chiffrer le dossier
@@ -86,6 +88,7 @@
 Name[da]=Arkivér og kryptér mappe
 Name[de]=Ordner packen und verschlüsseln
 Name[el]=Αρχειοθέτηση & κρυπτογράφηση φακέλου
+Name[en_GB]=Archive & Encrypt Folder
 Name[es]=Archivar y cifrar carpeta
 Name[et]=Kataloogi arhiveerimine ja krüptimine
 Name[fr]=Archiver et chiffrer le dossier
--- kleopatra/kleopatra_signencryptfiles.desktop
+++ kleopatra/kleopatra_signencryptfiles.desktop
@@ -11,6 +11,7 @@
 Name[da]=Kleopatra signér/kryptér filer
 Name[de]=Kleopatra - Signieren/Verschlüsseln von Dateien
 Name[el]=Υπογραφή/κρυπτογράφηση αρχείων μέσω Kleopatra
+Name[en_GB]=Kleopatra Sign/Encrypt Files
 Name[es]=Firmar/cifrar archivos con Kleopatra
 Name[et]=Kleopatra failide allkirjastamine/krüptimine
 Name[fr]=Kleopatra signature et chiffrement de fichiers
@@ -49,6 +50,7 @@
 Name[da]=Kryptér og signér fil
 Name[de]=Datei verschlüsseln & signieren
 Name[el]=Κρυπτογράφηση & υπογραφή αρχείου
+Name[en_GB]=Encrypt & Sign File
 Name[es]=Cifrar y firmar archivo
 Name[et]=Faili krüptimine ja allkirjastamine
 Name[fr]=Chiffrer et signer le fichier
@@ -89,6 +91,7 @@
 Name[da]=Kryptér fil
 Name[de]=Datei verschlüsseln
 Name[el]=Κρυπτογράφηση αρχείου
+Name[en_GB]=Encrypt File
 Name[es]=Cifrar archivo
 Name[et]=Faili krüptimine
 Name[fr]=Chiffrer le fichier
@@ -130,6 +133,7 @@
 Name[da]=OpenPGP-signér fil
 Name[de]=Datei mit OpenPGP signieren
 Name[el]=Υπογραφή OpenPGP αρχείου
+Name[en_GB]=OpenPGP-Sign File
 Name[es]=Firmar archivo con OpenPGP
 Name[et]=Faili OpenPGP-allkirjastamine
 Name[fr]=Signer le fichier avec OpenPGP
@@ -169,6 +173,7 @@
 Name[da]=S/MIME-signér fil
 Name[de]=Datei mit S/MIME signieren
 Name[el]=Υπογραφή S/MIME αρχείου
+Name[en_GB]=S/MIME-Sign File
 Name[es]=Firmar archivo con S/MIME
 Name[et]=Faili S/MIME-allkirjastamine
 Name[fr]=Signer le fichier avec S/MIME
--- wizards/groupwarewizard.desktop
+++ wizards/groupwarewizard.desktop
@@ -9,6 +9,7 @@
 Name[da]=KDE Groupware-guide
 Name[de]=KDE Groupware-Assistent
 Name[el]=Μάγος Groupware του KDE
+Name[en_GB]=KDE Groupware Wizard
 Name[es]=Asistente de Groupware de KDE
 Name[et]=KDE Groupware nõustaja
 Name[eu]=KDE groupware morroia
--- kresources/egroupware/kabc_xmlrpc.desktop
+++ kresources/egroupware/kabc_xmlrpc.desktop
@@ -9,6 +9,7 @@
 Name[da]=eGroupware server (via XML-RPC)
 Name[de]=eGroupware via XML-RPC
 Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC)
+Name[en_GB]=eGroupware Server (via XML-RPC)
 Name[es]=Servidor de eGroupware (por medio de XML-RPC)
 Name[et]=eGroupware server (XML-RPC vahendusel)
 Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
--- kresources/egroupware/knotes_xmlrpc.desktop
+++ kresources/egroupware/knotes_xmlrpc.desktop
@@ -9,6 +9,7 @@
 Name[da]=eGroupware server (via XML-RPC)
 Name[de]=eGroupware via XML-RPC
 Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC)
+Name[en_GB]=eGroupware Server (via XML-RPC)
 Name[es]=Servidor de eGroupware (por medio de XML-RPC)
 Name[et]=eGroupware server (XML-RPC vahendusel)
 Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
--- kresources/egroupware/kcal_xmlrpc.desktop
+++ kresources/egroupware/kcal_xmlrpc.desktop
@@ -9,6 +9,7 @@
 Name[da]=eGroupware server (via XML-RPC)
 Name[de]=eGroupware via XML-RPC
 Name[el]=Εξυπηρετητής eGroupware (μέσω XML-RPC)
+Name[en_GB]=eGroupware Server (via XML-RPC)
 Name[es]=Servidor de eGroupware (por medio de XML-RPC)
 Name[et]=eGroupware server (XML-RPC vahendusel)
 Name[eu]=eGroupware zerbitzaria (XML-RPC bidez)
--- kresources/tvanytime/kcal_tvanytime.desktop
+++ kresources/tvanytime/kcal_tvanytime.desktop
@@ -8,6 +8,7 @@
 Name[da]=Tv-oversigt
 Name[de]=Fernsehprogramm
 Name[el]=Προγράμματα τηλεόρασης
+Name[en_GB]=TV Schedules
 Name[es]=Programación de TV
 Name[et]=Telekavad
 Name[eu]=TB planifikazioak
--- kresources/blog/blog.desktop
+++ kresources/blog/blog.desktop
@@ -7,6 +7,7 @@
 Name[da]=Journal i en blog
 Name[de]=Journal in einem Blog
 Name[el]=Χρονικό σε ιστολόγιο
+Name[en_GB]=Journal in a blog
 Name[es]=Diario en un blog
 Name[et]=Veebipäevik
 Name[fa]=نشریه در یک وب‌نوشت
@@ -46,6 +47,7 @@
 Comment[da]=Lader dig skrive journalindgange som blogartikler
 Comment[de]=Mit diesem Modul können Journaleinträge an ein Blog übertragen werden.
 Comment[el]=Επιτρέπει την αποστολή καταχωρήσεων χρονικού ως καταχωρήσεις ιστολογίου
+Comment[en_GB]=Allows to post calendar journal entries as blog entries
 Comment[es]=Le permite publicar entradas de diario del calendario con entradas de bitácora
 Comment[et]=Võimaldab postitada kalendri päeviku sissekandeid veebipäeviku sissekannetena
 Comment[fr]=Permet de de poster des évènements du calendrier comme des entrées de journal
--- kresources/scalix/kabc/scalix.desktop
+++ kresources/scalix/kabc/scalix.desktop
@@ -6,6 +6,7 @@
 Name[da]=Adressebog på Scalix-server via KMail
 Name[de]=Scalix-Adressbuch via KMail
 Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή Scalix μέσω του KMail
+Name[en_GB]=Address Book on Scalix Server via KMail
 Name[es]=Libreta de direcciones en servidor Scalix por medio de KMail
 Name[et]=Aadressiraamat Scalix-serveris (KMaili vahendusel)
 Name[fr]=Carnet d'adresses sur serveur Scalix (via KMail)
@@ -35,6 +36,7 @@
 Comment[da]=Giver adgang til kontakter lagret på en Scalix-server som bruger IMAP via KMail eller Kontact
 Comment[de]=Ermöglicht den Zugriff auf Kontakte, die mittels IMAP via KMail auf einem Scalix-Server gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Scalix με τη χρήση του IMAP  μέσω του KMail ή Kontact
+Comment[en_GB]=Provides access to contacts stored on a Scalix server using IMAP via KMail or Kontact
 Comment[es]=Provee acceso a los contactos almacenados en un servidor Scalix usando IMAP via KMail o Kontact
 Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud Scalix-serverisse IMAP abil KMaili või Kontacti vahendusel
 Comment[fr]=Fourni l'accès aux contacts stockés dans un serveur Scalix en utilisant IMAP via KMail ou Kontact
--- kresources/scalix/knotes/scalix.desktop
+++ kresources/scalix/knotes/scalix.desktop
@@ -6,6 +6,7 @@
 Name[da]=Noter på Scalix-server via KMail
 Name[de]=Scalix-Notizen via KMail
 Name[el]=Ημερολόγιο σε εξυπηρετητή Scalix μέσω του KMail
+Name[en_GB]=Notes on Scalix Server via KMail
 Name[es]=Notas en servidor Scalix por medio de KMail
 Name[et]=Märkmed Scalix-serveris (KMaili vahendusel)
 Name[fi]=Kalenteri Scalix-palvelimella KMailin avulla
--- kresources/scalix/kcal/scalix.desktop
+++ kresources/scalix/kcal/scalix.desktop
@@ -7,6 +7,7 @@
 Name[da]=Kalender på Scalix-server via KMail
 Name[de]=Scalix-Kalender via KMail
 Name[el]=Ημερολόγιο σε εξυπηρετητή Scalix μέσω του KMail
+Name[en_GB]=Calendar on Scalix Server via KMail
 Name[es]=Calendario en servidor Scalix por medio de KMail
 Name[et]=Kalender Scalix-serveris (KMaili vahendusel)
 Name[fi]=Kalenteri Scalix-palvelimella KMailin avulla
--- kresources/groupwise/kcal_groupwise.desktop
+++ kresources/groupwise/kcal_groupwise.desktop
@@ -9,6 +9,7 @@
 Name[da]=Novell GroupWise server
 Name[de]=Novell GroupWise-Adressbuch
 Name[el]=Εξυπηρετητής Novell GroupWise
+Name[en_GB]=Novell GroupWise Server
 Name[es]=Servidor de Novell GroupWise
 Name[et]=Novelli GroupWise server
 Name[eu]=Novell GroupWise zerbitzaria
@@ -40,6 +41,7 @@
 Name[pt_BR]=Servidor GroupWise da Novell
 Name[ro]=Server GroupWise Novell
 Name[ru]=Сервер Novell GroupWise
+Name[sk]=Novell GroupWise Server
 Name[sl]=Strežnik Novell GroupWise
 Name[sv]=Novell Groupwise-server
 Name[ta]=Novell குழுவாரிச் சேவகன்
--- kresources/groupwise/kabc_groupwise.desktop
+++ kresources/groupwise/kabc_groupwise.desktop
@@ -9,6 +9,7 @@
 Name[da]=Novell GroupWise server
 Name[de]=Novell GroupWise-Adressbuch
 Name[el]=Εξυπηρετητής Novell GroupWise
+Name[en_GB]=Novell GroupWise Server
 Name[es]=Servidor de Novell GroupWise
 Name[et]=Novelli GroupWise server
 Name[eu]=Novell GroupWise zerbitzaria
@@ -40,6 +41,7 @@
 Name[pt_BR]=Servidor GroupWise da Novell
 Name[ro]=Server GroupWise Novell
 Name[ru]=Сервер Novell GroupWise
+Name[sk]=Novell GroupWise Server
 Name[sl]=Strežnik Novell GroupWise
 Name[sv]=Novell Groupwise-server
 Name[ta]=Novell குழுவாரிச் சேவகன்
--- kresources/slox/kcal_slox.desktop
+++ kresources/slox/kcal_slox.desktop
@@ -9,6 +9,7 @@
 Name[da]=SUSE Linux Openexchange-server
 Name[de]=SuSE Linux Openexchange-Adressbuch
 Name[el]=Εξυπηρετητή SUSE LINUX Openexchange
+Name[en_GB]=SUSE LINUX Openexchange Server
 Name[es]=Servidor Openexchange de SUSE LINUX
 Name[et]=SUSE LINUX Openexchange server
 Name[eu]=SUSE LINUX Openexchange zerbitzaria
@@ -38,8 +39,10 @@
 Name[pa]=SUSE LINUX Openexchange ਸਰਵਰ
 Name[pl]=Serwer SUSE LINUX Openexchange
 Name[pt]=Servidor SUSE LINUX Openexchange
-Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX)
+Name[pt_BR]=Servidor Openexchange do SUSE Linux (SLOX)
+Name[ro]=SUSE LINUX Openexchange Server
 Name[ru]=Сервер SUSE LINUX Openexchange
+Name[sk]=SUSE LINUX Openexchange Server
 Name[sl]=Strežnik SUSE LINUX Openexchange
 Name[sv]=SUSE Linux Openexchange-server
 Name[ta]=SUSE LINUX திறந்த பரிமாற்ற சேவகன்
--- kresources/slox/kcal_ox.desktop
+++ kresources/slox/kcal_ox.desktop
@@ -5,9 +5,11 @@
 Name[bg]=Сървър OpenXchange
 Name[br]=Servijer OpenXchange
 Name[ca]=Servidor OpenXchange
+Name[cs]=OpenXchange Server
 Name[da]=Openxchange-server
 Name[de]=OpenXchange-Server
 Name[el]=Εξυπηρετητής OpenXchange
+Name[en_GB]=OpenXchange Server
 Name[es]=Servidor OpenXchange
 Name[et]=OpenXchange server
 Name[eu]=OpenXchange zerbitzaria
@@ -39,6 +41,7 @@
 Name[pt_BR]=Servidor OpenXchange
 Name[ro]=Server OpenXchange
 Name[ru]=Сервер OpenXchange
+Name[sk]=OpenXchange Server
 Name[sl]=Strežnik OpenXchange
 Name[sv]=Openxchange-server
 Name[tr]=Openexchange Sunucusu
--- kresources/slox/kabc_slox.desktop
+++ kresources/slox/kabc_slox.desktop
@@ -9,6 +9,7 @@
 Name[da]=SUSE Linux Openexchange-server
 Name[de]=SuSE Linux Openexchange-Adressbuch
 Name[el]=Εξυπηρετητή SUSE LINUX Openexchange
+Name[en_GB]=SUSE LINUX Openexchange Server
 Name[es]=Servidor Openexchange de SUSE LINUX
 Name[et]=SUSE LINUX Openexchange server
 Name[eu]=SUSE LINUX Openexchange zerbitzaria
@@ -38,8 +39,10 @@
 Name[pa]=SUSE LINUX Openexchange ਸਰਵਰ
 Name[pl]=Serwer SUSE LINUX Openexchange
 Name[pt]=Servidor SUSE LINUX Openexchange
-Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX)
+Name[pt_BR]=Servidor Openexchange do SUSE Linux (SLOX)
+Name[ro]=SUSE LINUX Openexchange Server
 Name[ru]=Сервер SUSE LINUX Openexchange
+Name[sk]=SUSE LINUX Openexchange Server
 Name[sl]=Strežnik SUSE LINUX Openexchange
 Name[sv]=SUSE Linux Openexchange-server
 Name[ta]=SUSE LINUX திறந்த பரிமாற்ற சேவகன்
--- kresources/slox/kabc_ox.desktop
+++ kresources/slox/kabc_ox.desktop
@@ -5,9 +5,11 @@
 Name[bg]=Сървър OpenXchange
 Name[br]=Servijer OpenXchange
 Name[ca]=Servidor OpenXchange
+Name[cs]=OpenXchange Server
 Name[da]=Openxchange-server
 Name[de]=OpenXchange-Server
 Name[el]=Εξυπηρετητής OpenXchange
+Name[en_GB]=OpenXchange Server
 Name[es]=Servidor OpenXchange
 Name[et]=OpenXchange server
 Name[eu]=OpenXchange zerbitzaria
@@ -39,6 +41,7 @@
 Name[pt_BR]=Servidor OpenXchange
 Name[ro]=Server OpenXchange
 Name[ru]=Сервер OpenXchange
+Name[sk]=OpenXchange Server
 Name[sl]=Strežnik OpenXchange
 Name[sv]=Openxchange-server
 Name[tr]=Openexchange Sunucusu
@@ -52,6 +55,7 @@
 Comment[da]=Giver adgang til kontakter lagret på en Open-Xchange-server
 Comment[de]=Ermöglicht den Zugriff auf Kontakte, die auf einem Open-Xchange-Server gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Open-Xchange
+Comment[en_GB]=Provides access to contacts stored on an Open-Xchange server
 Comment[es]=Provee acceso a los contactos almacenados en un servidor Open-Xchange
 Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud Open-Xchange'i serverisse
 Comment[fr]=Fourni l'accès aux contacts stockés dans un serveur Open-Xchange
--- kresources/groupdav/kabc_groupdav.desktop
+++ kresources/groupdav/kabc_groupdav.desktop
@@ -9,6 +9,7 @@
 Name[da]=GroupDAV-server (f.eks. OpenGroupware)
 Name[de]=GroupDAV (z. B. OpenGroupware)
 Name[el]=Εξυπηρετητής GroupDAV (π.χ. OpenGroupware)
+Name[en_GB]=GroupDAV Server (e.g. OpenGroupware)
 Name[es]=Servidor GroupDAV (por ejemplo, OpenGroupware)
 Name[et]=GroupDAV server (nt. OpenGroupware)
 Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
@@ -53,6 +54,7 @@
 Comment[da]=Giver adgang til kontakter lagret i adressebøger på GroupDAV-aktiverede servere, f.eks. OpenGroupware
 Comment[de]=Ermöglicht den Zugriff auf Kontakte, die in einem Adressbuch auf einem GroupDAV-Server wie z. B. OpenGroupware gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε βιβλία διευθύνσεων εξυπηρετών GroupDAV  π.χ. το OpenGroupware
+Comment[en_GB]=Provides access to contacts stored in address books on GroupDAV enabled servers, e.g. OpenGroupware
 Comment[es]=Provee acceso a los contactos almacenados en la libreta de direcciones en un servidor GroupDAV habilitado, por ej. OpenGroupware
 Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud aadressiraamatutesse GroupDAVi toetusega serverites (nt OpenGroupware)
 Comment[fr]=Fourni l'accès aux contacts stockés dans les dossiers du carnet d'adresses d'un serveur prenant en charge GroupDAV comme par exemple OpenGroupware
--- kresources/groupdav/kcal_groupdav.desktop
+++ kresources/groupdav/kcal_groupdav.desktop
@@ -9,6 +9,7 @@
 Name[da]=GroupDAV-server (f.eks. OpenGroupware)
 Name[de]=GroupDAV (z. B. OpenGroupware)
 Name[el]=Εξυπηρετητής GroupDAV (π.χ. OpenGroupware)
+Name[en_GB]=GroupDAV Server (e.g. OpenGroupware)
 Name[es]=Servidor GroupDAV (por ejemplo, OpenGroupware)
 Name[et]=GroupDAV server (nt. OpenGroupware)
 Name[eu]=GroupDAV zerbitzaria (adib. OpenGroupware)
--- kresources/kolab/kabc/kolab.desktop
+++ kresources/kolab/kabc/kolab.desktop
@@ -6,6 +6,7 @@
 Name[da]=Adressebog på IMAP-server via KMail
 Name[de]=IMAP-Adressbuch via KMail
 Name[el]=Βιβλίο διευθύνσεων σε εξυπηρετητή IMAP μέσω του KMail
+Name[en_GB]=Address Book on IMAP Server via KMail
 Name[es]=Libreta de direcciones en servidor IMAP por medio de KMail
 Name[et]=Aadressiraamat IMAP-serveris (KMaili vahendusel)
 Name[fr]=Carnet d'adresses sur serveur IMAP (via KMail)
@@ -36,6 +37,7 @@
 Comment[da]=Giver adgang til kontakter lagret på en Kolap-server som bruger IMAP via KMail eller Kontact
 Comment[de]=Ermöglicht den Zugriff auf Kontakte, die mittels IMAP via KMail auf einem Kolab-Server gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Kolab με τη χρήση του IMAP  μέσω του KMail ή Kontact
+Comment[en_GB]=Provides access to contacts stored on a Kolab server using IMAP via KMail or Kontact
 Comment[es]=Provee acceso a los contactos almacenados en un servidor Kolab usando IMAP via KMail o Kontact
 Comment[et]=Võimaldab kasutada kontakte, mis on salvestatud Kolabi serverisse IMAP abil KMaili või Kontacti vahendusel
 Comment[fr]=Fourni l'accès aux contacts stockés dans un serveur Kolab utilisant IMAP via KMail ou Kontact
--- kresources/kolab/knotes/kolabresource.desktop
+++ kresources/kolab/knotes/kolabresource.desktop
@@ -9,6 +9,7 @@
 Name[da]=IMAP-server via KMail
 Name[de]=IMAP-Notizen via KMail
 Name[el]=Εξυπηρετητής IMAP μέσω του KMail
+Name[en_GB]=IMAP Server via KMail
 Name[es]=Servidor IMAP por medio de KMail
 Name[et]=IMAP-server (KMaili vahendusel)
 Name[eu]=IMAP zerbitzaria KMail-en bidez
--- kresources/kolab/kcal/kolab.desktop
+++ kresources/kolab/kcal/kolab.desktop
@@ -9,6 +9,7 @@
 Name[da]=Kalender på IMAP-server via KMail
 Name[de]=IMAP-Kalender via KMail
 Name[el]=Ημερολόγιο σε εξυπηρετητή IMAP μέσω του KMail
+Name[en_GB]=Calendar on IMAP Server via KMail
 Name[es]=Calendario en servidor IMAP por medio de KMail
 Name[et]=Kalender IMAP-serveris (KMaili vahendusel)
 Name[eu]=Egutegia IMAP zerbitzarian KMail-en bidez
@@ -55,6 +56,7 @@
 Comment[da]=Giver adgang til en kalender lagret på en Kolab-server som bruger IMAP via KMail eller Kontact
 Comment[de]=Ermöglicht den Zugriff auf Kalender, die mittels IMAP via KMail oder Kontact auf einem Kolab-Server gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε ένα ημερολόγιο αποθηκευμένο σε έναν εξυπηρετητή Kolab με τη χρήση του IMAP  μέσω του KMail ή Kontact
+Comment[en_GB]=Provides access to a calendar stored on a Kolab server using IMAP via KMail or Kontact
 Comment[es]=Provee acceso a un calendario almacenado en un servidor Kolab usando IMAP via KMail o Kontact
 Comment[et]=Võimaldab kasutada kalendrit, mis on salvestatud Kolabi serverisse IMAP abil KMaili või Kontacti vahendusel
 Comment[fr]=Fourni l'accès à un calendrier stocké dans un serveur Kolab utilisant IMAP via KMail ou Kontact
--- kresources/birthdays/kabc.desktop
+++ kresources/birthdays/kabc.desktop
@@ -10,6 +10,7 @@
 Name[da]=Fødselsdage fra KAddressBook
 Name[de]=Geburtstage aus dem Adressbuch
 Name[el]=Γενέθλια από το KAddressBook
+Name[en_GB]=Birthdays From KAddressBook
 Name[eo]=Naskiĝdatoj de KAdresaro
 Name[es]=Cumpleaños desde KAddressBook
 Name[et]=Sünnipäevad KDE aadressiraamatust
@@ -61,6 +62,7 @@
 Comment[da]=Giver adgang til fødselsdatoer for kontakter i KDE's adressebog som kalenderbegivenheder
 Comment[de]=Ermöglicht den Zugriff auf Geburtstage von Kontakten aus dem KDE-Adressbuch in Form von Kalendereinträgen.
 Comment[el]=Προσφέρει πρόσβαση σε γενέθλια επαφών του βιβλίο διευθύνσεωη του KDE ως  γεγονότα ημερολογίου
+Comment[en_GB]=Provides access to birthday dates of contacts in the KDE address book as calendar events
 Comment[es]=Provee acceso a las fechas de cumpleaños de los contactos en la libreta de direcciones como eventos de calendario
 Comment[et]=Võimaldab kasutada KDE aadressiraamatusse kalendrisündmustena salvestatud kontaktide sünnipäevi
 Comment[fr]=Fourni l'accès aux dates d'anniversaire des contacts du carnet d'adresses comme des évènements du calendrier
--- kresources/groupware/kabc_groupware.desktop
+++ kresources/groupware/kabc_groupware.desktop
@@ -6,8 +6,10 @@
 Name[br]=Servijer strollant
 Name[ca]=Servidor Groupware
 Name[cs]=Groupware server
+Name[da]=Groupware Server
 Name[de]=Groupware-Server
 Name[el]=Εξυπηρετητής Groupware
+Name[en_GB]=Groupware Server
 Name[es]=Servidor de Groupware
 Name[et]=Grupitöö server
 Name[eu]=Groupware zerbitzaria
@@ -39,6 +41,7 @@
 Name[pt_BR]=Servidor Groupware
 Name[ro]=Server Groupware
 Name[ru]=Сервер совместной работы
+Name[sk]=Groupware Server
 Name[sl]=Strežnik za skupinsko delo
 Name[sv]=Grupprogramserver
 Name[ta]=குழுவாரி சேவகன்
@@ -54,6 +57,7 @@
 Comment[da]=Giver adgang til kontakter lagret på en groupware-server.
 Comment[de]=Ermöglicht den Zugriff auf Kontakte, die auf einem Groupware-Server gespeichert sind.
 Comment[el]=Προσφέρει πρόσβαση σε επαφές αποθηκευμένες σε έναν εξυπηρετητή Groupware.
+Comment[en_GB]=Provides access to contacts stored on a Groupware server.
 Comment[es]=Provee acceso a los contactos almacenados en un servidor Groupware.
 Comment[et]=Võimaldab kasutada grupitöö serverisse salvestatud kontakte.
 Comment[fr]=Fourni l'accès aux contacts stockés un serveur collaboratif.
--- kresources/groupware/kcal_groupware.desktop
+++ kresources/groupware/kcal_groupware.desktop
@@ -6,8 +6,10 @@
 Name[br]=Servijer strollant
 Name[ca]=Servidor Groupware
 Name[cs]=Groupware server
+Name[da]=Groupware Server
 Name[de]=Groupware-Server
 Name[el]=Εξυπηρετητής Groupware
+Name[en_GB]=Groupware Server
 Name[es]=Servidor de Groupware
 Name[et]=Grupitöö server
 Name[eu]=Groupware zerbitzaria
@@ -39,6 +41,7 @@
 Name[pt_BR]=Servidor Groupware
 Name[ro]=Server Groupware
 Name[ru]=Сервер совместной работы
+Name[sk]=Groupware Server
 Name[sl]=Strežnik za skupinsko delo
 Name[sv]=Grupprogramserver
 Name[ta]=குழுவாரி சேவகன்
--- kresources/remote/remote.desktop
+++ kresources/remote/remote.desktop
@@ -10,6 +10,7 @@
 Name[da]=Kalender i ekstern fil
 Name[de]=Datei-Kalender auf Fremdrechner
 Name[el]=Ημερολόγιο σε απομακρυσμένο αρχείο
+Name[en_GB]=Calendar in Remote File
 Name[es]=Calendario en un archivo remoto
 Name[et]=Kalender võrgufailis
 Name[eu]=Egutegia urruneko fitxategi batean
@@ -58,6 +59,7 @@
 Comment[da]=Giver adgang til en kalender i en ekstern fil med brug af KDE's netværks-framework KIO
 Comment[de]=Ermöglicht den Zugriff auf einen entfernten Kalender über KDEs Netzwerk-Zugriffsystem KIO.
 Comment[el]=Προσφέρει πρόσβαση ημερολογίου σε ένα απομακρυσμένο αρχείου με τη χρήση του  συστήματος KIO του KDE
+Comment[en_GB]=Provides access to a calendar in a remote file using KDE's network framework KIO
 Comment[es]=Provee acceso a un calendario en un archivo remoto utilizando la infraestructura KIO de red de KDE 
 Comment[et]=Võimaldab kasutada võrgufaili salvestatud kalendrit KDE võrguraamistiku KIO abil
 Comment[fr]=Fourni l'accès à un calendrier dans un fichier distant en utilisant les composants réseaux KIO de KDE
--- kmail/kmail.antispamrc
+++ kmail/kmail.antispamrc
@@ -56,13 +56,13 @@
 Version=1
 Priority=30
 VisibleName=Annoyance-Filter
-Executable=$HOME/.annoyance-filter/annoyance-filter --version
+Executable=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --version
 URL=http://www.fourmilab.ch/annoyance-filter
 PipeFilterName=Annoyance-Filter Check
-PipeCmdDetect=$HOME/.annoyance-filter/annoyance-filter --fread $HOME/.annoyance-filter/FastDict.bin --phrasemin 1 --phrasemax 2 --transcript - --test -
+PipeCmdDetect=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --fread $HOME/.annoyance-filter/FastDict.bin --phrasemin 1 --phrasemax 2 --transcript - --test -
 PipeCmdNoSpam=
-ExecCmdSpam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --junk - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
-ExecCmdHam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --mail - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
+ExecCmdSpam=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --junk - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
+ExecCmdHam=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --mail - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
 DetectionHeader=X-Annoyance-Filter-Classification
 DetectionPattern=Junk
 DetectionPattern2=
--- kmail/imapaccountbase.cpp
+++ kmail/imapaccountbase.cpp
@@ -876,7 +876,7 @@
 //-----------------------------------------------------------------------------
 QString ImapAccountBase::delimiterForNamespace( const QString &prefix )
 {
-  kDebug() <<"delimiterForNamespace" << prefix;
+  //kDebug() <<"delimiterForNamespace" << prefix;
   // try to match exactly
   if ( mNamespaceToDelimiter.contains( prefix ) ) {
     return mNamespaceToDelimiter[prefix];
@@ -1112,15 +1112,15 @@
   }
 
   QList<FolderJob*>::iterator jt;
-  for ( jt = mJobList.begin(); jt != mJobList.end(); ++jt ) {
+  for ( jt = mJobList.begin(); jt != mJobList.end(); ) {
     if ( (*jt)->isCancellable() ) {
       FolderJob* job = (*jt);
       job->setPassiveDestructor( true );
       jt = mJobList.erase( jt );
       delete job;
-    } else {
-      ++jt;
     }
+    else
+      ++jt;
   }
 }
 
--- kmail/kmailicalifaceimpl.cpp
+++ kmail/kmailicalifaceimpl.cpp
@@ -1712,6 +1712,21 @@
   }
 }
 
+// Builds a folder list from the dimap and the local folder list.
+static void createFolderList( QStringList &folderNames, QList<QPointer<KMFolder> > &folderList )
+{
+  QStringList dimapFolderNames;
+  QStringList localFolderNames;
+  QList<QPointer<KMFolder> > dimapFolderList;
+  QList<QPointer<KMFolder> > localFolderList;
+  kmkernel->dimapFolderMgr()->createFolderList( &dimapFolderNames, &dimapFolderList );
+  kmkernel->folderMgr()->createFolderList( &localFolderNames, &localFolderList );
+  folderNames += dimapFolderNames;
+  folderNames += localFolderNames;
+  folderList += dimapFolderList;
+  folderList += localFolderList;
+}
+
 /****************************
  * The config stuff
  */
@@ -1882,9 +1897,6 @@
     if ( mNotes->folderType() == KMFolderTypeCachedImap )
       static_cast<KMFolderCachedImap *>( mNotes->storage() )->updateAnnotationFolderType();
 
-    // BEGIN TILL TODO The below only uses the dimap folder manager, which
-    // will fail for all other folder types. Adjust.
-
     kDebug() << "mCalendar=" << mCalendar << mCalendar->location();
     kDebug() << "mContacts=" << mContacts << mContacts->location();
     kDebug() << "mNotes=" << mNotes << mNotes->location();
@@ -1892,13 +1904,15 @@
     // Find all extra folders
     QStringList folderNames;
     QList<QPointer<KMFolder> > folderList;
-    kmkernel->dimapFolderMgr()->createFolderList(&folderNames, &folderList);
+    createFolderList( folderNames, folderList );
     for(QList<QPointer<KMFolder> >::iterator it = folderList.begin();
         it != folderList.end(); ++it)
     {
-      KMFolderCachedImap* storage = dynamic_cast<KMFolderCachedImap*>( (*it)->storage() );
+      FolderStorage *storage = (*it)->storage();
+      KMFolderCachedImap* dimapStorage = dynamic_cast<KMFolderCachedImap*>( storage );
       if ( storage && storage->contentsType() != 0 ) {
-        storage->updateAnnotationFolderType();
+        if ( dimapStorage )
+          dimapStorage->updateAnnotationFolderType();
         folderContentsTypeChanged( *it, storage->contentsType() );
       }
     }
@@ -1916,8 +1930,6 @@
     if ( mExtraFolders.contains( mNotes->location() ) )
       delete mExtraFolders.take( mNotes->location() );
 
-    // END TILL TODO
-
     emit subresourceAdded( folderContentsType( KMail::ContentsTypeCalendar ),
                            mCalendar->location(), mCalendar->label(), true, true );
     emit subresourceAdded( folderContentsType( KMail::ContentsTypeTask ),
--- kmail/dbusmail.desktop
+++ kmail/dbusmail.desktop
@@ -8,6 +8,7 @@
 Comment[da]=E-mail-program med en D-BUS-grænseflade
 Comment[de]=E-Mail-Programm mit D-Bus-Schnittstelle
 Comment[el]=Πρόγραμμα αλληλογραφίας με διασύνδεση D-Bus
+Comment[en_GB]=Mail program with a D-Bus interface
 Comment[es]=Programa de correo con una interfaz D-Bus
 Comment[et]=E-posti rakendus D-Busi liidesega
 Comment[fr]=Programme de messagerie avec une interface D-Bus
--- kmail/messagelistview/core/model.cpp
+++ kmail/messagelistview/core/model.cpp
@@ -60,6 +60,7 @@
 #include <QScrollBar>
 
 #include <KLocale>
+#include <KCalendarSystem>
 #include <KGlobal>
 #include <KDebug>
 #include <kcursorsaver.h>
@@ -309,7 +310,8 @@
 void Model::setAggregation( const Aggregation * aggregation )
 {
   mAggregation = aggregation;
-  mView->setRootIsDecorated( mAggregation->grouping() == Aggregation::NoGrouping );
+  mView->setRootIsDecorated( ( mAggregation->grouping() == Aggregation::NoGrouping ) &&
+                             ( mAggregation->threading() != Aggregation::NoThreading ) );
 }
 
 void Model::setTheme( const Theme * theme )
@@ -1182,34 +1184,6 @@
   }
 }
 
-static inline QString get_capitalized_long_day_name( int dayOfWeek )
-{
-  // The day name should be capitalized in the group labels
-  // This fixes some complaints from translators that have mapped
-  // their standard day names to lowercase versions for general
-  // use but still want them to be capitalized in the headers...
-  QString name = QDate::longDayName( dayOfWeek );
-  if ( name.isEmpty() )
-    return name;
-  QString copy = name;
-  copy[ 0 ] = name.at( 0 ).toUpper();
-  return copy;
-}
-
-static inline QString get_capitalized_month_name( int month )
-{
-  // The month name should be capitalized in the group labels
-  // This fixes some complaints from translators that have mapped
-  // their standard month names to lowercase versions for general
-  // use but still want them to be capitalized in the headers...
-  QString name = QDate::longMonthName( month );
-  if ( name.isEmpty() )
-    return name;
-  QString copy = name;
-  copy[ 0 ] = name.at( 0 ).toUpper();
-  return copy;
-}
-
 void Model::attachMessageToGroupHeader( MessageItem *mi )
 {
   QString groupLabel;
@@ -1265,24 +1239,12 @@
         if ( dateWeekNumber == todayWeekNumber )
         {
           // within this week
-          groupLabel = get_capitalized_long_day_name( dDate.dayOfWeek() );
+          groupLabel = KGlobal::locale()->calendar()->weekDayName( dDate );
         } else {
-          // not this week
-          // FIXME: After 4.2 think about a configurable date format.
-          //        At the moment KMime::DateFormatter doesn't support date-only formatting.
-          //        KDateTime is not better than QDate in this case.
-          //        A configurable date-only format should be probably tweaked into KMime::DateFormatter
-          //        but this can't be done with the string freeze in effect.
-          groupLabel = dDate.toString( Qt::DefaultLocaleShortDate );
+          groupLabel = KGlobal::locale()->formatDate( dDate, KLocale::ShortDate );
         }
       } else {
-        // not within this month
-        // FIXME: After 4.2 think about a configurable date format.
-        //        At the moment KMime::DateFormatter doesn't support date-only formatting.
-        //        KDateTime is not better than QDate in this case.
-        //        A configurable date-only format should be probably tweaked into KMime::DateFormatter
-        //        but this can't be done with the string freeze in effect.
-        groupLabel = dDate.toString( Qt::DefaultLocaleShortDate );
+        groupLabel = KGlobal::locale()->formatDate( dDate, KLocale::ShortDate );
       }
 
     }
@@ -1335,7 +1297,7 @@
         if ( dateWeekNumber == todayWeekNumber )
         {
           // within this week
-          groupLabel = get_capitalized_long_day_name( dDate.dayOfWeek() );
+          groupLabel = KGlobal::locale()->calendar()->weekDayName( dDate );
         } else {
           // previous weeks
           int weekDiff = todayWeekNumber - dateWeekNumber;
@@ -1364,10 +1326,12 @@
         )
         {
           // group by months, this year (so no year appended)
-          groupLabel = get_capitalized_month_name( dDate.month() );
+          groupLabel = KGlobal::locale()->calendar()->monthName( dDate );
         } else {
           // group by months
-          groupLabel = QString( "%1 %2" ).arg( get_capitalized_month_name( dDate.month() ) ).arg( dDate.year() );
+          groupLabel = QString( "%1 %2" )
+            .arg( KGlobal::locale()->calendar()->monthName( dDate ) )
+            .arg( dDate.year() );
         }
       }
     }
--- kmail/profiles/profile-high-contrast-rc.desktop
+++ kmail/profiles/profile-high-contrast-rc.desktop
@@ -11,6 +11,7 @@
 Name[da]=Høj kontrast
 Name[de]=Starker Kontrast
 Name[el]=Μεγάλη αντίθεση
+Name[en_GB]=High Contrast
 Name[eo]=Forta kontrasto
 Name[es]=Alto contraste
 Name[et]=Suur kontrast
@@ -68,6 +69,7 @@
 Comment[da]=Forøgede skrifttypestørrelser for brugere med svagt syn
 Comment[de]=Größere Schriften für sehbehinderte Benutzer
 Comment[el]=Αυξημένα μεγέθη γραμματοσειρών για χρήστες με προβλήματα όρασης
+Comment[en_GB]=Increased font sizes for visually impaired users
 Comment[eo]=Pligrandigitaj tiparoj por vidhandikapitoj
 Comment[es]=Tamaños de letra grandes para usuarios con deficiencias visuales
 Comment[et]=Suured fondid halva nägemisega kasutajatele
--- kmail/profiles/profile-default-rc.desktop
+++ kmail/profiles/profile-default-rc.desktop
@@ -11,6 +11,7 @@
 Name[da]=Standard
 Name[de]=Standard
 Name[el]=Προκαθορισμένο
+Name[en_GB]=Default
 Name[eo]=Apriora
 Name[es]=Predeterminado
 Name[et]=Vaikimisi
@@ -76,6 +77,7 @@
 Comment[da]=Standard-profil
 Comment[de]=Standardprofil
 Comment[el]=Τυπικό προφίλ
+Comment[en_GB]=Standard profile
 Comment[eo]=Apriora agordo
 Comment[es]=Perfil estándar
 Comment[et]=Standardprofiil
--- kmail/profiles/profile-html-rc.desktop
+++ kmail/profiles/profile-html-rc.desktop
@@ -1,9 +1,69 @@
 [KMail Profile]
 Name=HTML
+Name[af]=HTML
+Name[ar]=HTML
+Name[be]=HTML
 Name[bg]=Поддръжка на HTML
+Name[br]=HTML
+Name[ca]=HTML
+Name[cs]=HTML
+Name[cy]=HTML
+Name[da]=HTML
+Name[de]=HTML
+Name[el]=HTML
+Name[en_GB]=HTML
+Name[eo]=HTML
+Name[es]=HTML
+Name[et]=HTML
+Name[eu]=HTML
 Name[fa]=زنگام
+Name[fi]=HTML
+Name[fr]=HTML
+Name[fy]=HTML
+Name[ga]=HTML
+Name[gl]=HTML
+Name[he]=HTML
+Name[hr]=HTML
+Name[hu]=HTML
+Name[is]=HTML
+Name[it]=HTML
+Name[ja]=HTML
+Name[ka]=HTML
+Name[kk]=HTML
+Name[km]=HTML
+Name[ko]=HTML
+Name[lt]=HTML
+Name[lv]=HTML
+Name[mai]=HTML
+Name[mk]=HTML
+Name[ms]=HTML
+Name[nb]=HTML
+Name[nds]=HTML
 Name[ne]=एचटीएमएल
+Name[nl]=HTML
+Name[nn]=HTML
+Name[oc]=HTML
+Name[pa]=HTML
+Name[pl]=HTML
+Name[pt]=HTML
+Name[pt_BR]=HTML
+Name[ro]=HTML
+Name[ru]=HTML
+Name[se]=HTML
+Name[sk]=HTML
+Name[sl]=HTML
+Name[sv]=HTML
+Name[ta]=HTML
+Name[tg]=HTML
+Name[tr]=HTML
+Name[uk]=HTML
+Name[uz]=HTML
+Name[uz@cyrillic]=HTML
+Name[vi]=HTML
+Name[xh]=HTML
 Name[x-test]=xxHTMLxx
+Name[zh_CN]=HTML
+Name[zh_TW]=HTML
 Comment=Standard profile with HTML preview enabled - less secure!
 Comment[af]=Standaard profiel, met HTML voorskou geaktiveer. Dis minder veilig!
 Comment[ar]=تشكيلة قياسية مع تمكين معاينة HTML -  أقل آمنا !
@@ -14,6 +74,7 @@
 Comment[da]=Standardprofil med HTML-visning aktiveret - mindre sikkert!
 Comment[de]=Standardprofil mit aktivierter HTML-Vorschau - weniger sicher
 Comment[el]=Τυπικό προφίλ με την προεπισκόπηση HTML ενεργοποιημένη - λιγότερο ασφαλές!
+Comment[en_GB]=Standard profile with HTML preview enabled - less secure!
 Comment[eo]=Apriora agordo, kun ŝaltita HTML-antaŭrigardo - malpli sekura!
 Comment[es]=Perfil estándar con la previsualización de HTML activada - menos seguro
 Comment[et]=Standardprofiil HTML-i eelvaatlusega - pole nii turvaline!
--- kmail/profiles/profile-purist-rc.desktop
+++ kmail/profiles/profile-purist-rc.desktop
@@ -3,19 +3,27 @@
 Name[af]=Suiwer
 Name[ar]=صافي
 Name[bg]=Пуритан
+Name[ca]=Purist
 Name[cs]=Puristický
 Name[cy]=Puryddol
+Name[da]=Purist
+Name[de]=Purist
+Name[el]=Purist
+Name[en_GB]=Purist
 Name[eo]=Puristo
 Name[es]=Purista
+Name[et]=Purist
 Name[eu]=Purista
 Name[fa]=سَره‌گرا
 Name[fi]=Puristi
 Name[fr]=Puriste
+Name[fy]=Purist
 Name[ga]=Saoithín
 Name[gl]=Purista
 Name[he]=נקי
 Name[hr]=Čistunski
 Name[hu]=Egyszerűsített
+Name[is]=Purist
 Name[it]=Purista
 Name[ja]=純正
 Name[ka]=პურისტი
@@ -25,19 +33,25 @@
 Name[lt]=Itin paprastas
 Name[lv]=Puritānis
 Name[ms]=Mementingkan Istilah Yang Betul
+Name[nb]=Purist
 Name[nds]=Reen
 Name[ne]=संस्कारक
+Name[nl]=Purist
+Name[nn]=Purist
 Name[pl]=Czysty
 Name[pt]=Purista
 Name[pt_BR]=Purista
 Name[ro]=Puritan
 Name[ru]=Аскет
 Name[se]=Oktageardán
+Name[sk]=Purist
+Name[sl]=Purist
 Name[sv]=Ren
 Name[ta]=சுத்தமானது
 Name[tg]=Пурист
 Name[tr]=Sadelikçi
 Name[uk]=Пуристичний
+Name[vi]=Purist
 Name[xh]=isiPurist
 Name[x-test]=xxPuristxx
 Name[zh_CN]=严格
@@ -52,6 +66,7 @@
 Comment[da]=De fleste egenskaber slået fra, KDE's globale indstillinger bruges
 Comment[de]=Die meisten Funktionen werden zugunsten von KDE-Voreinstellungen deaktiviert
 Comment[el]=Τα περισσότερα χαρακτηριστικά απενεργοποιημένα, ενώ χρησιμοποιούνται οι καθολικές ρυθμίσεις του KDE
+Comment[en_GB]=Most features turned off, KDE global settings are used
 Comment[eo]=Plej multaj funkcioj malŝaltitaj, malloka agordo de KDE estas uzata
 Comment[es]=La mayoría de las características desactivadas; se usan las preferencias globales de KDE
 Comment[et]=Enamik võimalusi välja lülitatud, kasutatakse KDE seadistusi
--- kmail/profiles/profile-secure-rc.desktop
+++ kmail/profiles/profile-secure-rc.desktop
@@ -9,6 +9,7 @@
 Name[da]=Mest sikker
 Name[de]=Sicherste Variante
 Name[el]=Πιο ασφαλές
+Name[en_GB]=Most Secure
 Name[eo]=Plej sekura
 Name[es]=Más seguro
 Name[et]=Kõige turvalisem
@@ -67,6 +68,7 @@
 Comment[da]=Sætter alle nødvendige tilvalg til maksimal sikkerhed
 Comment[de]=Aktivierung aller nötigen Einstellungen für die höchste Sicherheitsstufe
 Comment[el]=Ενεργοποιεί όλες τις απαραίτητες επιλογές για την επίτευξη της μέγιστης ασφάλειας
+Comment[en_GB]=Sets all necessary options to achieve maximum security
 Comment[eo]=Agordas la necesajn opciojn por atingi maksimuman sekurecon
 Comment[es]=Pone todas las opciones necesarias para lograr la máxima seguridad
 Comment[et]=Kõik võimalused maksimaalse turvalisuse tagamiseks
--- kmail/application_octetstream.desktop
+++ kmail/application_octetstream.desktop
@@ -4,8 +4,13 @@
 Name[ca]=Aplicació Octet Stream
 Name[cs]=Aplikace octetstream
 Name[da]=Programmet Octet Stream
+Name[de]=Application Octet Stream
+Name[el]=Application Octet Stream
+Name[en_GB]=Application Octet Stream
 Name[es]=Flujo de octetos de la aplicación
+Name[et]=Application Octet Stream
 Name[fr]=Application octetstream
+Name[ga]=Application Octet Stream
 Name[gl]=Aplicación Octet Stream
 Name[it]=Application Octetstream
 Name[ja]=アプリケーション/オクテットストリーム
@@ -34,6 +39,7 @@
 Comment[da]=Et bodypart formateringsplugin for application/octet-stream
 Comment[de]=Ein Bodypart-Formatiermodul für application/octet-stream
 Comment[el]=Ένας μορφοποιητής για application/octet-stream
+Comment[en_GB]=A bodypart formatter plugin for application/octet-stream
 Comment[es]=Un complemento de formateo para el cuerpo de application/octet-stream
 Comment[et]=Põhiosa vormindamisplugin (MIME tüübile application/octet-stream)
 Comment[eu]=Gorputz-zati formateatzaile plugin bat aplikazio/zortikote-jarioentzat
--- kmail/kmail_config_misc.desktop
+++ kmail/kmail_config_misc.desktop
@@ -24,6 +24,7 @@
 Name[da]=Diverse
 Name[de]=Diverses
 Name[el]=Διάφορα
+Name[en_GB]=Misc
 Name[es]=Varios
 Name[et]=Muud
 Name[eu]=Miszelanea
@@ -81,6 +82,7 @@
 Comment[da]=Indstillinger der ikke passer ind andre steder
 Comment[de]=Verschiedene Einstellungen
 Comment[el]=Ρυθμίσεις που δεν ταιριάζουν κάπου αλλού
+Comment[en_GB]=Settings that don't fit elsewhere
 Comment[eo]=Agordoj kiuj apartenas nenie alie
 Comment[es]=Preferencias que no encajan en ningún otro sitio
 Comment[et]=Seadistused, mis ei sobi kuhugi mujale
--- kmail/annotationjobs.cpp
+++ kmail/annotationjobs.cpp
@@ -118,7 +118,7 @@
   GetAnnotationJob* getJob = static_cast<GetAnnotationJob *>( job );
   const AnnotationList& lst = getJob->annotations();
   for ( int i = 0 ; i < lst.size() ; ++ i ) {
-    kDebug() <<"found annotation" << lst[i].name <<" =" << lst[i].value;
+    //kDebug() <<"found annotation" << lst[i].name <<" =" << lst[i].value;
     if ( lst[i].name.startsWith( QLatin1String("value.") ) ) { // value.priv or value.shared
       found = true;
       value = lst[i].value;
--- kmail/kmail.notifyrc
+++ kmail/kmail.notifyrc
@@ -1,14 +1,64 @@
 [Global]
 IconName=kmail
 Comment=KMail
+Comment[af]=KMail
 Comment[ar]=برنامج البريد KMail
+Comment[bg]=KMail
+Comment[br]=KMail
+Comment[ca]=KMail
+Comment[cs]=KMail
+Comment[cy]=KMail
+Comment[da]=KMail
+Comment[de]=KMail
+Comment[el]=KMail
+Comment[en_GB]=KMail
 Comment[eo]=Retpoŝto
+Comment[es]=KMail
+Comment[et]=KMail
+Comment[eu]=KMail
+Comment[fi]=KMail
+Comment[fr]=KMail
+Comment[fy]=KMail
+Comment[ga]=KMail
+Comment[gl]=KMail
+Comment[he]=KMail
+Comment[hr]=KMail
+Comment[hu]=KMail
+Comment[is]=KMail
+Comment[it]=KMail
+Comment[ja]=KMail
+Comment[ka]=KMail
+Comment[km]=KMail
+Comment[ko]=KMail
+Comment[lt]=KMail
+Comment[lv]=KMail
+Comment[mai]=KMail
 Comment[mk]=КПошта
+Comment[ms]=KMail
+Comment[nb]=KMail
+Comment[nds]=KMail
+Comment[nl]=KMail
+Comment[nn]=KMail
+Comment[oc]=KMail
 Comment[pa]=ਕੇਮੇਲ
+Comment[pl]=KMail
+Comment[pt]=KMail
+Comment[pt_BR]=KMail
+Comment[ro]=KMail
+Comment[ru]=KMail
+Comment[sk]=KMail
+Comment[sl]=KMail
 Comment[sv]=Kmail
 Comment[ta]=kஅஞ்சல்
+Comment[tg]=KMail
 Comment[th]=จัดการจดหมาย K
+Comment[tr]=KMail
+Comment[uk]=KMail
+Comment[uz]=KMail
+Comment[uz@cyrillic]=KMail
+Comment[wa]=KMail
 Comment[x-test]=xxKMailxx
+Comment[zh_CN]=KMail
 Comment[zh_TW]=KMail 郵件軟體
 
 [Event/new-mail-arrived]
@@ -21,6 +71,7 @@
 Name[da]=Ny post ankommet
 Name[de]=Neue Nachrichten
 Name[el]=Έφτασε νέα αλληλογραφία
+Name[en_GB]=New Mail Arrived
 Name[eo]=Nova Poŝto Alvenis
 Name[es]=Ha llegado un nuevo mensaje
 Name[et]=Saabus uus kiri
@@ -75,6 +126,7 @@
 Comment[da]=Ny post ankommet
 Comment[de]=Neue Nachrichten sind eingetroffen
 Comment[el]=Έφτασε νέα αλληλογραφία
+Comment[en_GB]=New mail arrived
 Comment[eo]=Nova poŝto alvenis
 Comment[es]=Ha llegado un nuevo mensaje
 Comment[et]=Saabus uus kiri
--- kmail/kmpopfiltercnfrmdlg.cpp
+++ kmail/kmpopfiltercnfrmdlg.cpp
@@ -55,9 +55,6 @@
               << i18nc("@title:column", "Sender") << i18nc("@title:column", "Receiver")
               << i18nc("@title:column", "Date") << i18nc("@title:column", "Size");
   QTreeWidgetItem *headerItem = new QTreeWidgetItem( headerNames );
-  headerItem->setTextAlignment( 0, Qt::AlignHCenter );
-  headerItem->setTextAlignment( 1, Qt::AlignHCenter );
-  headerItem->setTextAlignment( 2, Qt::AlignHCenter );
   headerItem->setTextAlignment( 7, Qt::AlignRight );
   headerItem->setToolTip( 0, i18nc("@action:button", "Download all messages now") );
   headerItem->setToolTip( 1, i18nc("@action:button", "Download all messages later") );
@@ -76,9 +73,9 @@
   //    Disable it for now.
   //header()->setResizeMode( 3, QHeaderView::Stretch );
   header()->setStretchLastSection( false );
-  setColumnWidth( 0, 22 );    // Download Now icon
-  setColumnWidth( 1, 22 );    // Download Later icon
-  setColumnWidth( 2, 22 );    // Delete icon
+  setColumnWidth( 0, IconSize( KIconLoader::Small ) + 6 );    // Download Now icon
+  setColumnWidth( 1, IconSize( KIconLoader::Small ) + 6 );    // Download Later icon
+  setColumnWidth( 2, IconSize( KIconLoader::Small ) + 6 );    // Delete icon
   setColumnWidth( 3, 180 );   // Subject
   setColumnWidth( 4, 140 );   // Sender
   setColumnWidth( 5, 140);    // Receiver
@@ -150,7 +147,8 @@
   }
 }
 
-void KMPopHeadersView::slotRadioButtonClicked( QTreeWidgetItem* item, int column ) {
+void KMPopHeadersView::slotRadioButtonClicked( QTreeWidgetItem* item, int column )
+{
   assert( item && column >= 0 && column < NoAction );
   mDialog->setAction( item, mapToAction( column ) );
 
--- kmail/cachedimapjob.cpp
+++ kmail/cachedimapjob.cpp
@@ -510,7 +510,7 @@
         bool b = kmkernel->iCalIface().isResourceQuiet();
         kmkernel->iCalIface().setResourceQuiet( true );
 
-        mFolder->take( i );
+        mFolder->takeTemporarily( i );
         mFolder->addMsgKeepUID( mMsg );
         mMsg->setTransferInProgress( false );
 
--- kmail/kmail_config_composer.desktop
+++ kmail/kmail_config_composer.desktop
@@ -13,6 +13,7 @@
 X-KDE-Weight=400
 
 Name=Composer
+Name[af]=Composer
 Name[ar]=المؤلف
 Name[bg]=Редактор
 Name[br]=Skridaozer
@@ -22,6 +23,7 @@
 Name[da]=Brevskriver
 Name[de]=E-Mail-Editor
 Name[el]=Σύνταξη μηνυμάτων
+Name[en_GB]=Composer
 Name[es]=Editor
 Name[et]=Koostaja
 Name[eu]=Editorea
@@ -33,6 +35,7 @@
 Name[gl]=Compositor
 Name[he]=עורך
 Name[hu]=Szerkesztő
+Name[is]=Composer
 Name[it]=Compositore
 Name[ja]=メール作成
 Name[ka]=წერილების რედაქტორი
@@ -74,6 +77,7 @@
 Comment[da]=Indstiling af brevskriver
 Comment[de]=Einstellungen für den E-Mail-Editor
 Comment[el]=Ρυθμίσεις σύνθεσης μηνύματος
+Comment[en_GB]=Message Composer Settings
 Comment[es]=Preferencias del editor de mensajes
 Comment[et]=Kirjakoostaja seadistused
 Comment[fr]=Configuration de l'éditeur de messages
--- kmail/kmlineeditspell.cpp
+++ kmail/kmlineeditspell.cpp
@@ -97,7 +97,7 @@
   const QAction *result = menu.exec( QCursor::pos() );
   if ( !result )
     return;
-  setText( contents + result->text() );
+  setText( contents + KGlobal::locale()->removeAcceleratorMarker( result->text() ) );
 }
 
 void KMLineEdit::dropEvent(QDropEvent *event)
@@ -202,8 +202,13 @@
       int idx = addCompletionSource( i18n( "Recent Addresses" ) );
       for ( ; it != recent.end(); ++it ) {
         KABC::Addressee addr;
-        KPIMUtils::extractEmailAddressAndName(*it, email, name);
-        addr.setNameFromString( KPIMUtils::quoteNameIfNecessary( name ));
+        KPIMUtils::extractEmailAddressAndName( *it, email, name );
+        name = KPIMUtils::quoteNameIfNecessary( name );
+        if ( ( name[0] == '"' ) && ( name[name.length() - 1] == '"' ) ) {
+          name.remove( 0, 1 );
+          name.truncate( name.length() - 1 );
+        }
+        addr.setNameFromString( name );
         addr.insertEmail( email, true );
         addContact( addr, 120, idx ); // more weight than kabc entries and more than ldap results
       }
--- kmail/kmreaderwin.cpp
+++ kmail/kmreaderwin.cpp
@@ -2489,13 +2489,13 @@
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotScrollPrior()
 {
-  mViewer->view()->scrollBy( 0, -(int)(height() * 0.8 ) );
+  mViewer->view()->scrollBy( 0, -(int)(mViewer->widget()->height() * 0.8 ) );
 }
 
 //-----------------------------------------------------------------------------
 void KMReaderWin::slotScrollNext()
 {
-  mViewer->view()->scrollBy( 0, (int)(height() * 0.8 ) );
+  mViewer->view()->scrollBy( 0, (int)(mViewer->widget()->height() * 0.8 ) );
 }
 
 //-----------------------------------------------------------------------------
--- kmail/kmmessage.cpp
+++ kmail/kmmessage.cpp
@@ -3237,18 +3237,17 @@
 }
 
 //-----------------------------------------------------------------------------
-void KMMessage::updateAttachmentState( DwBodyPart *part )
+void KMMessage::updateAttachmentState( DwBodyPart *partGiven )
 {
+  DwEntity *part = partGiven;
+  DwBodyPart *firstPart = partGiven;
+
   if ( !part ) {
-    part = getFirstDwBodyPart();
+    part = firstPart = getFirstDwBodyPart();
   }
 
   if ( !part ) {
-    // kDebug() <<"updateAttachmentState - no part!";
-    if ( mStatus.hasAttachment() ) {
-      toggleStatus( MessageStatus::statusHasAttachment() );
-    }
-    return;
+    part = mMsg;  // no part, use message itself
   }
 
   bool filenameEmpty = true;
@@ -3294,8 +3293,8 @@
   }
 
   // next part
-  if ( part->Next() ) {
-    updateAttachmentState( part->Next() );
+  if ( firstPart && firstPart->Next() ) {
+    updateAttachmentState( firstPart->Next() );
   } else if ( attachmentState() == KMMsgAttachmentUnknown &&
               mStatus.hasAttachment() ) {
     toggleStatus( MessageStatus::statusHasAttachment() );
--- kmail/dbusimap.desktop
+++ kmail/dbusimap.desktop
@@ -8,6 +8,7 @@
 Comment[da]=E-mail-program med en D-BUS-grænseflade
 Comment[de]=E-Mail-Programm mit D-Bus-Schnittstelle
 Comment[el]=Πρόγραμμα αλληλογραφίας με διασύνδεση D-Bus
+Comment[en_GB]=Mail program with a D-Bus interface
 Comment[es]=Programa de correo con una interfaz D-Bus
 Comment[et]=E-posti rakendus D-Busi liidesega
 Comment[fr]=Programme de messagerie avec une interface D-Bus
--- kmail/messageactions.cpp
+++ kmail/messageactions.cpp
@@ -149,28 +149,29 @@
   mForwardActionMenu  = new KActionMenu(KIcon("mail-forward"), i18nc("Message->","&Forward"), this);
   mActionCollection->addAction("message_forward", mForwardActionMenu );
 
-  mForwardAttachedAction  = new KAction(KIcon("mail-forward"), i18nc("Message->Forward->","As &Attachment..."), this);
-  mActionCollection->addAction("message_forward_as_attachment", mForwardAttachedAction );
-  mForwardAttachedAction->setShortcut(QKeySequence(Qt::Key_F));
-  connect( mForwardAttachedAction, SIGNAL(triggered(bool) ),
-           parent, SLOT(slotForwardAttachedMsg()) );
+  mForwardAttachedAction = new KAction( KIcon("mail-forward"),
+                                        i18nc( "@action:inmenu Message->Forward->",
+                                               "As &Attachment..." ),
+                                        this );
+  connect( mForwardAttachedAction, SIGNAL( triggered( bool ) ),
+           parent, SLOT( slotForwardAttachedMsg() ) );
+  mActionCollection->addAction( "message_forward_as_attachment", mForwardAttachedAction );
 
-  mForwardInlineAction  = new KAction( KIcon( "mail-forward" ),
+  mForwardInlineAction = new KAction( KIcon( "mail-forward" ),
                                        i18nc( "@action:inmenu Message->Forward->",
                                               "&Inline..." ),
                                        this );
+  connect( mForwardInlineAction, SIGNAL( triggered( bool ) ),
+           parent, SLOT( slotForwardInlineMsg() ) );
   mActionCollection->addAction( "message_forward_inline", mForwardInlineAction );
-  mForwardInlineAction->setShortcut( QKeySequence( Qt::SHIFT + Qt::Key_F ) );
-  connect( mForwardInlineAction, SIGNAL(triggered(bool) ),
-           parent, SLOT(slotForwardInlineMsg()) );
 
   setupForwardActions();
 
-  mRedirectAction  = new KAction(i18nc("Message->Forward->", "&Redirect..."), this);
-  mActionCollection->addAction("message_forward_redirect", mRedirectAction );
-  connect( mRedirectAction, SIGNAL(triggered(bool)),
-           parent, SLOT(slotRedirectMsg()));
-  mRedirectAction->setShortcut(QKeySequence(Qt::Key_E));
+  mRedirectAction  = new KAction(i18nc("Message->Forward->", "&Redirect..."), this );
+  mActionCollection->addAction( "message_forward_redirect", mRedirectAction );
+  connect( mRedirectAction, SIGNAL( triggered( bool ) ),
+           parent, SLOT( slotRedirectMsg() ) );
+  mRedirectAction->setShortcut( QKeySequence( Qt::Key_E ) );
   mForwardActionMenu->addAction( mRedirectAction );
 
   updateActions();
@@ -269,18 +270,18 @@
 
 void MessageActions::setupForwardingActionsList( KXMLGUIClient *guiClient )
 {
-  QList<QAction*> mForwardActionList;
+  QList<QAction*> forwardActionList;
   guiClient->unplugActionList( "forward_action_list" );
   if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
-    mForwardActionList.append( mForwardInlineAction );
-    mForwardActionList.append( mForwardAttachedAction );
+    forwardActionList.append( mForwardInlineAction );
+    forwardActionList.append( mForwardAttachedAction );
   }
   else {
-    mForwardActionList.append( mForwardAttachedAction );
-    mForwardActionList.append( mForwardInlineAction );
+    forwardActionList.append( mForwardAttachedAction );
+    forwardActionList.append( mForwardInlineAction );
   }
-  mForwardActionList.append( mRedirectAction );
-  guiClient->plugActionList( "forward_action_list", mForwardActionList );
+  forwardActionList.append( mRedirectAction );
+  guiClient->plugActionList( "forward_action_list", forwardActionList );
 }
 
 
--- kmail/kmail_config_identity.desktop
+++ kmail/kmail_config_identity.desktop
@@ -13,6 +13,7 @@
 X-KDE-Weight=100
 
 Name=Identities
+Name[af]=Identities
 Name[ar]=الهويات
 Name[be]=Увасабленні
 Name[bg]=Самоличност
@@ -22,6 +23,7 @@
 Name[da]=Identiteter
 Name[de]=Identitäten
 Name[el]=Ταυτότητες
+Name[en_GB]=Identities
 Name[eo]=Identoj
 Name[es]=Identidades
 Name[et]=Identiteedid
@@ -82,6 +84,7 @@
 Comment[da]=Håndtering af identiteter
 Comment[de]=Identitäten verwalten
 Comment[el]=Διαχείριση ταυτοτήτων
+Comment[en_GB]=Manage Identities
 Comment[eo]=Mastrumi identojn
 Comment[es]=Gestionar las identidades
 Comment[et]=Identiteetide haldus
--- kmail/kmaccount.cpp
+++ kmail/kmaccount.cpp
@@ -334,13 +334,15 @@
 {
   //FIXME: remove, make folders handle those
   QList<FolderJob*>::iterator it;
-  for( it = mJobList.begin(); it != mJobList.end(); ++it ) {
+  for( it = mJobList.begin(); it != mJobList.end(); ) {
     if ( (*it)->msgList().first() == msg) {
       FolderJob *job = (*it);
       it = mJobList.erase( it );
       delete job;
       break;
     }
+    else
+      ++it;
   }
 }
 
@@ -395,7 +397,6 @@
           SLOT(precommandExited(bool)));
 
   kDebug() << "Running precommand" << precommand;
-  mPrecommandEventLoop = new QEventLoop();
   if ( !precommandProcess.start() )
     return false;
 
@@ -403,9 +404,10 @@
   // the precommand is running (which may take a while).
   // The exec call will block until the event loop is exited, which happens in
   // precommandExited().
-  if ( mPrecommandEventLoop ) { // yes it can be 0 due to races with precommandProcess.start()
-    mPrecommandEventLoop->exec();
-  }
+  mPrecommandEventLoop = new QEventLoop();
+  mPrecommandEventLoop->exec();
+  delete mPrecommandEventLoop;
+  mPrecommandEventLoop = 0;
 
   return mPrecommandSuccess;
 }
@@ -413,18 +415,12 @@
 //-----------------------------------------------------------------------------
 void KMAccount::precommandExited(bool success)
 {
-  Q_ASSERT( mPrecommandEventLoop != 0 );
   mPrecommandSuccess = success;
-
-  // Exit and delete the event loop. This makes sure the execution continues
-  // in runPrecommand(), where the event loop was entered.
-  mPrecommandEventLoop->exit();
-
-  // Use deleteLater, because we are called inside of this very eventloop
-  mPrecommandEventLoop->deleteLater();
-  mPrecommandEventLoop = 0;
+  if ( mPrecommandEventLoop )  // don't crash when kmail exits while mPrecommandEventLoop runs
+    mPrecommandEventLoop->exit();
 }
 
+//-----------------------------------------------------------------------------
 void KMAccount::slotIdentitiesChanged()
 {
   // Fall back to the default identity if the one used currently is invalid
--- kmail/kmcommands.cpp
+++ kmail/kmcommands.cpp
@@ -767,11 +767,16 @@
   return OK;
 }
 
-static KUrl subjectToUrl( const QString &subject ) {
+static KUrl subjectToUrl( const QString &subject )
+{
+  QString fileName = KMCommand::cleanFileName( subject.trimmed() );
+
+  // avoid stripping off the last part of the subject after a "."
+  // by KFileDialog, which thinks it's an extension
+  if ( !fileName.endsWith( ".mbox" ) )
+    fileName += ".mbox";
 
-  return KFileDialog::getSaveUrl( KUrl::fromPath( subject.trimmed()
-                                  .replace( QDir::separator(), '_' ) ),
-                                  "*.mbox" );
+  return KFileDialog::getSaveUrl( KUrl::fromPath( fileName ), "*.mbox" );
 }
 
 KMSaveMsgCommand::KMSaveMsgCommand( QWidget *parent, KMMessage *msg )
@@ -2434,13 +2439,14 @@
   else {
     // only one item, get the desired filename
     partNode *node = mAttachmentMap.begin().key();
-    // replace all ':' with '_' because ':' isn't allowed on FAT volumes
-    QString s =
-      node->msgPart().fileName().trimmed().replace( ':', '_' );
+    QString s = node->msgPart().fileName().trimmed();
     if ( s.isEmpty() )
-      s = node->msgPart().name().trimmed().replace( ':', '_' );
+      s = node->msgPart().name().trimmed();
     if ( s.isEmpty() )
       s = i18nc("filename for an unnamed attachment", "attachment.1");
+    else
+      s = cleanFileName( s );
+
     url = KFileDialog::getSaveUrl( KUrl( "kfiledialog:///saveAttachment/" + s ),
                                    QString(),
                                    parentWidget(),
@@ -2464,16 +2470,18 @@
     KUrl curUrl;
     if ( !dirUrl.isEmpty() ) {
       curUrl = dirUrl;
-      QString s =
-        it.key()->msgPart().fileName().trimmed().replace( ':', '_' );
+      QString s = it.key()->msgPart().fileName().trimmed();
       if ( s.isEmpty() )
-        s = it.key()->msgPart().name().trimmed().replace( ':', '_' );
+        s = it.key()->msgPart().name().trimmed();
       if ( s.isEmpty() ) {
         ++unnamedAtmCount;
         s = i18nc("filename for the %1-th unnamed attachment",
                  "attachment.%1",
               unnamedAtmCount );
       }
+      else
+        s = cleanFileName( s );
+
       curUrl.setFileName( s );
     } else {
       curUrl = url;
@@ -2541,6 +2549,18 @@
   deleteLater();
 }
 
+QString KMCommand::cleanFileName( const QString &name )
+{
+  QString fileName = name.trimmed();
+  // replace all ':' with '_' because ':' isn't allowed on FAT volumes
+  fileName.replace( ':', '_' );
+  // better not use a dir-delimiter in a filename
+  fileName.replace( '/', '_' );
+  fileName.replace( '\\', '_' );
+
+  return fileName;
+}
+
 KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
                                                       const KUrl& url )
 {
--- kmail/kmfoldercachedimap.cpp
+++ kmail/kmfoldercachedimap.cpp
@@ -527,6 +527,11 @@
   return KMFolderMaildir::take( idx );
 }
 
+void KMFolderCachedImap::takeTemporarily( int idx )
+{
+  KMFolderMaildir::take( idx );
+}
+
 int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
 {
   // Possible optimization: Only dirty if not filtered below
@@ -941,7 +946,7 @@
       newState( mProgress, i18n("Renaming folder") );
       CachedImapJob *job = new CachedImapJob( newName, CachedImapJob::tRenameFolder, this );
       connect( job, SIGNAL( result(KMail::FolderJob *) ), this, SLOT( slotIncreaseProgress() ) );
-      connect( job, SIGNAL( finished() ), this, SLOT( serverSyncInternal() ) );
+      connect( job, SIGNAL( finished() ), this, SLOT( slotRenameFolderFinished() ) );
       job->start();
       break;
     }
@@ -1628,7 +1633,7 @@
 bool KMFolderCachedImap::deleteMessages()
 {
   /* Delete messages from cache that are gone from the server */
-  QList<KMMessage*> msgsForDeletion;
+  QList<KMMsgBase*> msgsForDeletion;
 
   /*
    * It is not possible to just go over all indices and remove
@@ -1641,7 +1646,7 @@
     ulong uid ( it.key() );
     if ( uid != 0 && !uidsOnServer.contains( uid ) ) {
       uids << QString::number( uid );
-      msgsForDeletion.append( getMsg( *it ) );
+      msgsForDeletion.append( getMsgBase( *it ) );
     }
   }
 
@@ -1673,6 +1678,11 @@
     job->start();
     return true;
   } else {
+
+    // Nothing to delete on the server, make sure the map is clear again.
+    // Normally this wouldn't be necessary, but there can be stale maps because of
+    // https://issues.kolab.org/issue3833.
+    mDeletedUIDsSinceLastSync.clear();
     return false;
   }
 }
@@ -2659,6 +2669,16 @@
   mImapPath = path;
 }
 
+static bool isFolderTypeKnownToUs( const QString &type )
+{
+  for ( uint i = 0 ; i <= ContentsTypeLast; ++i ) {
+    FolderContentsType contentsType = static_cast<KMail::FolderContentsType>( i );
+    if ( type == KMailICalIfaceImpl::annotationForContentsType( contentsType ) )
+      return true;
+  }
+  return false;
+}
+
 // mAnnotationFolderType is the annotation as known to the server (and stored in kmailrc)
 // It is updated from the folder contents type and whether it's a standard resource folder.
 // This happens during the syncing phase and during initFolder for a new folder.
@@ -2685,7 +2705,13 @@
     }
   }
 
-  if ( newType != oldType || newSubType != oldSubType ) {
+  // We do not want to overwrite custom folder types (which we treat as mail folders).
+  // So only overwrite custom folder types if the user changed the folder type himself to something
+  // other than mail.
+  const bool changingTypeAllowed = isFolderTypeKnownToUs( oldType ) ||
+                                   ( mContentsType != ContentsTypeMail );
+
+  if ( ( newType != oldType || newSubType != oldSubType ) && changingTypeAllowed ) {
     mAnnotationFolderType = newType + ( newSubType.isEmpty() ? QString() : '.'+newSubType );
     mAnnotationFolderTypeChanged = true; // force a "set annotation" on next sync
     kDebug() << mImapPath <<": updateAnnotationFolderType: '"
@@ -2768,15 +2794,21 @@
             markUnreadAsRead();
           }
 
-          // Ensure that further readConfig()s don't lose mAnnotationFolderType
-          writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig();
           break;
         }
       }
-      if ( !foundKnownType && !mReadOnly ) {
-        // Case 4: server has strange content-type, set it to what we need
-        mAnnotationFolderTypeChanged = true;
+      if ( !foundKnownType ) {
+        //kdDebug(5006) << "slotGetAnnotationResult: no known type of annotation found, leaving it untouched" << endl;
+
+        // Case 4: Server has strange content-type. We must not overwrite it, see https://issues.kolab.org/issue2069.
+        //         Treat the content-type as mail until we change it ourselves.
+        mAnnotationFolderTypeChanged = false;
+        mAnnotationFolderType = value;
+        setContentsType( ContentsTypeMail );
       }
+
+      // Ensure that further readConfig()s don't lose mAnnotationFolderType
+      writeConfigKeysWhichShouldNotGetOverwrittenByReadConfig();
       // TODO handle subtype (inbox, drafts, sentitems, junkemail)
     } else if ( !mReadOnly ) {
       // Case 1: server doesn't have content-type, set it
@@ -3265,6 +3297,15 @@
   serverSyncInternal();
 }
 
+void KMFolderCachedImap::slotRenameFolderFinished()
+{
+  // The syncing code assumes the folder was opened by us, and later closes it. So better
+  // make sure the reference count is correct, since the folder was force-closed by the rename.
+  // Otherwise bad things can happen, see https://issues.kolab.org/issue3853.
+  open( "cachedimap" );
+  serverSyncInternal();
+}
+
 bool KMFolderCachedImap::canDeleteMessages() const
 {
   if ( isReadOnly() )
--- kmail/isubject.cpp
+++ kmail/isubject.cpp
@@ -25,8 +25,11 @@
 
   void ISubject::notify()
   {
-    for ( QVector<Interface::Observer*>::iterator it = mObserverList.begin() ; it != mObserverList.end() ; ++it )
-      (*it)->update( this );
+    for ( QVector<Interface::Observer*>::iterator it = mObserverList.begin() ; it != mObserverList.end() ; ++it ) {
+      if ( (*it) ) {
+        (*it)->update( this );
+      }
+    }
   }
 
 }
--- kmail/kmkernel.cpp
+++ kmail/kmkernel.cpp
@@ -738,6 +738,7 @@
                               const QString & messageFile,
                               const QString & MsgStatusFlags)
 {
+  // FIXME: Remove code duplication between this method and dbusAddMessage_fastImport()!
   kDebug();
 
   if ( foldername.isEmpty() || foldername.startsWith('.'))
@@ -751,7 +752,6 @@
   if ( foldername != mAddMessageLastFolder ) {
     mAddMessageMsgIds.clear();
     readFolderMsgIds = true;
-    mAddMessageLastFolder = foldername;
   }
 
   KUrl msgUrl( messageFile );
@@ -804,6 +804,8 @@
       else {
         mAddMsgCurrentFolder = the_folderMgr->findOrCreate(_foldername, false);
       }
+
+      mAddMessageLastFolder = foldername;
     }
 
     if ( mAddMsgCurrentFolder ) {
@@ -917,16 +919,10 @@
     return -1;
 
   int retval;
-  bool createNewFolder = false;
 
   QString _foldername = foldername.trimmed();
   _foldername = _foldername.remove( '\\' ); //try to prevent ESCAPE Sequences
 
-  if ( foldername != mAddMessageLastFolder ) {
-    createNewFolder = true;
-    mAddMessageLastFolder = foldername;
-  }
-
   KUrl msgUrl( messageFile );
   if ( !msgUrl.isEmpty() && msgUrl.isLocalFile() ) {
     const QByteArray messageText =
@@ -937,7 +933,7 @@
     KMMessage *msg = new KMMessage();
     msg->fromString( messageText );
 
-    if (createNewFolder) {
+    if ( foldername != mAddMessageLastFolder ) {
       if ( foldername.contains("/")) {
         QString tmp_fname = "";
         KMFolder *folder = NULL;
@@ -975,6 +971,7 @@
       else {
         mAddMsgCurrentFolder = the_folderMgr->findOrCreate(_foldername, false);
       }
+      mAddMessageLastFolder = foldername;
     }
 
     if ( mAddMsgCurrentFolder ) {
--- kmail/headerstyle.cpp
+++ kmail/headerstyle.cpp
@@ -758,7 +758,7 @@
         "background-image: url("+imgpath+"shadow_right.png); width: 10px; min-height: 100%;\">&nbsp;</div>";
 
     headerStr +=
-      "<div style=\"margin-left: 8px; top: 0px;\"><span style=\"font-size: 10px; font-weight: bold;\">"+dateString+"</span></div>"
+      "<div style=\"margin-left: 10px; top: 0px;\"><span style=\"font-size: 10px; font-weight: bold;\">"+dateString+"</span></div>"
       // #0057ae
       "<table style=\"background: "+activeColorDark.name()+"; border-collapse:collapse; top: 14px; min-width: 200px; \" cellpadding=0> \n"
       "  <tr> \n"
@@ -836,7 +836,13 @@
         "</div>\n";
     }
 
-    headerStr += "<div style=\"padding: 6px;\">";
+    if ( printing ) {
+      //provide a bit more left padding when printing
+      //kolab/issue3254 (printed mail cut at the left side)
+      headerStr += "<div style=\"padding: 6px; padding-left: 10px;\">";
+    } else {
+      headerStr += "<div style=\"padding: 6px;\">";
+    }
 
     // TODO
     // spam status
--- kmail/kmfoldercachedimap.h
+++ kmail/kmfoldercachedimap.h
@@ -228,10 +228,23 @@
     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
 
-    /** Reimplemented from KMFolderMaildir */
-    virtual KMMessage *take( int idx );
     bool canDeleteMessages() const;
 
+    /**
+     * Reimplemented from KMFolderMaildir
+     * This deletes the message permanently, also from the server. For this,
+     * rememberDeletion() is called, so that the message can be deleted from
+     * the server on the next sync.
+     */
+    virtual KMMessage* take( int idx );
+
+    /**
+     * Like take(), only that the deletion is not remembered, i.e. the
+     * message will not be deleted from the server. Calling this can cause
+     * inconsistencies, so make sure you re-add the message later!
+     */
+    void takeTemporarily( int idx );
+
     /** Reimplemented from KMFolderMaildir */
     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
 
@@ -513,6 +526,7 @@
     void slotUpdateLastUid();
     void slotFolderDeletionOnServerFinished();
   void slotRescueDone( KMCommand* command );
+  void slotRenameFolderFinished();
 
   signals:
     void folderComplete( KMFolderCachedImap *folder, bool success );
--- kmail/kmmainwidget.cpp
+++ kmail/kmmainwidget.cpp
@@ -3546,7 +3546,6 @@
 {
   mMsgActions = new KMail::MessageActions( actionCollection(), this );
   mMsgActions->setMessageView( mMsgView );
-  mMsgActions->setupForwardingActionsList( mGUIClient );
 
   //----- File Menu
   mSaveAsAction = new KAction(KIcon("document-save"), i18n("Save &As..."), this);
@@ -4503,14 +4502,13 @@
   connect( kmkernel->msgTagMgr(), SIGNAL( msgTagListChanged() ),
            this, SLOT( initializeMessageTagActions() ) );
 
-  // plug shortcut filter actions now
+  // Plug various action lists. This can't be done in the constructor, as that is called before
+  // the main window or Kontact calls createGUI().
+  // This function however is called with a single shot timer.
   initializeFilterActions();
-
-  // plug folder shortcut actions
   initializeFolderShortcutActions();
-
-  // plug tag actions now
   initializeMessageTagActions();
+  messageActions()->setupForwardingActionsList( mGUIClient );
 
   QString newFeaturesMD5 = KMReaderWin::newFeaturesMD5();
   if ( kmkernel->firstStart() ||
--- kmail/kmfolderdialog.cpp
+++ kmail/kmfolderdialog.cpp
@@ -748,11 +748,13 @@
   folder->setPutRepliesInSameFolder( mKeepRepliesInSameFolderCheckBox->isChecked() );
 
   QString fldName, oldFldName;
+  KMFolderCachedImap* dimap = 0;
+  if ( folder->folderType() == KMFolderTypeCachedImap )
+    dimap = static_cast<KMFolderCachedImap *>( mDlg->folder()->storage() );
+
   if ( !mIsLocalSystemFolder || mIsResourceFolder )
   {
-    QString acctName;
     oldFldName = mDlg->folder()->name();
-
     if (!mNameEdit->text().isEmpty())
       fldName = mNameEdit->text();
     else
@@ -792,8 +794,7 @@
       folder->storage()->setContentsType( type );
     }
 
-    if ( folder->folderType() == KMFolderTypeCachedImap ) {
-      KMFolderCachedImap* dimap = static_cast<KMFolderCachedImap *>( mDlg->folder()->storage() );
+    if ( dimap ) {
       if ( mIncidencesForComboBox ) {
         KMFolderCachedImap::IncidencesFor incfor =
                static_cast<KMFolderCachedImap::IncidencesFor>( mIncidencesForComboBox->currentIndex() );
@@ -806,10 +807,6 @@
         dimap->setAlarmsBlocked( mAlarmsBlockedCheckBox->isChecked() );
         dimap->writeConfig();
       }
-      if ( mSharedSeenFlagsCheckBox && mSharedSeenFlagsCheckBox->isChecked() != dimap->sharedSeenFlags() ) {
-        dimap->setSharedSeenFlags( mSharedSeenFlagsCheckBox->isChecked() );
-        dimap->writeConfig();
-      }
     }
 
     if( folder->folderType() == KMFolderTypeImap )
@@ -818,22 +815,30 @@
       imapFolder->setIncludeInMailCheck(
           mNewMailCheckBox->isChecked() );
     }
-    // make sure everything is on disk, connected slots will call readConfig()
-    // when creating a new folder.
-    folder->storage()->writeConfig();
-    // Renamed an existing folder? We don't check for oldName == newName on
-    // purpose here. The folder might be pending renaming on the next dimap
-    // sync already, in which case the old name would still be around and
-    // something like Calendar -> CalendarFoo -> Calendar inbetween syncs would
-    // fail. Therefor let the folder sort it out itself, whether the rename is
-    // a noop or not.
-    if ( !oldFldName.isEmpty() )
-    {
-      kmkernel->folderMgr()->renameFolder( folder, fldName );
-    } else {
-      kmkernel->folderMgr()->contentsChanged();
-    }
   }
+
+  if ( dimap && mSharedSeenFlagsCheckBox &&
+       mSharedSeenFlagsCheckBox->isChecked() != dimap->sharedSeenFlags() ) {
+    dimap->setSharedSeenFlags( mSharedSeenFlagsCheckBox->isChecked() );
+    dimap->writeConfig();
+  }
+
+  // make sure everything is on disk, connected slots will call readConfig()
+  // when creating a new folder.
+  folder->storage()->writeConfig();
+  // Renamed an existing folder? We don't check for oldName == newName on
+  // purpose here. The folder might be pending renaming on the next dimap
+  // sync already, in which case the old name would still be around and
+  // something like Calendar -> CalendarFoo -> Calendar inbetween syncs would
+  // fail. Therefor let the folder sort it out itself, whether the rename is
+  // a noop or not.
+  if ( !oldFldName.isEmpty() )
+  {
+    kmkernel->folderMgr()->renameFolder( folder, fldName );
+  } else {
+    kmkernel->folderMgr()->contentsChanged();
+  }
+
   return true;
 }
 
--- kmail/kmfiltermgr.cpp
+++ kmail/kmfiltermgr.cpp
@@ -68,7 +68,7 @@
 
   if ( bPopFilter ) {
     KConfigGroup group = config->group( "General" );
-    mShowLater = group.readEntry( "popshowDLmsgs", 0 );
+    mShowLater = group.readEntry( "popshowDLmsgs", false );
   } 
   mFilters = FilterImporterExporter::readFiltersFromConfig( config, bPopFilter );
 }
--- kmail/kmcommands.h
+++ kmail/kmcommands.h
@@ -72,6 +72,11 @@
   */
   Result result() const;
 
+  /** cleans a filename by replacing characters not allowed or wanted on the filesystem
+      e.g. ':', '/', '\' with '_'
+  */
+  static QString cleanFileName( const QString &fileName );
+
 public slots:
   // Retrieve messages then calls execute
   void start();
--- kmail/kmcomposewin.cpp
+++ kmail/kmcomposewin.cpp
@@ -2824,6 +2824,8 @@
   msgPart->setSubtypeStr( "zip" );
 
   msgPartToItem( msgPart, attachmentItem, false );
+
+  setModified( true );
 }
 
 //-----------------------------------------------------------------------------
@@ -2892,6 +2894,8 @@
   msgPart->setSubtypeStr( subtype );
 
   msgPartToItem( msgPart, attachmentItem, false );
+
+  setModified( true );
 }
 
 //-----------------------------------------------------------------------------
--- kmail/kmail_view.desktop
+++ kmail/kmail_view.desktop
@@ -6,8 +6,10 @@
 Name[da]=KMail-visning
 Name[de]=KMail-Ansicht
 Name[el]=Προβολή KMail
+Name[en_GB]=KMail view
 Name[es]=Vista KMail
 Name[et]=KMaili vaade
+Name[fr]=KMail view
 Name[ga]=Amharc KMail
 Name[gl]=Vista KMail 
 Name[hu]=KMail-nézet
--- kmail/folderstorage.cpp
+++ kmail/folderstorage.cpp
@@ -1105,7 +1105,7 @@
     return;
 
   QList<FolderJob*>::iterator it;
-  for ( it = mJobList.begin(); it != mJobList.end(); ++it )
+  for ( it = mJobList.begin(); it != mJobList.end(); )
   {
     //FIXME: the questions is : should we iterate through all
     //messages in jobs? I don't think so, because it would
@@ -1173,7 +1173,7 @@
   if ( !mSearchPattern )
     return;
   QList<quint32> matchingSerNums;
-  const int end = qMin( mCurrentSearchedMsg + 100, count() );
+  const int end = qMin( mCurrentSearchedMsg + 10, count() );
   for ( int i = mCurrentSearchedMsg; i < end; ++i )
   {
     quint32 serNum = KMMsgDict::instance()->getMsgSerNum( folder(), i );
--- kmail/kmail_config_appearance.desktop
+++ kmail/kmail_config_appearance.desktop
@@ -13,6 +13,7 @@
 X-KDE-Weight=300
 
 Name=Appearance
+Name[af]=Appearance
 Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
@@ -23,6 +24,7 @@
 Name[da]=Udseende
 Name[de]=Erscheinungsbild
 Name[el]=Εμφάνιση
+Name[en_GB]=Appearance
 Name[eo]=Prezentado
 Name[es]=Apariencia
 Name[et]=Välimus
--- kmail/recipientseditor.cpp
+++ kmail/recipientseditor.cpp
@@ -934,8 +934,8 @@
     if ( count++ > GlobalSettings::self()->maximumRecipients() ) {
       KMessageBox::sorry( this,
         i18nc("@info:status", "Truncating recipients list to %1 of %2 entries.",
-          GlobalSettings::self()->maximumRecipients(),
-          r.count() ) );
+              GlobalSettings::self()->maximumRecipients(),
+              r.count() ) );
       break;
     }
     addRecipient( *it, type );
@@ -947,14 +947,15 @@
   QString str;
 
   Recipient::List recipients = mRecipientsView->recipients();
-  Recipient::List::ConstIterator it;
-  for( it = recipients.constBegin(); it != recipients.constEnd(); ++it ) {
-    if ( (*it).type() == type ) {
-      if ( !str.isEmpty() ) str += ", ";
-      str.append( (*it).email() );
+  if ( !recipients.isEmpty() ) {
+    Recipient::List::ConstIterator it;
+    for( it = recipients.constBegin(); it != recipients.constEnd(); ++it ) {
+      if ( (*it).type() == type ) {
+        if ( !str.isEmpty() ) str += ", ";
+        str.append( (*it).email() );
+      }
     }
   }
-
   return str;
 }
 
--- kmail/KMail.desktop
+++ kmail/KMail.desktop
@@ -1,14 +1,69 @@
 [Desktop Entry]
 Name=KMail
+Name[af]=KMail
 Name[ar]=برنامج البريد KMail
+Name[be]=KMail
+Name[bg]=KMail
+Name[br]=KMail
+Name[ca]=KMail
+Name[cs]=KMail
+Name[cy]=KMail
+Name[da]=KMail
+Name[de]=KMail
+Name[el]=KMail
+Name[en_GB]=KMail
 Name[eo]=Retpoŝto
+Name[es]=KMail
+Name[et]=KMail
+Name[eu]=KMail
+Name[fi]=KMail
+Name[fr]=KMail
+Name[fy]=KMail
+Name[ga]=KMail
+Name[gl]=KMail
+Name[he]=KMail
+Name[hr]=KMail
+Name[hu]=KMail
+Name[is]=KMail
+Name[it]=KMail
+Name[ja]=KMail
+Name[ka]=KMail
+Name[kk]=KMail
+Name[km]=KMail
+Name[ko]=KMail
+Name[lt]=KMail
+Name[lv]=KMail
+Name[mai]=KMail
 Name[mk]=КПошта
+Name[ms]=KMail
+Name[nb]=KMail
+Name[nds]=KMail
 Name[ne]=केडीई पत्र
+Name[nl]=KMail
+Name[nn]=KMail
+Name[oc]=KMail
 Name[pa]=ਕੇ-ਮੇਲ
+Name[pl]=KMail
+Name[pt]=KMail
+Name[pt_BR]=KMail
+Name[ro]=KMail
+Name[ru]=KMail
+Name[se]=KMail
+Name[sk]=KMail
+Name[sl]=KMail
 Name[sv]=Kmail
 Name[ta]=Kஅஞ்சல்
+Name[tg]=KMail
 Name[th]=จัดการจดหมาย K
+Name[tr]=KMail
+Name[uk]=KMail
+Name[uz]=KMail
+Name[uz@cyrillic]=KMail
+Name[vi]=KMail
+Name[wa]=KMail
+Name[xh]=KMail
 Name[x-test]=xxKMailxx
+Name[zh_CN]=KMail
 Name[zh_TW]=KMail 郵件軟體
 Type=Application
 Exec=kmail -caption "%c"
@@ -26,6 +81,7 @@
 GenericName[da]=E-mail-klient
 GenericName[de]=Mail-Programm
 GenericName[el]=Πελάτης mail
+GenericName[en_GB]=Mail Client
 GenericName[eo]=Legi kaj sendi retpoŝton
 GenericName[es]=Cliente de correo
 GenericName[et]=E-posti klient
@@ -74,6 +130,7 @@
 GenericName[uk]=Поштовий клієнт
 GenericName[uz]=Xat-xabar klienti
 GenericName[uz@cyrillic]=Хат-хабар клиенти
+GenericName[vi]=Mail Client
 GenericName[xh]=Umxhasi Weposi
 GenericName[x-test]=xxMail Clientxx
 GenericName[zh_CN]=邮件客户程序
--- kmail/kmail_config_security.desktop
+++ kmail/kmail_config_security.desktop
@@ -24,6 +24,7 @@
 Name[da]=Sikkerhed
 Name[de]=Sicherheit
 Name[el]=Ασφάλεια
+Name[en_GB]=Security
 Name[eo]=Sekureco
 Name[es]=Seguridad
 Name[et]=Turvalisus
@@ -86,6 +87,7 @@
 Comment[da]=Sikkerheds- & Privathedsindstillinger
 Comment[de]=Sicherheit und Privatsphäre
 Comment[el]=Ρυθμίσεις Ασφάλειας & Προσωπικού απόρρητου
+Comment[en_GB]=Security & Privacy Settings
 Comment[eo]=Agordoj pri Sekureco kaj Privateco
 Comment[es]=Preferencias de seguridad y privacidad
 Comment[et]=Turva- ja privaatsusseadistused
--- kmail/objecttreeparser.cpp
+++ kmail/objecttreeparser.cpp
@@ -1633,6 +1633,7 @@
       if ( mReader && !mReader->decryptMessage() ) {
         writeDeferredDecryptionBlock();
         isEncrypted = true;
+        signTestNode = 0; // PENDING(marc) to be abs. sure, we'd need to have to look at the content
       } else if ( okDecryptMIME( *node,
                           decryptedData,
                           signatureFound,
--- kmail/kmail_config_accounts.desktop
+++ kmail/kmail_config_accounts.desktop
@@ -24,6 +24,7 @@
 Name[da]=Konti
 Name[de]=Zugänge
 Name[el]=Λογαριασμοί
+Name[en_GB]=Accounts
 Name[eo]=Kontoj
 Name[es]=Cuentas
 Name[et]=Kontod
@@ -51,6 +52,7 @@
 Name[nb]=Kontoer
 Name[nds]=Kontos
 Name[ne]=खाता
+Name[nl]=Accounts
 Name[nn]=Kontoar
 Name[oc]=Comptes
 Name[pa]=ਅਕਾਊਂਟ
@@ -82,6 +84,7 @@
 Comment[da]=Opsætning til at sende og modtage breve
 Comment[de]=Einstellungen zum Senden und Empfangen von Nachrichten
 Comment[el]=Ρυθμίσεις για αποστολή και λήψη μηνυμάτων
+Comment[en_GB]=Setup for Sending and Receiving Messages
 Comment[eo]=Agordo por sendi kaj ricevi mesaĝojn
 Comment[es]=Configuración para enviar y recibir mensajes
 Comment[et]=Kirjade saatmise ja saamise seadistused
--- kmail/regexplineedit.cpp
+++ kmail/regexplineedit.cpp
@@ -71,6 +71,7 @@
     hlay->setMargin( 0 );
 
     mLineEdit = new KLineEdit( str, this );
+    mLineEdit->setClearButtonShown( true );
     setFocusProxy( mLineEdit );
     hlay->addWidget( mLineEdit );
 
--- kmail/kmversion.h
+++ kmail/kmversion.h
@@ -3,6 +3,6 @@
 #ifndef kmversion_h
 #define kmversion_h
 
-#define KMAIL_VERSION "1.12.1"
+#define KMAIL_VERSION "1.12.2"
 
 #endif /*kmversion_h*/
--- knode/knode_config_identity.desktop
+++ knode/knode_config_identity.desktop
@@ -19,10 +19,12 @@
 Name[bg]=Самоличност
 Name[br]=Anvelezh
 Name[ca]=Identitat
+Name[cs]=Identity
 Name[cy]=Dynodiad
 Name[da]=Identitet
 Name[de]=Identität
 Name[el]=Ταυτότητα
+Name[en_GB]=Identity
 Name[eo]=Idento
 Name[es]=Identidad
 Name[et]=Identiteet
@@ -85,6 +87,7 @@
 Comment[da]=Personlig information
 Comment[de]=Persönliche Angaben
 Comment[el]=Προσωπικές πληροφορίες
+Comment[en_GB]=Personal Information
 Comment[eo]=Personaj Informoj
 Comment[es]=Información personal
 Comment[et]=Personaalne info
--- knode/knode_config_accounts.desktop
+++ knode/knode_config_accounts.desktop
@@ -24,6 +24,7 @@
 Name[da]=Konti
 Name[de]=Zugänge
 Name[el]=Λογαριασμοί
+Name[en_GB]=Accounts
 Name[eo]=Kontoj
 Name[es]=Cuentas
 Name[et]=Kontod
@@ -51,6 +52,7 @@
 Name[nb]=Kontoer
 Name[nds]=Kontos
 Name[ne]=खाता
+Name[nl]=Accounts
 Name[nn]=Kontoar
 Name[oc]=Comptes
 Name[pa]=ਅਕਾਊਂਟ
@@ -82,6 +84,7 @@
 Comment[da]=Opsætning af nyhedsgruppe og e-mail-servere
 Comment[de]=Einstellungen für Newsgruppen- und Mailserver
 Comment[el]=Ρύθμιση για Ομάδες Συζήτησης και Διακομιστών Αλληλογραφίας
+Comment[en_GB]=Setup for Newsgroup and Mail Servers
 Comment[es]=Configuración de los servidores de grupos de noticias y de correo
 Comment[et]=Uudiste- ja e-posti serverite seadistus
 Comment[eu]=Berri-talde eta posta zerbitzarien konfigurazioa
--- knode/knode_config_read_news.desktop
+++ knode/knode_config_read_news.desktop
@@ -22,6 +22,7 @@
 Name[da]=Læsning af nyheder
 Name[de]=Artikel lesen
 Name[el]=Ανάγνωση νέων
+Name[en_GB]=Reading News
 Name[es]=Lectura de noticias
 Name[et]=Uudiste lugemine
 Name[eu]=Berrien irakurketa
--- knode/knode_config_privacy.desktop
+++ knode/knode_config_privacy.desktop
@@ -21,6 +21,7 @@
 Name[da]=Signering/verifikation
 Name[de]=Signieren/Verifizieren
 Name[el]=Υπογραφή/Επαλήθευση
+Name[en_GB]=Signing/Verifying
 Name[es]=Firmar/Verificar
 Name[et]=Allkirjastamine/kontroll
 Name[eu]=Sinadura/Egiaztapena
@@ -73,6 +74,7 @@
 Comment[da]=Beskyt dine private oplysninger ved at underskrive og verificere indsendelser
 Comment[de]=Schutz der Privatsphäre durch Signieren und Verifizieren von Beiträgen.
 Comment[el]=Προστατεύστε το απόρρητό σας υπογράφοντας και επαληθεύοντας τα μηνύματα
+Comment[en_GB]=Protect your privacy by signing and verifying postings
 Comment[es]=Proteja su privacidad firmando y verificando sus envíos
 Comment[et]=Sinu privaatsuse kaitsmine postitusi allkirjastades ja kontrollides
 Comment[eu]=Babestu zure pribakortasuna argitarapenak sinatu eta egiaztatuz
@@ -105,6 +107,7 @@
 Comment[sk]=Chráňte svoje súkromie digitálnymi podpismi a overovaním príspevkov
 Comment[sl]=Zaščitite vašo zasebnost s podpisovanjem ali preverjanjem člankov
 Comment[sv]=Skyddar din integritet genom att signera och verifiera meddelanden
+Comment[ta]=Protect your privacy by signing and verifying postings
 Comment[tg]=Муҳофизати иттилоот ба воситаи имзо ва тафтиши ахборот
 Comment[th]=ปกป้องความเป็นส่วนตัวของคุณ ด้วยการเซ็นกำกับและตรวจสอบการเขียนข่าว
 Comment[tr]=Gönderilen iletilerinizi imzalayarak ve doğrulayarak güvenirliliğinizi sağlayın
--- knode/knode_config_cleanup.desktop
+++ knode/knode_config_cleanup.desktop
@@ -13,6 +13,7 @@
 X-KDE-Weight=700
 
 Name=Cleanup
+Name[af]=Cleanup
 Name[ar]=تنظيف
 Name[bg]=Изчистване
 Name[ca]=Neteja
@@ -20,6 +21,7 @@
 Name[da]=Oprydning
 Name[de]=Aufräumen
 Name[el]=Καθαρισμός
+Name[en_GB]=Cleanup
 Name[eo]=Purigo
 Name[es]=Limpieza
 Name[et]=Puhastamine
@@ -38,6 +40,7 @@
 Name[ka]=გაწმენდა
 Name[kk]=Тазалау
 Name[km]=សម្អាត
+Name[ko]=Cleanup
 Name[lt]=Išvalymas
 Name[lv]=Attīrīt
 Name[mai]=साफ करू
@@ -75,6 +78,7 @@
 Comment[da]=Bevarer diskplads
 Comment[de]=Plattenplatz bewahren
 Comment[el]=Διαφύλαξη χώρου στο Δίσκο
+Comment[en_GB]=Preserving Disk Space
 Comment[eo]=Ŝpari diskspacon
 Comment[es]=Preservar el espacio en disco
 Comment[et]=Kettaruumi eest hoolitsemine
--- knode/knode_config_appearance.desktop
+++ knode/knode_config_appearance.desktop
@@ -13,6 +13,7 @@
 X-KDE-Weight=300
 
 Name=Appearance
+Name[af]=Appearance
 Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
@@ -23,6 +24,7 @@
 Name[da]=Udseende
 Name[de]=Erscheinungsbild
 Name[el]=Εμφάνιση
+Name[en_GB]=Appearance
 Name[eo]=Prezentado
 Name[es]=Apariencia
 Name[et]=Välimus
--- knode/knode_config_post_news.desktop
+++ knode/knode_config_post_news.desktop
@@ -21,6 +21,7 @@
 Name[da]=Afsendelse af nyheder
 Name[de]=Artikelversand
 Name[el]=Αποστολή νέων
+Name[en_GB]=Posting News
 Name[es]=Enviar noticias
 Name[et]=Uudiste postitamine
 Name[eu]=Berrien argitaratzea
--- knode/KNode.desktop
+++ knode/KNode.desktop
@@ -5,13 +5,63 @@
 Terminal=false
 X-DocPath=knode/index.html
 Name=KNode
+Name[af]=KNode
 Name[ar]=قارئ الأخبار KNode
+Name[be]=KNode
+Name[bg]=KNode
+Name[br]=KNode
+Name[ca]=KNode
+Name[cs]=KNode
+Name[cy]=KNode
+Name[da]=KNode
+Name[de]=KNode
+Name[el]=KNode
+Name[en_GB]=KNode
 Name[eo]=Diskutrondoj
+Name[es]=KNode
+Name[et]=KNode
+Name[eu]=KNode
+Name[fi]=KNode
+Name[fr]=KNode
+Name[fy]=KNode
+Name[ga]=KNode
+Name[gl]=KNode
+Name[he]=KNode
+Name[hr]=KNode
+Name[hu]=KNode
+Name[is]=KNode
+Name[it]=KNode
+Name[ja]=KNode
+Name[ka]=KNode
+Name[kk]=KNode
+Name[km]=KNode
+Name[ko]=KNode
+Name[lt]=KNode
+Name[lv]=KNode
+Name[ms]=KNode
+Name[nb]=KNode
+Name[nds]=KNode
 Name[ne]=केडीई नोड
+Name[nl]=KNode
+Name[nn]=KNode
 Name[pa]=ਕੇ-ਨੋਡ
+Name[pl]=KNode
+Name[pt]=KNode
+Name[pt_BR]=KNode
+Name[ro]=KNode
+Name[ru]=KNode
+Name[se]=KNode
+Name[sk]=KNode
+Name[sl]=KNode
 Name[sv]=Knode
 Name[ta]=Kநோடு
+Name[tg]=KNode
+Name[tr]=KNode
+Name[uk]=KNode
+Name[vi]=KNode
+Name[xh]=KNode
 Name[x-test]=xxKNodexx
+Name[zh_CN]=KNode
 Name[zh_TW]=KNode 新聞閱讀器
 GenericName=News Reader
 GenericName[af]=Nuus leser
@@ -24,6 +74,7 @@
 GenericName[da]=Nyhedslæser
 GenericName[de]=Usenet-Newsreader
 GenericName[el]=Αναγνώστης νέων
+GenericName[en_GB]=News Reader
 GenericName[eo]=Legilo por diskutrondoj
 GenericName[es]=Lector de noticias
 GenericName[et]=Uudistelugeja
--- doc/kleopatra/index.docbook
+++ doc/kleopatra/index.docbook
@@ -1246,11 +1246,14 @@
       </para>
 
       <para>
-	The only mandatory key in a <literal>Key Filter
-	#<replaceable>n</replaceable></literal> group is
+	The only mandatory keys in a <literal>Key Filter
+	#<replaceable>n</replaceable></literal> group are
 	<varname>Name</varname>, containing the name of the category
 	as displayed in the <link
-	linkend="configuration-appearance">config dialog</link>.
+	linkend="configuration-appearance">config dialog</link>, and
+	<varname>id</varname>, which is used as a reference for the
+	filter in other configuration sections (such as <literal>View
+	#<replaceable>n</replaceable></literal>).
       </para>
 
       <para>
@@ -1362,6 +1365,21 @@
 	      <entry>the key has been revoked.</entry>
 	    </row>
 	    <row>
+	      <entry><varname>match-context</varname></entry>
+	      <entry>
+                context<footnote>
+                  <para>
+                    Context is an enumeration with the following
+                    allowed values:
+                    <literal>appearance</literal>,
+                    <literal>filtering</literal>
+                    and <literal>any</literal>.
+                  </para>
+                </footnote>
+              </entry>
+	      <entry>the context in which this filter matches.</entry>
+	    </row>
+	    <row>
 	      <entry><varname>is-expired</varname></entry>
 	      <entry>boolean</entry>
 	      <entry>the key is expired.</entry>
@@ -1413,6 +1431,22 @@
 	      </entry>
 	    </row>
 	    <row>
+	      <entry><varname>is-qualified</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>
+		the key can be used to make Qualified Signatures (as
+		defined by the German Digital Signature Law).
+	      </entry>
+	    </row>
+	    <row>
+	      <entry><varname>is-cardkey</varname></entry>
+	      <entry>boolean</entry>
+	      <entry>
+		the key material is stored on a smartcard (instead of
+		on the computer).
+	      </entry>
+	    </row>
+	    <row>
 	      <entry><varname>has-secret-key</varname></entry>
 	      <entry>boolean</entry>
 	      <entry>
--- doc/ktimetracker/index.docbook
+++ doc/ktimetracker/index.docbook
@@ -470,41 +470,28 @@
 
 </sect2>
 
-<sect2 id="dcop"><title>&DCOP;</title>
+<sect2 id="dcop"><title>&DBus;</title>
 
-<para>&DCOP; is the mechanism &kde; programs use to communicate with each
+<para>&DBus; is the mechanism &kde; programs use to communicate with each
 other.  A &kde; program provides a list of functions that other programs (a Bash
 script, for example) can use.</para>
 
 <example><title>Bash script that echo's &karm;'s version</title>
 <programlisting>
-	DCOPID=`dcop | grep karm`
-	if [ $DCOPID ]
-	then
-		VERS=`dcop $DCOPID KarmDCOPIface version`
-		echo "&karm; version is $VERS"
-	else
-		echo "&karm; not running"
-	fi
+qdbus org.kde.ktimetracker /KTimeTracker version 2>/dev/null || echo "ktimetracker not running"
 </programlisting>
 </example>
 
-<para>&karm;'s current &DCOP; interface is currently used mainly for automated
+<para>&karm;'s current &DBus; interface is currently used mainly for automated
 	testing, so it is very limited.  For the full interface definition, see
-	<link linkend="dcopappendix">&DCOP; Interface Appendix</link>.</para>
+	<link linkend="dcopappendix">&DBus; Interface Appendix</link>.</para>
 
-<para>To see the full &DCOP; interface of the &karm; version installed on your
+<para>To see the full &DBus; interface of the &karm; version installed on your
 	system, run the following Bash script:</para>
 
-<example><title>List &karm;'s &DCOP; interface to console</title>
+<example><title>List &karm;'s &DBus; interface to console</title>
 <programlisting>
-	DCOPID=`dcop | grep karm`
-	if [ $DCOPID ]
-	then
-		dcop $DCOPID KarmDCOPIface
-	else
-		echo "&karm; not running"
-	fi
+qdbus org.kde.ktimetracker /KTimeTracker 2>/dev/null || echo "ktimetracker not running"
 </programlisting>
 </example>
 </sect2>
@@ -642,312 +629,6 @@
 
 </sect1>
 
-<sect1 id="menus">
-<title>The &karm; menubar</title>
-<sect2>
-<title>The <guimenu>File</guimenu> menu</title>
-
-<variablelist>
-<varlistentry>
-<term>
-<menuchoice><shortcut>
-<keycombo action="simul">&Ctrl;<keycap>S</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Save</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Saves the current tasks and subtasks with their accumulated
-times</action></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>P</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Print</guimenuitem>
-</menuchoice></term>
-<listitem><para>
-<action>Prints</action> the &karm; window</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guimenuitem>Start New Session</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Resets </action>all session times to zero</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guimenuitem>Reset All Times</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Resets </action>all times to zero</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guisubmenu>Import/Export</guisubmenu>
-<guimenuitem>Import Legacy Flat File...</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Import </action>old style &karm; save files (&karm; 
-now uses iCalendar-style save files.)</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guisubmenu>Import/Export</guisubmenu>
-<guimenuitem>Import Tasks from Planner...</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Import </action>an imendio planner project (see <ulink
-url="http://planner.imendio.org">planner.imendio.org</ulink>). All tasks, subtasks and their "completed" flag will be imported from a .planner-file. You can import them as a subtask by creating a subtask, leaving it marked, and then importing. </para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>File</guimenu>
-<guisubmenu>Import/Export</guisubmenu>
-<guimenuitem>Export to CSV file...</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Export </action>
-<guilabel>Total Session Time</guilabel>,
-<guilabel>Session Time</guilabel>, <guilabel>Time</guilabel>, and
-<guilabel>Total Time</guilabel> to a text file.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<guimenu>File</guimenu>
-<guisubmenu>Import/Export</guisubmenu>
-<guimenuitem>Export History to CSV file...</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Export </action> task history to a text file.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Copy Totals to Clipboard</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Copies </action> the current total time for a 
-task or all tasks to the &kde; clipboard</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;&Alt;<keycap>C</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Copy History to Clipboard</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Copies </action> daily times for a 
-given period to the &kde; clipboard</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term><menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>Q</keycap></keycombo>
-</shortcut>
-<guimenu>File</guimenu>
-<guimenuitem>Quit</guimenuitem>
-</menuchoice></term>
-<listitem>
-<para><action>Closes</action> &karm;</para>
-</listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-<sect2>
-<title>The <guimenu>Clock</guimenu> menu</title>
-
-<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycap>S</keycap></shortcut>
-<guimenu>Clock</guimenu>
-<guimenuitem>Start</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para><action>Starts</action> timing the selected task</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Clock</guimenu>
-<guimenuitem>Stop</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para><action>Stops</action> timing the selected task</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut><keycap>&Esc;</keycap></shortcut>
-<guimenu>Clock</guimenu>
-<guimenuitem>Stop All Timers</guimenuitem>
-</menuchoice>
-</term>
-<listitem><para><action>Stops</action> timing all tasks</para></listitem>
-</varlistentry>
-</variablelist>
-</sect2>
-
-<sect2>
-<title>The <guimenu>Task</guimenu> menu</title>
-
-<variablelist>
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo>
-</shortcut>
-<guimenu>Task</guimenu>
-<guimenuitem>New</guimenuitem>
-</menuchoice>
-</term>
-<listitem><para><action>Add</action> a new task</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;&Alt;<keycap>N</keycap></keycombo>
-</shortcut>
-<guimenu>Task</guimenu>
-<guimenuitem>New Subtask</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para><action>Add</action> a new subtask to the selected task</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut>
-<keycap>Del</keycap>
-</shortcut>
-<guimenu>Task</guimenu>
-<guimenuitem>Delete</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para><action>Delete</action> the selected task or subtask</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<shortcut>
-<keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo>
-</shortcut>
-<guimenu>Task</guimenu>
-<guimenuitem>Edit</guimenuitem>
-</menuchoice>
-</term>
-<listitem>
-<para><action>Change the name or accumulated time</action> for the
-current task</para><para>There are two options for changing the time: Edit
-Absolute, in which the session and total times can be changed separately;
-and Edit Relative, in which a certain change is added to or subtracted from
-both the session and total times.</para><para>The Auto tracking option allows 
-timing to start and stop automatically when you switch to or from a particular 
-&kde; desktop.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</sect2>
-
-<sect2>
-<title>The <guimenu>Settings</guimenu> menu</title>
-<variablelist>
-
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure Shortcuts</guimenuitem>
-</menuchoice>
-</term>
-<listitem><para><action>Opens</action> a dialog to allow the user to customize
-the keyboard shortcuts</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>
-<menuchoice>
-<guimenu>Settings</guimenu>
-<guimenuitem>Configure &karm;</guimenuitem>
-</menuchoice>
-</term>
-<listitem><para><action>Opens</action> a dialog to allow the user to
-configure &karm;</para>
-
-<para>The dialog has three tabbed panes: <guilabel>Behavior </guilabel>, which 
-allows you to specify an alert for no activity and a warning message when you 
-delete a task set, <guilabel>Display </guilabel>, which configures the fields 
-shown in the main window and <guilabel>Storage</guilabel>,
-which configures the location of the save file, whether auto saving is
-enabled and the auto save interval.</para> </listitem>
-</varlistentry>
-
-</variablelist>
-</sect2>
-
-<sect2>
-<title>The <guimenu>Help</guimenu> menu</title>
-
-&help.menu.documentation;
-
-</sect2>
-
-</sect1>
-
 <sect1 id="tool-bar">
 <title>The Toolbar</title>
 <para>The toolbar contains icons for the following commands:</para>
@@ -1033,7 +714,7 @@
 </glossentry>
 
 <glossentry id="gloss-dcop">
-<glossterm>&DCOP;</glossterm>
+<glossterm>&DBus;</glossterm>
 <glossdef><para>The interprocess communication protocol used in &kde;.  Short
 for Desktop COmmunication Protocol.</para></glossdef>
 </glossentry>
@@ -1106,7 +787,7 @@
 
 </appendix>
 
-<appendix id="dcopappendix"><title>&DCOP; Interface</title>
+<appendix id="dcopappendix"><title>&DBus; Interface</title>
 
 <refentry id="dcop-version">
 <refmeta>
@@ -1123,7 +804,7 @@
 </refsynopsisdiv>
 <refsect1>
 <title>Description</title>
-<para><function>version()</function> is a &DCOP; call that returns &karm;'s
+<para><function>version()</function> is a &DBus; call that returns &karm;'s
 version number; for example 1.5.0.  The version number is returned as a string
 in the typical &GNU; format of major.minor.bugfix.</para>
 </refsect1>
@@ -1144,7 +825,7 @@
 </refsynopsisdiv>
 <refsect1>
 <title>Description</title>
-<para><function>quit()</function> is a &DCOP; call that provides a way that an
+<para><function>quit()</function> is a &DBus; call that provides a way that an
 external program can gracefully shutdown &karm;.
 </para>
 </refsect1>
@@ -1176,7 +857,7 @@
 </refsynopsisdiv>
 <refsect1>
 <title>Description</title>
-<para><function>hastodo(QString taskname)</function> is a &DCOP; call that
+<para><function>hastodo(QString taskname)</function> is a &DBus; call that
 	looks for a of the given name.  If found, it returns the
 	iCalendar UID that identifies that to-do.  If not found, it returns an empty
 	string.
@@ -1214,7 +895,7 @@
 
 <refsect1>
 <title>Description</title>
-<para><function>addtodo(QString todoname)</function> is a &DCOP; call that
+<para><function>addtodo(QString todoname)</function> is a &DBus; call that
 	adds a new top-level to-do to the current storage.  The UID of the new to-do
 	is returned.
 </para>
--- doc/kmail/configure.docbook
+++ doc/kmail/configure.docbook
@@ -1930,6 +1930,21 @@
 <para>Invitations use to be send as attachments to a mail. By enabling this option, you let the invitation mails to be sent in the text of the mail, which is necessary to send invitations and replies to Microsoft Outlook(tm).</para>
 </listitem>
 </varlistentry>
+<varlistentry>
+<term><guilabel>Exchange compatible invitations naming</guilabel></term>
+<listitem>
+<para>Microsoft Outlook, when used in combination with a Microsoft Exchange
+server, has a problem understanding standards-compliant groupware e-mail.
+Enable this option to send groupware invitations in a way that Microsoft
+Exchange understands. The invitation will be sent as an attachment with name <filename>ical.ics</filename>.</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term><guilabel>Outlook compatible invitation reply comments</guilabel></term>
+<listitem>
+<para>When the user provides comments when responding to invitations, send the comment in way that Microsoft Outlook(tm) understands. If this option is not enabled, the reponse comments will not be seen in Outlook.</para>
+</listitem>
+</varlistentry>
 </variablelist>
 </sect2>
 
--- doc/knode/more.docbook
+++ doc/knode/more.docbook
@@ -98,10 +98,10 @@
 url="http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung">http://www.kirchwitz.de/~amk/dni/usenet-einfuehrung</ulink>
 (German)</member> 
 <member>Why should I take the rules seriously? <ulink
-url="http://www.kirchwitz.de/~amk/dni/warum-regel">http://www.kirchwitz.de/~amk/dni/warum-regel</ulink>
+url="http://www.kirchwitz.de/~amk/dni/warum-regeln">http://www.kirchwitz.de/~amk/dni/warum-regeln</ulink>
 (German)</member> 
 <member>The newsreader <acronym>FAQ</acronym>: <ulink
-url="http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm">http://www.crosswinds.net/~cgarbers/faq/newsreaderFAQ.htm</ulink></member> 
+url="http://www.thomas-huehn.de/usenet/newsreaderFAQ.txt">http://www.thomas-huehn.de/usenet/newsreaderFAQ.txt</ulink> (German)</member> 
 <member>The correct quoting: <ulink
 url="http://www.afaik.de/usenet/faq/zitieren">http://www.afaik.de/usenet/faq/zitieren</ulink>
 (German)</member> 
@@ -122,13 +122,13 @@
 <simplelist> 
 <member>Header entries: <ulink url="http://www.kirchwitz.de/~amk/dni/headerzeilen"> 
 http://www.kirchwitz.de/~amk/dni/headerzeilen</ulink> (German)</member> 
-<member>A very useful message-ID <acronym>FAQ</acronym>: <ulink url="http://www.qad.org/faq/faq-messageid.html"> 
-http://www.qad.org/faq/faq-messageid.html</ulink></member> 
+<member>A very useful message-ID <acronym>FAQ</acronym>: <ulink url="http://www.hanau.net/usenet/faq/messageid.php"> 
+http://www.hanau.net/usenet/faq/messageid.php (German)</ulink></member> 
 <member>A lot of links about newsreaders and related topics: <ulink
-url="http://www.leafnode.org/links">http://www.leafnode.org/links</ulink></member> 
+url="http://www.leafnode.org/links.shtml">http://www.leafnode.org/links.shtml</ulink></member> 
 <member><acronym>RFC</acronym>s, Drafts and documents for the technical
-interested: <ulink url="http://www.landfield.com/usefor/"> 
-http://www.landfield.com/usefor/</ulink></member> 
+interested: <ulink url="http://tools.ietf.org/wg/usefor/">
+http://tools.ietf.org/wg/usefor/</ulink></member> 
 </simplelist> 
 </sect1> 
 </chapter> 
--- doc/kpilot/usage.docbook
+++ doc/kpilot/usage.docbook
@@ -8,7 +8,7 @@
 </para>
 
 <para>
-On the first start &kpilot; opens the configuration dialog which allows to you adjust its 
+On the first start &kpilot; opens the configuration dialog which allows you to adjust its 
 settings and select and configure the conduits to be used.
 Click the <guibutton>OK</guibutton> button to switch to the
 &HotSync;-log, as shown <link linkend="main-app">here</link>.
--- doc/kalarm/index.docbook
+++ doc/kalarm/index.docbook
@@ -41,8 +41,8 @@
 
 
 
-<date>2009-05-25</date>
-<releaseinfo>2.02.00</releaseinfo>
+<date>2008-09-25</date>
+<releaseinfo>2.2.7</releaseinfo>
 
 <abstract>
 <para>&kalarm; is a personal alarm message, command and email scheduler for &kde;.</para>
@@ -423,21 +423,25 @@
 <sect2>
 <title>Deleting/Reactivating an Alarm</title>
 
-<para>To delete existing alarms, do one of the following:</para>
+<para>To delete existing alarms, select one or more by clicking on
+their entries in the alarm list. Then do one of the following:</para>
 
 <itemizedlist>
 <listitem>
-<para>Select one or more alarms by clicking on their entries in the
-alarm list. Then choose <menuchoice>
+<para>Choose <menuchoice>
 <guimenu>Actions</guimenu><guimenuitem>Delete</guimenuitem>
 </menuchoice>.</para>
 </listitem>
 <listitem>
-<para><mousebutton>Right</mousebutton> click on the desired entries in
-the alarm list and choose
+<para><mousebutton>Right</mousebutton> click on the selected entries
+and choose
 <menuchoice><guimenuitem>Delete</guimenuitem></menuchoice>
 from the context menu.</para>
 </listitem>
+<listitem>
+<para>To delete them without a confirmation prompt, type
+&Shift;-<keycap>Delete</keycap>.</para>
+</listitem>
 </itemizedlist>
 
 <para>When you delete an active alarm, it is archived, provided that
@@ -2833,7 +2837,7 @@
   <replaceable>period</replaceable></option></entry>
   <entry>Cancel the alarm if it cannot be triggered within the
   specified <replaceable>period</replaceable> after the correct
-  time. The <replaceable>period</replaceable> period is specified in
+  time. The <replaceable>period</replaceable> is specified in
   the same format as described for <option>--reminder</option>.
   The default value of <replaceable>period</replaceable> is 1
   minute.</entry>
--- kalarm/functions.h
+++ kalarm/functions.h
@@ -141,20 +141,6 @@
 KDateTime           applyTimeZone(const QString& tzstring, const QDate& date, const QTime& time,
                                   bool haveTime, const KDateTime& defaultDt = KDateTime());
 bool                isWorkingTime(const KDateTime&, const KAEvent*);
-int                 localeFirstDayOfWeek();
-QString             weekDayName(int day, const KLocale*);
-
-/* Given a standard KDE day number, return the day number in the week for the user's locale.
- * Standard day number = 1 (Mon) .. 7 (Sun)
- * Locale day number in week = 0 .. 6
- */
-inline int          weekDay_to_localeDayInWeek(int weekDay)  { return (weekDay + 7 - localeFirstDayOfWeek()) % 7; }
-
-/* Given a day number in the week for the user's locale, return the standard KDE day number.
- * 'index' = 0 .. 6
- * Standard day number = 1 (Mon) .. 7 (Sun)
- */
-inline int          localeDayInWeek_to_weekDay(int index)  { return (index + localeFirstDayOfWeek() - 1) % 7 + 1; }
 
 #ifndef NDEBUG
 void                setTestModeConditions();
--- kalarm/Changelog
+++ kalarm/Changelog
@@ -1,5 +1,8 @@
 KAlarm Change Log
 
+=== Version 2.2.8 --- 19 August 2009 ===
+- Use KDE system settings to determine default working days in the week.
+
 === Version 2.2.7 (KDE 4.3.1) --- 19 August 2009 ===
 - Shift-Delete now deletes alarms without showing confirmation prompt.
 - Disable edit alarm dialogue OK button if no changes have been made.
--- kalarm/lib/kalocale.h
+++ kalarm/lib/kalocale.h
@@ -0,0 +1,54 @@
+/*
+ *  kalocale.h  -  miscellaneous locale functions
+ *  Program:  kalarm
+ *  Copyright © 2004-2009 by David Jarvie <djarvie@kde.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef LOCALE_H
+#define LOCALE_H
+
+#include <QString>
+class KLocale;
+
+namespace KAlarm
+{
+
+/** Return the first day of the week for the user's locale.
+*   Reply = 1 (Mon) .. 7 (Sun).
+*/
+int        localeFirstDayOfWeek();
+
+/** Return the week day name (Monday = 1). */
+QString    weekDayName(int day, const KLocale*);
+
+/* Given a standard KDE day number, return the day number in the week for the user's locale.
+ * Standard day number = 1 (Mon) .. 7 (Sun)
+ * Locale day number in week = 0 .. 6
+ */
+inline int weekDay_to_localeDayInWeek(int weekDay)  { return (weekDay + 7 - localeFirstDayOfWeek()) % 7; }
+
+/* Given a day number in the week for the user's locale, return the standard KDE day number.
+ * 'index' = 0 .. 6
+ * Standard day number = 1 (Mon) .. 7 (Sun)
+ */
+inline int localeDayInWeek_to_weekDay(int index)  { return (index + localeFirstDayOfWeek() - 1) % 7 + 1; }
+
+uint defaultWorkDays();
+
+} // namespace KAlarm
+
+#endif // LOCALE_H
--- kalarm/lib/kalocale.cpp
+++ kalarm/lib/kalocale.cpp
@@ -0,0 +1,83 @@
+/*
+ *  kalocale.cpp  -  miscellaneous locale functions
+ *  Program:  kalarm
+ *  Copyright © 2003-2009 by David Jarvie <djarvie@kde.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "kalarm.h"   //krazy:exclude=includes (kalarm.h must be first)
+#include "kalocale.h"
+
+#include <kglobal.h>
+#include <klocale.h>
+#include <kdebug.h>
+
+
+namespace KAlarm
+{
+
+/******************************************************************************
+*  Return the first day of the week for the user's locale.
+*  Reply = 1 (Mon) .. 7 (Sun).
+*/
+int localeFirstDayOfWeek()
+{
+	static int firstDay = 0;
+	if (!firstDay)
+		firstDay = KGlobal::locale()->weekStartDay();
+	return firstDay;
+}
+
+/******************************************************************************
+* Return the week day name (Monday = 1).
+*/
+QString weekDayName(int day, const KLocale* locale)
+{
+	switch (day)
+	{
+		case 1: return ki18nc("@option Name of the weekday", "Monday").toString(locale);
+		case 2: return ki18nc("@option Name of the weekday", "Tuesday").toString(locale);
+		case 3: return ki18nc("@option Name of the weekday", "Wednesday").toString(locale);
+		case 4: return ki18nc("@option Name of the weekday", "Thursday").toString(locale);
+		case 5: return ki18nc("@option Name of the weekday", "Friday").toString(locale);
+		case 6: return ki18nc("@option Name of the weekday", "Saturday").toString(locale);
+		case 7: return ki18nc("@option Name of the weekday", "Sunday").toString(locale);
+	}
+	return QString();
+}
+
+/******************************************************************************
+* Return the default work days in the week, as a bit mask.
+* They are determined by the start and end work days in system settings.
+*/
+uint defaultWorkDays()
+{
+	KLocale* locale = KGlobal::locale();
+	int end = locale->workingWeekEndDay() - 1;
+	uint days = 0;
+	for (int day = locale->workingWeekStartDay() - 1;  ; )
+	{
+		days |= 1 << day;
+		if (day == end)
+			break;
+		++day;
+		if (day >= 7)
+			day = 0;
+	}
+	return days;
+}
+
+} // namespace KAlarm
--- kalarm/functions.cpp
+++ kalarm/functions.cpp
@@ -1562,36 +1562,6 @@
 }
 
 /******************************************************************************
-*  Return the first day of the week for the user's locale.
-*  Reply = 1 (Mon) .. 7 (Sun).
-*/
-int localeFirstDayOfWeek()
-{
-	static int firstDay = 0;
-	if (!firstDay)
-		firstDay = KGlobal::locale()->weekStartDay();
-	return firstDay;
-}
-
-/******************************************************************************
-* Return the week day name (Monday = 1).
-*/
-QString weekDayName(int day, const KLocale* locale)
-{
-	switch (day)
-	{
-		case 1: return ki18nc("@option Name of the weekday", "Monday").toString(locale);
-		case 2: return ki18nc("@option Name of the weekday", "Tuesday").toString(locale);
-		case 3: return ki18nc("@option Name of the weekday", "Wednesday").toString(locale);
-		case 4: return ki18nc("@option Name of the weekday", "Thursday").toString(locale);
-		case 5: return ki18nc("@option Name of the weekday", "Friday").toString(locale);
-		case 6: return ki18nc("@option Name of the weekday", "Saturday").toString(locale);
-		case 7: return ki18nc("@option Name of the weekday", "Sunday").toString(locale);
-	}
-	return QString();
-}
-
-/******************************************************************************
 * Convert a date/time specification string into a local date/time or date value.
 * Parameters:
 *   timeString  = in the form [[[yyyy-]mm-]dd-]hh:mm [TZ] or yyyy-mm-dd [TZ].
--- kalarm/resources/localdir.desktop
+++ kalarm/resources/localdir.desktop
@@ -8,6 +8,7 @@
 Name[da]=Alarmer i lokal mappe
 Name[de]=Erinnerungen in lokalem Ordner
 Name[el]=Ειδοποιήσεις σε τοπικό κατάλογο
+Name[en_GB]=Alarms in Local Directory
 Name[es]=Alarmas en un directorio local
 Name[et]=Häired kohalikus kataloogis
 Name[fa]=هشدارها در فهرست راهنمای محلی
@@ -47,6 +48,7 @@
 Comment[da]=Giver adgang til en alarmkalender lagret i en lokal mappe, hvori hvert enkelt kalenderelement lagres i en seperat fil
 Comment[de]=Ermöglicht den Zugriff auf einen Erinnerungen-Kalender in einem lokalen Ordner, in dem jeder Kalender-Eintrag als separate Datei gespeichert ist.
 Comment[el]=Προσφέρει πρόσβαση σε ημερολόγιο ειδοποιήσεων αποθηκευμένο σε έναν τοπικό κατάλογο,  στον οποίο κάθε αντικείμενο αποθηκεύεται σε ξεχωριστό αρχείο
+Comment[en_GB]=Provides access to an alarm calendar stored in a local directory, in which each calendar item is stored in a separate file
 Comment[es]=Provee acceso a un calendario de alarmas almacenado en un directorio local, en el cual cada elemento del calendario es almacenado en un archivo separado
 Comment[et]=Võimaldab kasutada kohalikku kataloogi salvestatud häirete kalendrit, kus iga kalender on salvestatud eraldi faili
 Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un dossier ; chaque entrée du calendrier étant stockée dans un fichier distinct
--- kalarm/resources/local.desktop
+++ kalarm/resources/local.desktop
@@ -7,6 +7,7 @@
 Name[da]=Alarmer i lokal fil
 Name[de]=Erinnerungen in lokaler Datei
 Name[el]=Ειδοποιήσεις σε τοπικό αρχείο
+Name[en_GB]=Alarms in Local File
 Name[es]=Alarmas en un archivo local
 Name[et]=Häired kohalikus failis
 Name[fa]=هشدارها در پروندۀ محلی
@@ -47,6 +48,7 @@
 Comment[da]=Giver adgang til en alarmkalender lagret i en enkelt lokal fil
 Comment[de]=Ermöglicht den Zugriff auf einen Erinnerungen-Kalender in einer lokalen Datei.
 Comment[el]=Προσφέρει πρόσβαση σε ημερολόγιο ειδοποιήσεων αποθηκευμένο σε ένα τοπικό αρχείο
+Comment[en_GB]=Provides access to an alarm calendar stored in a single local file
 Comment[es]=Provee acceso al calendario de alarmas almacenado en un solo archivo local
 Comment[et]=Võimaldab kasutada kohalikku faili salvestatud häirete kalendrit
 Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un unique fichier
--- kalarm/resources/remote.desktop
+++ kalarm/resources/remote.desktop
@@ -8,6 +8,7 @@
 Name[da]=Alarmer i ekstern fil
 Name[de]=Erinnerungen in Datei auf Fremdrechner
 Name[el]=Ειδοποιήσεις σε απομακρυσμένο αρχείο
+Name[en_GB]=Alarms in Remote File
 Name[es]=Alarmas en un archivo remoto
 Name[et]=Häired võrgufailis
 Name[fa]=هشدارها در پروندۀ دور
@@ -47,6 +48,7 @@
 Comment[da]=Giver adgang til en alarm-kalender i en ekstern fil der bruger KDE's netværks-framework KIO
 Comment[de]=Ermöglicht den Zugriff auf einen entfernten Erinnerungen-Kalender über KDEs Netzwerk-Zugriffsystem KIO.
 Comment[el]=Προσφέρει πρόσβαση ημερολογίου ειδοποιήσεων σε ένα απομακρυσμένο αρχείου με τη χρήση του  συστήματος KIO του KDE
+Comment[en_GB]=Provides access to an alarm calendar in a remote file using KDE's network framework KIO
 Comment[es]=Provee acceso a un calendario de alarmas en un archivo remoto utilizando la infraestructuraKIO de red de KDE
 Comment[et]=Võimaldab kasutada võrgufailis leiduvat häirete kalendrit KDE võrguraamistiku KIO vahendusel
 Comment[fr]=Fourni l'accès aux alarmes de calendrier stockées dans un fichier distant en utilisant les composants réseaux KIO de KDE
--- kalarm/resources/kalarm_manager.desktop
+++ kalarm/resources/kalarm_manager.desktop
@@ -8,6 +8,7 @@
 Name[da]=Alarmer
 Name[de]=Erinnerungen
 Name[el]=Ειδοποιήσεις
+Name[en_GB]=Alarms
 Name[es]=Alarmas
 Name[et]=Häired
 Name[fi]=Hälytykset
@@ -24,6 +25,7 @@
 Name[lv]=Atgādinājumi
 Name[mai]=सचेतक
 Name[nb]=Varslinger
+Name[nds]=Alarms
 Name[ne]=संसूचक
 Name[nl]=Herinneringen
 Name[nn]=Alarmar
--- kalarm/kalarmconfig.kcfg
+++ kalarm/kalarmconfig.kcfg
@@ -10,6 +10,7 @@
   <include>qnamespace.h</include>
   <include>kglobalsettings.h</include>
   <include>"timeperiod.h"</include>
+  <include>"kalocale.h"</include>
 
   <kcfgfile name="kalarmrc"/>
 
@@ -193,7 +194,7 @@
     <entry name="Base_WorkDays" key="WorkDays" type="UInt">
       <label context="@label">Working days</label>
       <whatsthis context="@info:whatsthis">OR'ed bits indicating which days of the week are work days, 1 = Monday ... 64 = Sunday.</whatsthis>
-      <default>31</default>
+      <default code="true">KAlarm::defaultWorkDays()</default>
       <emit signal="base_WorkTimeChanged"/>
     </entry>
     <entry name="DisabledColour" type="Color">
--- kalarm/prefdlg.cpp
+++ kalarm/prefdlg.cpp
@@ -32,6 +32,7 @@
 #include "identities.h"
 #include "itembox.h"
 #include "kalarmapp.h"
+#include "kalocale.h"
 #include "kamail.h"
 #include "label.h"
 #include "latecancel.h"
--- kalarm/CMakeLists.txt
+++ kalarm/CMakeLists.txt
@@ -30,6 +30,7 @@
 	lib/identities.cpp
 	lib/itembox.cpp
 	lib/label.cpp 
+	lib/kalocale.cpp
 	lib/messagebox.cpp 
 	lib/packedlayout.cpp 
 	lib/pushbutton.cpp 
--- kalarm/kalarm.desktop
+++ kalarm/kalarm.desktop
@@ -3,16 +3,62 @@
 Name=KAlarm
 Name[af]=K-alarm
 Name[ar]=برنامج المنبه KAlarm
+Name[be]=KAlarm
 Name[bg]=Аларма
+Name[br]=KAlarm
+Name[ca]=KAlarm
+Name[cs]=KAlarm
 Name[cy]=KLarwm
+Name[da]=KAlarm
+Name[de]=KAlarm
+Name[el]=KAlarm
+Name[en_GB]=KAlarm
 Name[eo]=Alarmilo
+Name[es]=KAlarm
+Name[et]=KAlarm
+Name[eu]=KAlarm
+Name[fi]=KAlarm
+Name[fr]=KAlarm
+Name[fy]=KAlarm
+Name[ga]=KAlarm
+Name[gl]=KAlarm
+Name[he]=KAlarm
+Name[hr]=KAlarm
+Name[hu]=KAlarm
+Name[is]=KAlarm
+Name[it]=KAlarm
+Name[ja]=KAlarm
+Name[ka]=KAlarm
+Name[kk]=KAlarm
+Name[km]=KAlarm
+Name[ko]=KAlarm
+Name[lt]=KAlarm
+Name[lv]=KAlarm
 Name[mk]=КАларм
+Name[ms]=KAlarm
+Name[nb]=KAlarm
+Name[nds]=KAlarm
 Name[ne]=केडीई संसूचक
+Name[nl]=KAlarm
+Name[nn]=KAlarm
 Name[pa]=ਕੇ-ਅਲਾਰਮ
 Name[pl]=Alarm
+Name[pt]=KAlarm
+Name[pt_BR]=KAlarm
+Name[ro]=KAlarm
+Name[ru]=KAlarm
+Name[se]=KAlarm
+Name[sk]=KAlarm
+Name[sl]=KAlarm
 Name[sv]=Kalarm
 Name[ta]=Kஅலாரம்
+Name[tg]=KAlarm
+Name[tr]=KAlarm
+Name[uk]=KAlarm
+Name[vi]=KAlarm
+Name[xh]=KAlarm
 Name[x-test]=xxKAlarmxx
+Name[zh_CN]=KAlarm
 Name[zh_TW]=KAlarm 鬧鐘
 Type=Application
 Exec=kalarm -caption "%c" %i
@@ -28,6 +74,7 @@
 GenericName[da]=Personlig skemalægning af alarm
 GenericName[de]=Persönliche Termin-Erinnerung
 GenericName[el]=Προσωπικός προγραμματιστής ειδοποιήσεων
+GenericName[en_GB]=Personal Alarm Scheduler
 GenericName[eo]=Persona alarmplanilo
 GenericName[es]=Planificador de alarmas personal
 GenericName[et]=Meeldetuletuste ajastaja
@@ -63,6 +110,7 @@
 GenericName[sk]=Osobný plánovač alarmov
 GenericName[sl]=Razporejevalnik osebnih alarmov
 GenericName[sv]=Personlig alarmschemaläggning
+GenericName[ta]=Personal Alarm Scheduler
 GenericName[tg]=Идоракунии хотиррасониҳои шахсӣ
 GenericName[th]=ตัวจัดตารางแจ้งเตือนส่วนบุคคล
 GenericName[tr]=Kişisel Alarm Zamanlayıcı
--- kalarm/recurrenceedit.cpp
+++ kalarm/recurrenceedit.cpp
@@ -50,6 +50,7 @@
 #include "dateedit.h"
 #include "functions.h"
 #include "kalarmapp.h"
+#include "kalocale.h"
 #include "karecurrence.h"
 #include "preferences.h"
 #include "radiobutton.h"
--- kalarm/kalarm.autostart.desktop
+++ kalarm/kalarm.autostart.desktop
@@ -3,16 +3,62 @@
 Name=KAlarm
 Name[af]=K-alarm
 Name[ar]=برنامج المنبه KAlarm
+Name[be]=KAlarm
 Name[bg]=Аларма
+Name[br]=KAlarm
+Name[ca]=KAlarm
+Name[cs]=KAlarm
 Name[cy]=KLarwm
+Name[da]=KAlarm
+Name[de]=KAlarm
+Name[el]=KAlarm
+Name[en_GB]=KAlarm
 Name[eo]=Alarmilo
+Name[es]=KAlarm
+Name[et]=KAlarm
+Name[eu]=KAlarm
+Name[fi]=KAlarm
+Name[fr]=KAlarm
+Name[fy]=KAlarm
+Name[ga]=KAlarm
+Name[gl]=KAlarm
+Name[he]=KAlarm
+Name[hr]=KAlarm
+Name[hu]=KAlarm
+Name[is]=KAlarm
+Name[it]=KAlarm
+Name[ja]=KAlarm
+Name[ka]=KAlarm
+Name[kk]=KAlarm
+Name[km]=KAlarm
+Name[ko]=KAlarm
+Name[lt]=KAlarm
+Name[lv]=KAlarm
 Name[mk]=КАларм
+Name[ms]=KAlarm
+Name[nb]=KAlarm
+Name[nds]=KAlarm
 Name[ne]=केडीई संसूचक
+Name[nl]=KAlarm
+Name[nn]=KAlarm
 Name[pa]=ਕੇ-ਅਲਾਰਮ
 Name[pl]=Alarm
+Name[pt]=KAlarm
+Name[pt_BR]=KAlarm
+Name[ro]=KAlarm
+Name[ru]=KAlarm
+Name[se]=KAlarm
+Name[sk]=KAlarm
+Name[sl]=KAlarm
 Name[sv]=Kalarm
 Name[ta]=Kஅலாரம்
+Name[tg]=KAlarm
+Name[tr]=KAlarm
+Name[uk]=KAlarm
+Name[vi]=KAlarm
+Name[xh]=KAlarm
 Name[x-test]=xxKAlarmxx
+Name[zh_CN]=KAlarm
 Name[zh_TW]=KAlarm 鬧鐘
 Exec=kalarmautostart kalarm --tray
 Icon=kalarm
@@ -26,6 +72,7 @@
 Comment[da]=Autostart KAlarm ved login
 Comment[de]=Autostart von KAlarm bei der Anmeldung
 Comment[el]=Αυτόματη εκκίνηση KAlarm κατά τη σύνδεση
+Comment[en_GB]=KAlarm autostart at login
 Comment[es]=Inicio automático de KAlarm al iniciar sesión
 Comment[et]=KAlarmi automaatne käivitamine sisselogimisel
 Comment[fr]=Démarrage à la connexion de KAlarm
--- kaddressbook/interfaces/kaddressbook_extension.desktop
+++ kaddressbook/interfaces/kaddressbook_extension.desktop
@@ -11,6 +11,7 @@
 Comment[da]=KAddressBook udvidelsesplugin
 Comment[de]=Erweiterungsmodul für Adressbuch
 Comment[el]=Πρόσθετο επέκτασης του KAddressBook
+Comment[en_GB]=KAddressBook Extension Plugin
 Comment[eo]=KAddressBook Etendiga Kromaĵo
 Comment[es]=Complemento de extensión de KAddressBook
 Comment[et]=KDE aadressiraamatu laiendi plugin
--- kaddressbook/interfaces/kaddressbook_xxport.desktop
+++ kaddressbook/interfaces/kaddressbook_xxport.desktop
@@ -12,6 +12,7 @@
 Comment[da]=KAddressBook Import/Eksport-plugin
 Comment[de]=Import/Export-Modul für Adressbuch
 Comment[el]=Πρόσθετο εισαγωγής/εξαγωγής του KAddressBook
+Comment[en_GB]=KAddressBook Import/Export Plugin
 Comment[eo]=KAddressBook Import-/Eksport-Kromaĵo
 Comment[es]=Complemento de importación/exportación de KAddressBook
 Comment[et]=KDE aadressiraamatu import/eksportplugin
@@ -38,6 +39,7 @@
 Comment[nb]=KAddressbook-programtillegg for import/eksport
 Comment[nds]=Import-/Exportmoduul för KAdressbook
 Comment[ne]=केडीई ठेगाना पुस्तिका आयात/निर्यात प्लगइन
+Comment[nl]=KAddressBook Import/Export Plugin
 Comment[nn]=Programtillegg for importering/eksportering i KDE-adresseboka
 Comment[pa]=ਕੇ-ਐੱਡਰਸਬੁੱਕ ਇੰਪੋਰਟ/ਐਕਸਪੋਰਟ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka importu/eksportu dla KAddressBook
--- kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
+++ kaddressbook/interfaces/kaddressbook_contacteditorwidget.desktop
@@ -10,6 +10,7 @@
 Comment[da]=KAddressBook plugin til kontakteditorkontrol
 Comment[de]=Adressbuch Kontakteditor-Modul
 Comment[el]=Πρόσθετο επεξεργασίας επαφής του KAddressBook
+Comment[en_GB]=KAddressBook Contact Editor Widget Plugin
 Comment[eo]=Kromaĵo por KAddressBook Kontaktredaktila Fenestraĵo
 Comment[es]=Complemento de edición de contactos de KAddressBook
 Comment[et]=KDE aadressiraamatu kontaktide redigeerimise plugin
--- kaddressbook/kaddressbook.desktop
+++ kaddressbook/kaddressbook.desktop
@@ -1,26 +1,60 @@
 [Desktop Entry]
 Name=KAddressBook
+Name[af]=KAddressBook
 Name[ar]=دفتر عناوين كدي
+Name[be]=KAddressBook
+Name[bg]=KAddressBook
+Name[br]=KAddressBook
+Name[ca]=KAddressBook
+Name[cs]=KAddressBook
 Name[cy]=KAddressBook/LlyfrKyfeiriadau
+Name[da]=KAddressBook
 Name[de]=Adressbuch
+Name[el]=KAddressBook
+Name[en_GB]=KAddressBook
+Name[eo]=KAddressBook
+Name[es]=KAddressBook
 Name[et]=KDE aadressiraamat
 Name[eu]=Helbide-liburua
 Name[fi]=Osoitekirja
 Name[fr]=Carnet d'adresses
+Name[fy]=KAddressBook
+Name[ga]=KAddressBook
+Name[gl]=KAddressBook
 Name[he]=פנקס כתובות
+Name[hu]=KAddressBook
+Name[is]=KAddressBook
+Name[it]=KAddressBook
+Name[ja]=KAddressBook
+Name[ka]=KAddressBook
+Name[kk]=KAddressBook
+Name[km]=KAddressBook
+Name[ko]=KAddressBook
+Name[lt]=KAddressBook
+Name[lv]=KAddressBook
 Name[mk]=КАдресар
+Name[ms]=KAddressBook
+Name[nb]=KAddressBook
 Name[nds]=KAdressbook
 Name[ne]=केडीई ठेगाना पुस्तिका
+Name[nl]=KAddressBook
 Name[nn]=KDE-adressebok
 Name[pa]=ਕੇ-ਐਡਰੈੱਸਬੁੱਕ
 Name[pl]=Książka adresowa
+Name[pt]=KAddressBook
+Name[pt_BR]=KAddressBook
 Name[ro]=Cartea de adrese
+Name[ru]=KAddressBook
+Name[se]=KAddressBook
 Name[sk]=Adresár
+Name[sl]=KAddressBook
 Name[sv]=Adressbok
 Name[ta]=கேமுகவரிப் புத்தகம்
 Name[th]=สมุดที่อยู่ K
 Name[tr]=KDE Adres Defteri
+Name[uk]=KAddressBook
 Name[x-test]=xxKAddressBookxx
+Name[zh_CN]=KAddressBook
 Name[zh_TW]=KAddressBook 通訊錄
 GenericName=Address Manager
 GenericName[af]=Adres Bestuurder
@@ -34,6 +68,7 @@
 GenericName[da]=Adressehåndtering
 GenericName[de]=Adressverwaltung
 GenericName[el]=Διαχειριστής διευθύνσεων
+GenericName[en_GB]=Address Manager
 GenericName[eo]=Adresadministrilo
 GenericName[es]=Gestor de direcciones
 GenericName[et]=Aadressihaldur
@@ -77,6 +112,7 @@
 GenericName[uk]=Менеджер адрес
 GenericName[x-test]=xxAddress Managerxx
 GenericName[zh_CN]=地址管理器
+GenericName[zh_TW]=Address Manager
 Exec=kaddressbook %u
 Icon=kaddressbook
 Type=Application
--- kaddressbook/dbusaddressbook.desktop
+++ kaddressbook/dbusaddressbook.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Adressebog med en D-Bus-grænseflade
 Comment[de]=Adressbuch mit D-Bus-Schnittstelle
 Comment[el]=Βιβλίο διευθύνσεων με ένα περιβάλλον χρήσης D-Bus
+Comment[en_GB]=Address Book with a D-Bus interface
 Comment[es]=Libreta de direcciones con una interfaz D-Bus
 Comment[et]=Aadressiraamat D-Busi liidesega
 Comment[fa]=کتاب نشانی با یک واسط D-Bus
--- kaddressbook/csv-templates/kaddressbook.desktop
+++ kaddressbook/csv-templates/kaddressbook.desktop
@@ -9,31 +9,65 @@
 Name=KAddressBook (KDE 3.1)
 Name[af]=K-adresboek (Kde 3.1)
 Name[ar]=دفتر عناوين كدي (KDE 3.1)
+Name[be]=KAddressBook (KDE 3.1)
+Name[bg]=KAddressBook (KDE 3.1)
+Name[br]=KAddressBook (KDE 3.1)
 Name[ca]=Llibreta d'adreces (KDE 3.1)
 Name[cs]=Kniha adres (KDE 3.1)
 Name[cy]=KLlyfrCyfeiriadau (KDE 3.1)
+Name[da]=KAddressBook (KDE 3.1)
 Name[de]=Adressbuch (KDE 3.1)
+Name[el]=KAddressBook (KDE 3.1)
+Name[en_GB]=KAddressBook (KDE 3.1)
+Name[eo]=KAddressBook (KDE 3.1)
+Name[es]=KAddressBook (KDE 3.1)
 Name[et]=KDE aadressiraamat (KDE 3.1)
+Name[eu]=KAddressBook (KDE 3.1)
+Name[fi]=KAddressBook (KDE 3.1)
+Name[fr]=KAddressBook (KDE 3.1)
+Name[fy]=KAddressBook (KDE 3.1)
+Name[ga]=KAddressBook (KDE 3.1)
+Name[gl]=KAddressBook (KDE 3.1)
+Name[he]=KAddressBook (KDE 3.1)
 Name[hr]=KAdressBook (KDE 3.1)
 Name[hu]=Címjegyzék (KDE 3.1)
+Name[is]=KAddressBook (KDE 3.1)
 Name[it]=Rubrica indirizzi (KDE 3.1)
+Name[ja]=KAddressBook (KDE 3.1)
 Name[ka]=წიგნაკი (KDE 3.1)
+Name[kk]=KAddressBook (KDE 3.1)
+Name[km]=KAddressBook (KDE 3.1)
+Name[ko]=KAddressBook (KDE 3.1)
+Name[lt]=KAddressBook (KDE 3.1)
+Name[lv]=KAddressBook (KDE 3.1)
 Name[mk]=КАдресар (KDE 3.1)
+Name[ms]=KAddressBook (KDE 3.1)
 Name[nb]=Adressebok (KDE 3.1)
 Name[nds]=KAdressbook (KDE 3.1)
 Name[ne]=केडीई ठेगाना पुस्तिका (केडीई ३.१)
+Name[nl]=KAddressBook (KDE 3.1)
 Name[nn]=KDE-adressebok (KDE 3.1)
+Name[pa]=KAddressBook (KDE 3.1)
 Name[pl]=Książka adresowa (KDE 3.1)
+Name[pt]=KAddressBook (KDE 3.1)
+Name[pt_BR]=KAddressBook (KDE 3.1)
 Name[ro]=Cartea de adrese (KDE 3.1)
 Name[ru]=Адресная книга (KDE 3.1)
 Name[se]=KDE-čujuhusgirji (KDE 3.3)
+Name[sk]=KAddressBook (KDE 3.1)
 Name[sl]=Adresar (KDE 3.1)
 Name[sv]=Adressbok (KDE 3.1)
 Name[ta]=கேமுகவரிப்புத்தகம் (KDE 3.1)
 Name[tg]=Китоби адрес (KDE 3.1)
 Name[th]=สมุดที่อยู่ K (KDE 3.1)
 Name[tr]=KDE Adres Defteri (KDE 3.1)
+Name[uk]=KAddressBook (KDE 3.1)
+Name[uz]=KAddressBook (KDE 3.1)
+Name[uz@cyrillic]=KAddressBook (KDE 3.1)
+Name[xh]=KAddressBook (KDE 3.1)
 Name[x-test]=xxKAddressBook (KDE 3.1)xx
+Name[zh_CN]=KAddressBook (KDE 3.1)
+Name[zh_TW]=KAddressBook (KDE 3.1)
 
 [csv column map]
 0=1
--- kaddressbook/csv-templates/outlook2000.desktop
+++ kaddressbook/csv-templates/outlook2000.desktop
@@ -6,12 +6,68 @@
 
 [Misc]
 Name=Outlook 2000
+Name[af]=Outlook 2000
+Name[ar]=Outlook 2000
+Name[be]=Outlook 2000
+Name[bg]=Outlook 2000
+Name[br]=Outlook 2000
+Name[ca]=Outlook 2000
+Name[cs]=Outlook 2000
+Name[cy]=Outlook 2000
+Name[da]=Outlook 2000
+Name[de]=Outlook 2000
+Name[el]=Outlook 2000
+Name[en_GB]=Outlook 2000
 Name[eo]=Redmondo 2000
+Name[es]=Outlook 2000
+Name[et]=Outlook 2000
+Name[eu]=Outlook 2000
 Name[fa]=اوت لوک ۲۰۰۰
+Name[fi]=Outlook 2000
+Name[fr]=Outlook 2000
+Name[fy]=Outlook 2000
+Name[ga]=Outlook 2000
+Name[gl]=Outlook 2000
+Name[he]=Outlook 2000
+Name[hr]=Outlook 2000
+Name[hu]=Outlook 2000
+Name[is]=Outlook 2000
+Name[it]=Outlook 2000
+Name[ja]=Outlook 2000
+Name[ka]=Outlook 2000
+Name[kk]=Outlook 2000
+Name[km]=Outlook 2000
+Name[ko]=Outlook 2000
+Name[lt]=Outlook 2000
+Name[lv]=Outlook 2000
+Name[mk]=Outlook 2000
+Name[ms]=Outlook 2000
+Name[nb]=Outlook 2000
+Name[nds]=Outlook 2000
 Name[ne]=आउटलुक २०००
+Name[nl]=Outlook 2000
+Name[nn]=Outlook 2000
+Name[pa]=Outlook 2000
+Name[pl]=Outlook 2000
+Name[pt]=Outlook 2000
+Name[pt_BR]=Outlook 2000
+Name[ro]=Outlook 2000
+Name[ru]=Outlook 2000
+Name[se]=Outlook 2000
+Name[sk]=Outlook 2000
+Name[sl]=Outlook 2000
+Name[sv]=Outlook 2000
 Name[ta]=அவுட்லுக் 2000
+Name[tg]=Outlook 2000
 Name[th]=เอาต์ลุค 2000
+Name[tr]=Outlook 2000
+Name[uk]=Outlook 2000
+Name[uz]=Outlook 2000
+Name[uz@cyrillic]=Outlook 2000
+Name[xh]=Outlook 2000
 Name[x-test]=xxOutlook 2000xx
+Name[zh_CN]=Outlook 2000
+Name[zh_TW]=Outlook 2000
 
 [csv column map]
 0=5
--- kaddressbook/csv-templates/yahoo.desktop
+++ kaddressbook/csv-templates/yahoo.desktop
@@ -13,6 +13,7 @@
 Name[da]=Yahoo! adressebog
 Name[de]=Yahoo!-Adressbuch
 Name[el]=Βιβλίο διευθύνσεων Yahoo!
+Name[en_GB]=Yahoo! Address Book
 Name[es]=Libreta de direcciones de Yahoo!
 Name[et]=Yahoo! aadressiraamat
 Name[fr]=Carnet d'adresses Yahoo!
--- kaddressbook/views/tableview.desktop
+++ kaddressbook/views/tableview.desktop
@@ -12,6 +12,7 @@
 Name[da]=Tabelvisning
 Name[de]=Tabellenansicht
 Name[el]=Προβολή πίνακα
+Name[en_GB]=Table View
 Name[eo]=Tabelrigardo
 Name[es]=Vista de tabla
 Name[et]=Tabelivaade
--- kaddressbook/views/iconview.desktop
+++ kaddressbook/views/iconview.desktop
@@ -12,6 +12,7 @@
 Name[da]=Ikonvisning
 Name[de]=Symbolansicht
 Name[el]=Προβολή εικονιδίων
+Name[en_GB]=Icon View
 Name[eo]=Piktogramrigardo
 Name[es]=Vista de iconos
 Name[et]=Ikoonivaade
--- kaddressbook/views/cardview.desktop
+++ kaddressbook/views/cardview.desktop
@@ -12,6 +12,7 @@
 Name[da]=Kortvisning
 Name[de]=Visitenkarten-Betrachter
 Name[el]=Προβολή καρτών
+Name[en_GB]=Card View
 Name[eo]=Kartrigardo
 Name[es]=Vista de tarjeta
 Name[et]=Kaardivaade
--- kaddressbook/xxport/kde2_xxport.desktop
+++ kaddressbook/xxport/kde2_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB KDE2 XXPort Plugin
 Name[af]=KAB KDE2 XXPort inprop module
 Name[ar]=ملحق KAB KDE2 XXPort
+Name[bg]=KAB KDE2 XXPort Plugin
 Name[br]=Lugent XXPorzh KAB KDE2
 Name[ca]=Connector d'importació/exportació KDE2 per a KAB
 Name[cs]=Exportní modul KDE2
@@ -10,6 +11,7 @@
 Name[da]=KAB KDE2 XXPort-plugin
 Name[de]=KDE2-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής KDE2 του KAB
+Name[en_GB]=KAB KDE2 XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de KDE2
 Name[et]=KAB KDE2 importplugin
 Name[eu]=KAB-en KDE2 in/esportazio plugin-a
@@ -41,6 +43,7 @@
 Name[pt]='Plugin' XXPort para KDE2 do KAB
 Name[pt_BR]=Plug-in do KAB para importação de KDE2
 Name[ru]=Импорт адресной книги KDE2
+Name[sk]=KAB KDE2 XXPort Plugin
 Name[sl]=Vstavek KAB KDE2 XXPort
 Name[sv]=Adressbokens KDE 2-överföringsinsticksprogram
 Name[ta]=KAB KDE2  ஏற்றுமதி சொருகுப்பொருள்
@@ -60,6 +63,7 @@
 Comment[da]=Plugin til at importere den gamle KDE 2 adressebog
 Comment[de]=Modul zum Import von Adressbüchern aus KDE 2
 Comment[el]=Πρόσθετο για εισαγωγή του παλιού βιβλίου διευθύνσεων του KDE 2
+Comment[en_GB]=Plugin to import the old KDE 2 address book
 Comment[es]=Complemento para importar la antigua libreta de direcciones de KDE 2
 Comment[et]=Plugin vana KDE2 aadressiraamatu importimiseks
 Comment[eu]=KDE2-ko helbide-liburu zaharrak inporatzeko plugin-a
--- kaddressbook/xxport/gmx_xxport.desktop
+++ kaddressbook/xxport/gmx_xxport.desktop
@@ -8,6 +8,7 @@
 Name[da]=KAB GMX XXPort-plugin
 Name[de]=GMX-Modul für das Adressbuch
 Name[el]=Πρόσθετο GMX XXPort του KAB
+Name[en_GB]=KAB GMX XXPort Plugin
 Name[es]=Complemento de KAB de exportación e importación de GMX
 Name[et]=KAB GMX eksport/importplugin
 Name[fa]=وصلۀ KAB GMX XXPort
@@ -27,6 +28,7 @@
 Name[nb]=KAB-programtillegg for GMX-eksport
 Name[nds]=KAB-gmx-Im-/Exportmoduul
 Name[ne]=KAB GMX XXPort प्लगइन
+Name[nl]=KAB GMX XXPort Plugin
 Name[nn]=XXPort-programtillegg for KAB GMX 
 Name[pa]=KAB GMX XX-ਪੋਰਟ ਪਲੱਗਇਨ
 Name[pl]=Wtyczka KAB GMX XXPort
@@ -47,6 +49,7 @@
 Comment[da]=Plugin til import og eksport af kontakter i GMX' adressebogsformat
 Comment[de]=Modul für Import/Export von Kontakten im GMX-Adressbuchformat
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή επαφών μορφής GMX
+Comment[en_GB]=Plugin to import and export contacts in GMX's address book format
 Comment[es]=Complemento para importar y exportar contactos en el formato de libreta de direcciones de GMX
 Comment[et]=Plugin kontaktide importimiseks ja eksportimiseks GMX aadressiraamatu vormingus
 Comment[fr]=Module d'import / export de contacts au format GMX
--- kaddressbook/xxport/csv_xxport.desktop
+++ kaddressbook/xxport/csv_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB CSV XXPort Plugin
 Name[af]=KAB CSV XXPort inprop module
 Name[ar]=ملحق KAB CSV XXPort 
+Name[bg]=KAB CSV XXPort Plugin
 Name[br]=Lugent XXPorzh CSV KAB
 Name[ca]=Connector d'importació/exportació CSV per al KAB
 Name[cs]=Exportní modul CSV
@@ -10,12 +11,14 @@
 Name[da]=KAB CSV XXPort-plugin
 Name[de]=CSV-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής/εξαγωγής CSV του KAB
+Name[en_GB]=KAB CSV XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de CSV
 Name[et]=KAB CSV eksport/importplugin
 Name[eu]=KAB-en CSV in/esportazioa plugin-a
 Name[fa]=وصلۀ KAB CSV XXPort
 Name[fi]=KAB CSV -liitännäinen
 Name[fr]=Module d'import / export CSV pour KAB
+Name[fy]=KAB CSV XXPort Plugin
 Name[ga]=Breiseán Iompórtála/Easpórtála CSV le haghaidh KAB
 Name[gl]=Engadido XXPort de CSV para KAB
 Name[he]=תוסף ייבוא/ייצוא של קבצי CSV של KAB
@@ -33,12 +36,14 @@
 Name[nb]=KAB-programtillegg for CSV-eksport
 Name[nds]=CSV-Im-/Exportmoduul för KAdressbook
 Name[ne]=KAB CSV XXPort प्लगइन
+Name[nl]=KAB CSV XXPort Plugin
 Name[nn]=XXPort-programtillegg for KAB CSV
 Name[pa]=KAB CSV XXPort ਪਲੱਗਇਨ
 Name[pl]=Wtyczka KAB do importu/eksportu z/do formatu CSV
 Name[pt]='Plugin' XXPort para CSV do KAB
 Name[pt_BR]=Plug-in do KAB para importação/exportação de CSV
 Name[ru]=Поддержка формата CSV
+Name[sk]=KAB CSV XXPort Plugin
 Name[sl]=Vstavek KAB CSV XXPort
 Name[sv]=Adressbokens CSV-överföringsinsticksprogram
 Name[ta]=KAB CSV ஏற்றுமதி சொருகுப்பொருள்
@@ -58,6 +63,7 @@
 Comment[da]=Plugin til at importere og eksportere kontakter i CSV-format
 Comment[de]=Modul zum Import/Export von Kontakten im CSV-Format
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή των επαφών μορφής CSV
+Comment[en_GB]=Plugin to import and export contacts in CSV format
 Comment[es]=Complemento para importar y exportar contactos en formato CSV
 Comment[et]=Plugin kontaktide importimiseks ja eksportimiseks CSV-vormingus
 Comment[eu]=CSV formatuan kontaktuak esportatu eta inportatzeko plugin-a
--- kaddressbook/xxport/vcard_xxport.desktop
+++ kaddressbook/xxport/vcard_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB vCard XXPort Plugin
 Name[af]=KAB vCard XXPort inprop module
 Name[ar]=ملحق KAB vCard XXPort
+Name[bg]=KAB vCard XXPort Plugin
 Name[br]=Lugent KAB vCard XXPort
 Name[ca]=Connector d'importació/exportació vCard per a KAB
 Name[cs]=Exportní modul vCard
@@ -10,6 +11,7 @@
 Name[da]=KAB vCard XXPort-plugin
 Name[de]=vCard-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής/εξαγωγής vCard του KAB
+Name[en_GB]=KAB vCard XXPort Plugin
 Name[es]=Complemento de KAB para importar y exportar vCard
 Name[et]=KAB vCardi eksport/importplugin
 Name[eu]=KAB-en vCard in/esportazio plugin-a
@@ -61,6 +63,7 @@
 Comment[da]=Plugin til at importere og eksportere kontakter i vCard-format
 Comment[de]=Modul für Import/Export von Kontakten im vCard-Format
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή επαφών μορφής vCard
+Comment[en_GB]=Plugin to import and export contacts in vCard format
 Comment[es]=Complemento para importar y exportar contactos en formato vCard
 Comment[et]=Plugin kontaktide importimiseks ja eksportimiseks vCardi vormingus
 Comment[eu]=vCard formatuko kontaktuak in/esportatzeko plugin-a
--- kaddressbook/xxport/pab_xxport.desktop
+++ kaddressbook/xxport/pab_xxport.desktop
@@ -6,6 +6,7 @@
 Name[da]=KAB MS Exchange personlig adressebog XXPort-plugin
 Name[de]=MS-Exchange-Kontakte-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής MS Exchange προσωπικού βιβλίου διευθύνσεων του KAB
+Name[en_GB]=KAB MS Exchange Personal Address Book XXPort Plugin
 Name[es]=Complemento XXPort de KAB para importar y exportar libretas de direcciones personales de MS Exchange
 Name[et]=KAB MS Exchange personaalse aadressiraamatu import/eksportplugin
 Name[fr]=Module d'import / export de carnet d'adresses personnel MS Exchange pour KAB
@@ -38,6 +39,7 @@
 Comment[da]=Plugin til at importere MS Exchange personlige adressebøger
 Comment[de]=Modul für den Import von persönlichen Adressbüchern aus MS Exchange
 Comment[el]=Πρόσθετο για εισαγωγή προσωπικών βιβλίων διευθύνσεων του MS Exchange
+Comment[en_GB]=Plugin to import MS Exchange Personal Address Books
 Comment[es]=Complemento para importar libretas de direcciones personales de MS Exchange
 Comment[et]=Plugin MS Exchange personaalse aadressiraamatu importimiseks
 Comment[eu]=MS Exchange Personal helbid-liburuak in/esportatzeko plugina-
--- kaddressbook/xxport/opera_xxport.desktop
+++ kaddressbook/xxport/opera_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB Opera XXPort Plugin
 Name[af]=KAB Opera XXPort inprop module
 Name[ar]=ملحق KAB Opera XXPort
+Name[bg]=KAB Opera XXPort Plugin
 Name[br]=Lugent KAB Opera XXPort
 Name[ca]=Connector d'importació/exportació d'Opera per a KAB
 Name[cs]=Exportní modul do Opery
@@ -10,12 +11,14 @@
 Name[da]=KAB Opera XXPort-plugin
 Name[de]=Opera-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής Opera του KAB
+Name[en_GB]=KAB Opera XXPort Plugin
 Name[es]=Complemento de KAB para importar y exportar de Opera
 Name[et]=KAB Opera importplugin
 Name[eu]=KAB-en Opera in/esportazio plugin-a
 Name[fa]=وصلۀ KAB Opera XXPort
 Name[fi]=KAB Opera -liitännäinen
 Name[fr]=Module d'import / export Opera pour KAB
+Name[fy]=KAB Opera XXPort Plugin
 Name[ga]=Breiseán Iompórtála/Easpórtála Opera le haghaidh KAB
 Name[gl]=Engadido XXPort para Opera KAB
 Name[he]=תוסף ייבוא/ייצוא עבור Opera של KAB
@@ -33,6 +36,7 @@
 Name[nb]=KAB-programtillegg for Opera
 Name[nds]=Opera-Importmoduul för KAdressbook
 Name[ne]=KAB ओपेरा XXPort प्लगइन
+Name[nl]=KAB Opera XXPort Plugin
 Name[nn]=XXPort-programtillegg for KAB Opera 
 Name[pa]=KAB Opera XXPort ਪਲੱਗਇਨ
 Name[pl]=Wtyczka KAB do importu z Opery
@@ -59,6 +63,7 @@
 Comment[da]=Plugin til at importere Opera-kontakter
 Comment[de]=Modul zum Import von Opera-Kontakten
 Comment[el]=Πρόσθετο για εισαγωγή επαφών του Opera
+Comment[en_GB]=Plugin to import Opera contacts
 Comment[es]=Complemento para importar contactos de Opera
 Comment[et]=Plugin Opera kontaktide importimiseks
 Comment[eu]=Operaren kontaktuak inportatzeko plugin-a
--- kaddressbook/xxport/gnokii_xxport.desktop
+++ kaddressbook/xxport/gnokii_xxport.desktop
@@ -3,12 +3,14 @@
 Name=KAB Mobile Phone XXPort Plugin
 Name[af]=KAB selfoon XXPort inprop module
 Name[ar]=ملحق الهاتف المحمول KAB XXPort
+Name[bg]=KAB Mobile Phone XXPort Plugin
 Name[ca]=Connector d'importació/exportació de telèfon mòbil per a KAB
 Name[cs]=Exportní modul do mobilního telefonu
 Name[cy]=Ategyn XXPort Ffôn Symudol KAB
 Name[da]=KAB Mobiltelefon XXPort-plugin
 Name[de]=Mobiltelefon-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής/εξαγωγής κινητών τηλεφώνων του KAB
+Name[en_GB]=KAB Mobile Phone XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de teléfonos móviles
 Name[et]=KAB mobiiltelefoni eksport/importplugin
 Name[eu]=KAB-en mugikorren in/esporatazio plugin-a
@@ -56,6 +58,7 @@
 Comment[da]=Mobiltelefon-plugin til import og eksport af adressebogsindgange
 Comment[de]=Mobiltelefon-Modul zum Import/Export von Adressbuch-Einträgen
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή επαφών βιβλίου διευθύνσεων από κινητά τηλέφωνα
+Comment[en_GB]=Mobile phone plugin to import and export address book entries
 Comment[es]=Complemento para importar y exportar contactos de la libreta de direcciones de teléfonos móviles
 Comment[et]=Mobiiltelefoni plugin aadressiraamatu kirjete importimiseks ja eksportimiseks
 Comment[fr]=Module de téléphone portable pour importer et exporter des entrées du carnet d'adresses
--- kaddressbook/xxport/gmx_xxport.cpp
+++ kaddressbook/xxport/gmx_xxport.cpp
@@ -1,10 +1,13 @@
 /*
     This file is part of KAddressbook.
     Copyright (c) 2003 - 2004 Helge Deller <deller@kde.org>
+    Copyright (c) 2009 Laurent Montel <montel@kde.org>
+    Copyright (c) 2009 Urs Joss <tschenturs@gmx.ch>
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,21 +21,67 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
+*/
 
-
+/*
     Description:
+
     This import/export filter reads and writes addressbook entries in the
     gmx format which is natively used by the german freemail provider GMX.
     The big advantage of this format is, that it stores it's information
-    very consistent and makes parsing pretty simple. Furthermore, most
+    very consistently and makes parsing pretty simple. Furthermore, most
     information needed by KABC is available when compared to other formats.
     For further information please visit http://www.gmx.com
+
+    A couple of notes:
+
+    a) Categories
+
+    GMX allows to define categories in the UI and assign one or more categories
+    to each addressee. The gmxa file contains a list of defined categories in
+    the last part of the file, in the section AB_CATEGORIES. The Category_id in
+    this list is a 1-based index. The multi-category assignement of each
+    contact consists of a bitfield which applies one bit per category. E.g.
+    if one contact belongs to category 1 and 3, the bit-field for the category
+    assignment for this addressee is 0101 or decimal 5.
+
+    The export of categories into hte gmxa file works flawlessly and also
+    transfers nicely into the addressee categories. During the import of a
+    gmxa file into GMX, the procedure will correctly manage the category
+    bitfield for each contact. However GMX does *not* process the category
+    list in the end of the file. In other words: If your categories have
+    changed (either in kadderssbook or in GMX) since your
+    previous import, the addressee records may point to the wrong - or even
+    non-existing - categories. After an import it is suggested that you
+    manually verify the category list is still valid. If not, you need to
+    manually delete any categories which alphabetically list beyond your new
+    or deleted category and recreate the remaining categories.
+
+    Only up to 31 different categories over all contacts are exported. Any
+    more categories are ignored.
+
+    b) Address types
+
+    Home address and Work address are relatively straight forwardly handled.
+    The third address type "Other" is factored out of a bunch of different
+    address elements, which have been chosen relatively at random. There is
+    some interpretation which is not completely reversible.
+
+    If you thus export a contact from kaddressbook to GMX
+    and reimport it into kaddressbook, you will not exactly
+    get the same contact as the original one.
+
+    Also other items affect this non-reversability: GMX should receive a nick
+    name in the gmxa file. If there is none defined in kaddressbook,
+    the export will use the formatted name instead. If you reimport
+    such a record, you'll end up with the formatted name in the nickname field.
 */
 
 #include "gmx_xxport.h"
 
 #include <QtCore/QFile>
 #include <QtCore/QMap>
+#include <QtCore/QList>
 #include <QtCore/QTextStream>
 
 #include <kcodecs.h>
@@ -46,7 +95,12 @@
 
 K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( kaddrbk_gmx_xxport, GMXXXPort, "kaddrbk_gmx_xxport" )
 
-#define GMX_FILESELECTION_STRING "*.gmxa|" + i18n( "GMX address book file (*.gmxa)" )
+#define GMX_FILESELECTION_STRING "*.gmxa|" + \
+  i18n( "GMX address book file (*.gmxa)" )
+
+const int typeHome  = 0;
+const int typeWork  = 1;
+const int typeOther = 2;
 
 GMXXXPort::GMXXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
   : KAB::XXPort( ab, parent, name )
@@ -57,32 +111,32 @@
 
 static bool checkDateTime( const QString &dateStr, QDateTime &dt )
 {
-  if (dateStr.isEmpty())
+  if ( dateStr.isEmpty() )
      return false;
-  dt = QDateTime::fromString(dateStr, Qt::ISODate);
-  if (dt.isValid() && dt.date().year()>1901)
+  dt = QDateTime::fromString( dateStr, Qt::ISODate );
+  if ( dt.isValid() && dt.date().year()>1901 )
      return true;
-  dt.setDate(QDate());
+  dt.setDate( QDate() );
   return false;
 }
 
 /* import */
 
-KABC::Addressee::List GMXXXPort::importContacts( const QString& ) const
+KABC::Addressee::List GMXXXPort::importContacts( const QString &data ) const
 {
-  KABC::Addressee::List addrList;
+  KABC::Addressee::List addresseeList;
 
   QString fileName = KFileDialog::getOpenFileName( QDir::homePath(),
-                      GMX_FILESELECTION_STRING, 0 );
+                       GMX_FILESELECTION_STRING, 0 );
   if ( fileName.isEmpty() )
-    return addrList;
+    return addresseeList;
 
   QFile file( fileName );
   if ( !file.open( QIODevice::ReadOnly ) ) {
     QString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>",
                         fileName );
     KMessageBox::error( parentWidget(), msg );
-    return addrList;
+    return addresseeList;
   }
 
   QDateTime dt;
@@ -91,132 +145,204 @@
   QString line, line2;
   line  = gmxStream.readLine();
   line2 = gmxStream.readLine();
-  if (!line.startsWith(QLatin1String("AB_ADDRESSES:")) || !line2.startsWith(QLatin1String("Address_id"))) {
-	KMessageBox::error( parentWidget(), i18n("%1 is not a GMX address book file.", fileName) );
-	return addrList;
+  if ( !line.startsWith( QLatin1String( "AB_ADDRESSES:" ) ) ||
+      !line2.startsWith( QLatin1String( "Address_id"    ) ) ) {
+    KMessageBox::error( parentWidget(),
+      i18n( "%1 is not a GMX address book file.", fileName ) );
+    return addresseeList;
   }
 
-  QStringList strList;
-  typedef QMap<QString, KABC::Addressee *> AddressMap;
-  AddressMap addrMap;
+  QStringList itemList;
+  QMap<QString, QString>  categoriesOfAddressee;
+  typedef QMap<QString, KABC::Addressee *> AddresseeMap;
+  AddresseeMap addresseeMap;
 
-  // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,Status,Address_link_id,Categories"
+  // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,
+  // Change_date,Status,Address_link_id,Categories"
   line = gmxStream.readLine();
-  while (!line.startsWith(QLatin1String("####")) && !gmxStream.atEnd()) {
-    while (1) {
-       strList = line.split('#', QString::KeepEmptyParts );
-       if (strList.count() >= 11)
+  while ( ( line!=QLatin1String( "####" ) ) && !gmxStream.atEnd() ) {
+    // an addressee entry may spread over several lines in the file
+    while ( 1 ) {
+       itemList = line.split( '#', QString::KeepEmptyParts );
+       if ( itemList.count() >= 11 )
            break;
-       line.append('\n');
-       line.append(gmxStream.readLine());
+       line.append( '\n' );
+       line.append( gmxStream.readLine() );
     };
 
-    KABC::Addressee *addr = new KABC::Addressee;
-    addr->setNickName(strList[1]);
-    addr->setGivenName(strList[2]);
-    addr->setFamilyName(strList[3]);
-    addr->setTitle(strList[4]);
-    if (checkDateTime(strList[5],dt)) addr->setBirthday(dt);
-    addr->setNote(strList[6]);
-    if (checkDateTime(strList[7],dt)) addr->setRevision(dt);
-    // addr->setStatus(strList[8]); Status
-    // addr->xxx(strList[9]); Address_link_id
-    // addr->setCategory(strList[10]); Categories
-    addrMap[strList[0]] = addr;
+    // populate the addressee
+    KABC::Addressee *addressee = new KABC::Addressee;
+    addressee->setNickName( itemList[1] );
+    addressee->setGivenName( itemList[2] );
+    addressee->setFamilyName( itemList[3] );
+    addressee->setFormattedName( itemList[3] + ", " + itemList[2] );
+    addressee->setPrefix( itemList[4] );
+    if ( checkDateTime( itemList[5],dt ) ) addressee->setBirthday( dt );
+    addressee->setNote( itemList[6] );
+    if ( checkDateTime( itemList[7],dt ) ) addressee->setRevision( dt );
+    // addressee->setStatus( itemList[8] ); Status
+    // addressee->xxx( itemList[9] ); Address_link_id
+    categoriesOfAddressee[ itemList[0] ] = itemList[10];
+    addresseeMap[ itemList[0] ] = addressee;
 
     line = gmxStream.readLine();
   }
 
   // now read the address records
   line  = gmxStream.readLine();
-  if (!line.startsWith(QLatin1String("AB_ADDRESS_RECORDS:"))) {
-	kWarning() <<"Could not find address records!";
-	return addrList;
+  if ( !line.startsWith( QLatin1String( "AB_ADDRESS_RECORDS:" ) ) ) {
+    kWarning() << "Could not find address records!";
+    return addresseeList;
   }
-  // Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,Mobile_type,Email,
-  // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,Status
+  // Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,
+  // Mobile_type,Email,Homepage,Position,Comments,Record_type_id,Record_type,
+  // Company,Department,Change_date,Preferred,Status
   line = gmxStream.readLine();
   line = gmxStream.readLine();
 
-  while (!line.startsWith(QLatin1String("####")) && !gmxStream.atEnd()) {
-    while (1) {
-       strList = line.split('#', QString::KeepEmptyParts );
-       if (strList.count() >= 21)
+  while ( !line.startsWith( QLatin1String( "####" ) ) && !gmxStream.atEnd() ) {
+    // an address entry may spread over several lines in the file
+    while ( 1 ) {
+       itemList = line.split( '#', QString::KeepEmptyParts );
+       if ( itemList.count() >= 21 )
            break;
-       line.append('\n');
-       line.append(gmxStream.readLine());
+       line.append( '\n' );
+       line.append( gmxStream.readLine() );
     };
 
-    KABC::Addressee *addr = addrMap[strList[0]];
-    if (addr) {
-	for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it )
-		*it = (*it).simplified();
-	// strList[1] = Record_id (numbered item, ignore here)
-	int id = strList[14].toInt(); // Record_type_id (0=work,1=home,2=other)
-  KABC::Address::Type type = (id==0) ? KABC::Address::Work : KABC::Address::Home;
-	if (!strList[19].isEmpty() && strList[19].toInt()!=0)
-		type |= KABC::Address::Pref; // Preferred address (seems to be bitfield for telephone Prefs)
-        KABC::Address adr = addr->address(type);
-	adr.setStreet(strList[2]);
-	adr.setCountry(strList[3]);
-	adr.setPostalCode(strList[4]);
-	adr.setLocality(strList[5]);
-	addr->insertPhoneNumber( KABC::PhoneNumber(strList[6], KABC::PhoneNumber::Home) );
-	addr->insertPhoneNumber( KABC::PhoneNumber(strList[7], KABC::PhoneNumber::Fax) );
-  KABC::PhoneNumber::Type celltype = KABC::PhoneNumber::Cell;
-	// strList[9]=Mobile_type // always 0 or -1(default phone).
-	if (strList[9].toInt()) celltype |= KABC::PhoneNumber::Pref;
-	addr->insertPhoneNumber( KABC::PhoneNumber(strList[8], celltype) );
-	addr->insertEmail(strList[10]);
-	if (!strList[11].isEmpty()) addr->setUrl(strList[11]);
-	if (!strList[12].isEmpty()) addr->setRole(strList[12]);
-	// strList[13]=Comments
-	// strList[14]=Record_type_id (0,1,2) - see above
-	// strList[15]=Record_type (name of this additional record entry)
-	if (!strList[16].isEmpty()) addr->setOrganization(strList[16]); // Company
-	if (!strList[17].isEmpty()) addr->insertCustom(
-			"KADDRESSBOOK", "X-Department", strList[17]); // Department
-        if (checkDateTime(strList[18],dt)) addr->setRevision(dt); // Change_date
-	// strList[19]=Preferred (see above)
-	// strList[20]=Status (should always be "1")
-	addr->insertAddress(adr);
+    KABC::Addressee *addressee = addresseeMap[ itemList[0] ];
+    if ( addressee ) {
+      // itemList[1] = Record_id (numbered item, ignore here)
+      int recordTypeId = itemList[14].toInt();
+      KABC::Address::Type addressType;
+      KABC::PhoneNumber::Type phoneType;
+      switch ( recordTypeId ) {
+        case typeHome:
+          addressType = KABC::Address::Home;
+          phoneType = KABC::PhoneNumber::Home;
+          break;
+        case typeWork:
+          addressType = KABC::Address::Work;
+          phoneType = KABC::PhoneNumber::Work;
+          break;
+        case typeOther:
+        default:
+          addressType = KABC::Address::Intl;
+          phoneType = KABC::PhoneNumber::Voice;
+          break;
+      }
+      KABC::Address address = addressee->address( addressType );
+      address.setStreet(     itemList[2] );
+      address.setCountry(    itemList[3] );
+      address.setPostalCode( itemList[4] );
+      address.setLocality(   itemList[5] );
+      if ( !itemList[6].isEmpty() ) {
+        addressee->insertPhoneNumber(
+          KABC::PhoneNumber( itemList[6], phoneType ) );
+      }
+      if ( !itemList[7].isEmpty() )
+        addressee->insertPhoneNumber(
+          KABC::PhoneNumber( itemList[7], KABC::PhoneNumber::Fax ) );
+      KABC::PhoneNumber::Type cellType = KABC::PhoneNumber::Cell;
+      // itemList[9]=Mobile_type // always 0 or -1(default phone).
+      // if ( itemList[19].toInt() & 4 ) cellType |= KABC::PhoneNumber::Pref;
+      // don't do the above to avoid duplicate mobile numbers
+      if ( !itemList[8].isEmpty() )
+        addressee->insertPhoneNumber(
+          KABC::PhoneNumber( itemList[8], cellType ) );
+      bool preferred = false;
+      if ( itemList[19].toInt() & 1 )
+        preferred = true;
+      addressee->insertEmail( itemList[10], preferred );
+      if ( !itemList[11].isEmpty() )
+        addressee->setUrl( itemList[11] );
+      if ( !itemList[12].isEmpty() )
+        addressee->setRole( itemList[12] );
+      // itemList[13]=Comments
+      // itemList[14]=Record_type_id (0,1,2) - see above
+      // itemList[15]=Record_type (name of this additional record entry)
+      if ( !itemList[16].isEmpty() )
+        addressee->setOrganization( itemList[16] ); // Company
+      if ( !itemList[17].isEmpty() ) addressee->insertCustom(
+        "KADDRESSBOOK", "X-Department", itemList[17] ); // Department
+      if ( checkDateTime( itemList[18],dt ) )
+        addressee->setRevision( dt ); // Change_date
+      // itemList[19]=Preferred (see above)
+      // itemList[20]=Status (should always be "1")
+      addressee->insertAddress( address );
     } else {
-	kWarning() <<"unresolved line:" << line;
+      kWarning() << "unresolved line:" << line;
     }
-
     line = gmxStream.readLine();
   }
 
-  // now add the addresses to to addrList
-  for ( AddressMap::Iterator it = addrMap.begin(); it != addrMap.end(); ++it ) {
-     KABC::Addressee *addr = it.value();
-     addrList.append(*addr);
-     delete addr;
+  // extract the categories from the list of addressees of the file to import
+  QStringList usedCategoryList;
+  line = gmxStream.readLine();
+  line2 = gmxStream.readLine();
+  if ( !line.startsWith( QLatin1String( "AB_CATEGORIES:" ) ) ||
+    !line2.startsWith( QLatin1String( "Category_id" ) ) ) {
+    kWarning() << "Could not find category records!";
+  } else {
+    while ( !line.startsWith( QLatin1String( "####" ) ) &&
+            !gmxStream.atEnd() ) {
+      // a category should not spread over multiple lines, but just in case
+      while ( 1 ) {
+        itemList = line.split( '#', QString::KeepEmptyParts );
+        if ( itemList.count() >= 3 )
+          break;
+        line.append( '\n' );
+        line.append( gmxStream.readLine() );
+      };
+      usedCategoryList.append( itemList[1] );
+      line = gmxStream.readLine();
+    };
+  }
+
+  // now add the addresses to addresseeList
+  for ( AddresseeMap::Iterator addresseeIt = addresseeMap.begin();
+    addresseeIt != addresseeMap.end(); ++addresseeIt ) {
+    KABC::Addressee *addressee = addresseeIt.value();
+    // Add categories
+    // catgories is a bitfield with max 31 defined categories
+    int categories = categoriesOfAddressee[ addresseeIt.key() ].toInt();
+    for ( int i=32; i >= 0; --i ) {
+      // convert category index to bitfield value for comparison
+      int catBit =  1<<i;
+      if ( catBit > categories ) continue; // current index unassigned
+      if ( catBit & categories  && usedCategoryList.count() > i )
+        addressee->insertCategory( usedCategoryList[i] );
+    }
+    addresseeList.append( *addressee );
+    delete addressee;
   }
 
   file.close();
-  return addrList;
+  return addresseeList;
 }
 
 
 /* export */
 
-bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString& )
+bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
-  KUrl url = KFileDialog::getSaveUrl( KUrl( QDir::homePath() + "/addressbook.gmx" ),
-			GMX_FILESELECTION_STRING );
+  KUrl url = KFileDialog::getSaveUrl(
+    KUrl( QDir::homePath() + "/addressbook.gmx" ), GMX_FILESELECTION_STRING );
   if ( url.isEmpty() )
       return true;
 
-  if( QFileInfo( url.isLocalFile() ? url.toLocalFile() : url.path() ).exists() ) {
-      if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"", url.isLocalFile() ? url.toLocalFile() : url.path()) ) == KMessageBox::No)
-        return false;
+  if( QFileInfo( url.isLocalFile() ?
+    url.toLocalFile() : url.path() ).exists() ) {
+    if( KMessageBox::questionYesNo( parentWidget(),
+      i18n( "Do you want to overwrite file \"%1\"",
+      url.isLocalFile() ? url.toLocalFile() : url.path() ) )==KMessageBox::No )
+      return false;
   }
 
   if ( !url.isLocalFile() ) {
     KTemporaryFile tmpFile;
     if ( !tmpFile.open() ) {
-      QString txt = i18n("<qt>Unable to open file <b>%1</b></qt>", url.url());
+      QString txt = i18n( "<qt>Unable to open file <b>%1</b></qt>", url.url() );
       KMessageBox::error( parentWidget(), txt );
       return false;
     }
@@ -226,12 +352,12 @@
 
     return KIO::NetAccess::upload( tmpFile.fileName(), url, parentWidget() );
   } else {
-    QString filename = url.toLocalFile();
-    QFile file( filename );
+    QString fileName = url.toLocalFile();
+    QFile file( fileName );
 
     if ( !file.open( QIODevice::WriteOnly ) ) {
       QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>",
-                          filename );
+                          fileName );
       KMessageBox::error( parentWidget(), txt );
       return false;
     }
@@ -245,46 +371,89 @@
 
 static const QString dateString( const QDateTime &dt )
 {
-  if (!dt.isValid())
-	return QString::fromLatin1("1000-01-01 00:00:00");
-  QString d(dt.toString(Qt::ISODate));
+  if ( !dt.isValid() )
+    return QString::fromLatin1( "1000-01-01 00:00:00" );
+  QString d( dt.toString( Qt::ISODate ) );
   d[10] = ' '; // remove the "T" in the middle of the string
   return d;
 }
 
+static const QStringList assignedCategoriesSorted(
+  const KABC::AddresseeList &list )
+{
+  // Walk through the addressees and return a unique list of up to 31
+  // categories, alphabetically sorted
+  QStringList categoryList;
+  const KABC::Addressee *addressee;
+  for ( KABC::AddresseeList::ConstIterator addresseeIt = list.begin();
+    addresseeIt != list.end() && categoryList.count() < 32; ++addresseeIt ) {
+    addressee = &( *addresseeIt );
+    if ( addressee->isEmpty() ) continue;
+    const QStringList categories = addressee->categories();
+    for ( int i=0; i < categories.count() && categoryList.count() < 32; ++i ) {
+      if ( !categoryList.contains( categories[i]) )
+        categoryList.append( categories[i] );
+    }
+  }
+  categoryList.sort();
+  return categoryList;
+}
+
 void GMXXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
 {
-  if (!fp || !list.count())
+  if ( !fp || !list.count() )
     return;
 
   QTextStream t( fp );
   t.setCodec( "ISO 8859-1" );
 
-  KABC::AddresseeList::ConstIterator it;
-  typedef QMap<int, const KABC::Addressee *> AddressMap;
-  AddressMap addrMap;
-  const KABC::Addressee *addr;
+  typedef QMap<int, const KABC::Addressee *> AddresseeMap;
+  AddresseeMap addresseeMap;
+  const KABC::Addressee *addressee;
 
   t << "AB_ADDRESSES:\n";
   t << "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,"
        "Change_date,Status,Address_link_id,Categories\n";
 
-  int no = 0;
-  const QChar DELIM('#');
-  for ( it = list.begin(); it != list.end(); ++it ) {
-     addr = &(*it);
-     if (addr->isEmpty())
-        continue;
-     addrMap[++no] = addr;
-     t << no << DELIM			// Address_id
-	<< addr->nickName() << DELIM	// Nickname
-	<< addr->givenName() << DELIM	// Firstname
-	<< addr->familyName() << DELIM	// Lastname
-	<< addr->title() << DELIM	// Title
-	<< dateString(addr->birthday()) << DELIM   // Birthday
-	<< addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments
-	<< dateString(addr->revision()) << DELIM   // Change_date
-	<< "1##0\n";			// Status, Address_link_id, Categories
+  QList<QString> categoryMap;
+  categoryMap.append( assignedCategoriesSorted( list ) );
+
+  int addresseeId = 0;
+  const QChar DELIM( '#' );
+  for ( KABC::AddresseeList::ConstIterator it = list.begin();
+    it != list.end(); ++it ) {
+    addressee = &(*it);
+    if ( addressee->isEmpty() )
+       continue;
+    addresseeMap[ ++addresseeId ] = addressee;
+
+    // Assign categories as bitfield
+    const QStringList categories = addressee->categories();
+    long int category = 0;
+    if ( categories.count() > 0 ) {
+      for ( int i=0; i < categories.count(); i++ ) {
+        if ( categoryMap.contains( categories[i] ) )
+          category |= 1 << categoryMap.indexOf( categories[i], 0 ) ;
+      }
+    }
+
+    // GMX sorts by nickname by default - don't leave empty
+    QString nickName = addressee->nickName();
+    if ( nickName.isEmpty() )
+      nickName = addressee->formattedName();
+
+    t << addresseeId << DELIM             // Address_id
+      << nickName << DELIM                // Nickname
+      << addressee->givenName() << DELIM  // Firstname
+      << addressee->familyName() << DELIM // Lastname
+      << addressee->prefix() << DELIM     // Title - Note: ->title()
+                                          // refers to the professional title
+      << dateString( addressee->birthday() ) << DELIM   // Birthday
+      << addressee->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments
+      << dateString( addressee->revision() ) << DELIM   // Change_date
+      << "1" << DELIM                     // Status
+      << DELIM                            // Address_link_id
+      << category << endl;                // Categories
   }
 
   t << "####\n";
@@ -293,57 +462,139 @@
        "Mobile_type,Email,Homepage,Position,Comments,Record_type_id,Record_type,"
        "Company,Department,Change_date,Preferred,Status\n";
 
-  no = 1;
-  while ( (addr = addrMap[no]) != NULL ) {
-    for (int record_id=0; record_id<3; ++record_id) {
-
-	KABC::Address address;
-  	KABC::PhoneNumber phone, fax, cell;
-
-	/* record ID == 1: Work address */
-        if (record_id == 1) {
-		address = addr->address(KABC::Address::Work);
-		phone = addr->phoneNumber(KABC::PhoneNumber::Work);
-		fax   = addr->phoneNumber(KABC::PhoneNumber::Fax);
-		cell  = addr->phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell);
-	} else {
-		address = addr->address(KABC::Address::Home);
-		phone = addr->phoneNumber(KABC::PhoneNumber::Home);
-		cell  = addr->phoneNumber(KABC::PhoneNumber::Cell);
-	}
-
-	const QStringList emails = addr->emails();
-	QString email;
-	if (emails.count()>record_id) email = emails[record_id];
-
-	t << no << DELIM			// Address_id
-	  << record_id << DELIM			// Record_id
-	  << address.street() << DELIM		// Street
-	  << address.country() << DELIM 	// Country
-	  << address.postalCode() << DELIM	// Zipcode
-	  << address.locality() << DELIM	// City
-	  << phone.number() << DELIM		// Phone
-	  << fax.number() << DELIM		// Fax
-	  << cell.number() << DELIM		// Mobile
-	  << ((cell.type()&KABC::PhoneNumber::Pref)?-1:0) << DELIM // Mobile_type
-	  << email << DELIM			// Email
-	  << ((record_id==1)?addr->url().url():QString()) << DELIM // Homepage
-	  << ((record_id==1)?addr->role():QString()) << DELIM	// Position
-	  << DELIM				// Comments
-	  << record_id << DELIM			// Record_type_id (0,1,2) - see above
-	  << DELIM				// Record_type (name of this additional record entry)
-	  << ((record_id==1)?addr->organization():QString()) << DELIM // Company
-	  << ((record_id==1)?addr->custom("KADDRESSBOOK", "X-Department"):QString()) << DELIM // Department
-	  << dateString(addr->revision()) << DELIM	// Change_date
-	  << 5 << DELIM				// Preferred
-	  << 1 << endl;				// Status (should always be "1")
+  addresseeId = 1;
+  while ( ( addressee = addresseeMap[ addresseeId ] ) != NULL ) {
+
+    const KABC::PhoneNumber::List cellPhones =
+      addressee->phoneNumbers( KABC::PhoneNumber::Cell );
+
+    const QStringList emails = addressee->emails();
+
+    for ( int recId=0; recId<3; ++recId ) {
+      KABC::Address address;
+      KABC::PhoneNumber phone, fax, cell;
+
+      // address preference flag:
+      // & 1: preferred email address
+      // & 4: preferred cell phone
+      int prefFlag=0;
+
+      switch ( recId ) {
+      // Assign address, phone and cellphone, fax if applicable
+        case typeHome:
+          address = addressee->address( KABC::Address::Home );
+          phone   = addressee->phoneNumber( KABC::PhoneNumber::Home );
+          if ( cellPhones.count() > 0 ) {
+            cell  = cellPhones.at( 0 );
+            if ( !cell.isEmpty() )
+              prefFlag |= 4;
+          }
+          break;
+        case typeWork:
+          address = addressee->address( KABC::Address::Work );
+          phone   = addressee->phoneNumber( KABC::PhoneNumber::Work );
+          if ( cellPhones.count() >= 2 )
+            cell  = cellPhones.at( 1 );
+          fax     = addressee->phoneNumber( KABC::PhoneNumber::Fax );
+          break;
+        case typeOther:
+        default:
+          if ( addressee->addresses( KABC::Address::Home ).count() > 1 )
+            address = addressee->addresses( KABC::Address::Home ).at( 1 );
+          if ( ( address.isEmpty() ) &&
+               ( addressee->addresses( KABC::Address::Work ).count() > 1 ) )
+            address = addressee->addresses( KABC::Address::Work ).at( 1 );
+          if ( address.isEmpty() )
+            address = addressee->address( KABC::Address::Dom );
+          if ( address.isEmpty() )
+            address = addressee->address( KABC::Address::Intl );
+          if ( address.isEmpty() )
+            address = addressee->address( KABC::Address::Postal );
+          if ( address.isEmpty() )
+            address = addressee->address( KABC::Address::Parcel );
+
+          if ( addressee->phoneNumbers( KABC::PhoneNumber::Home ).count() > 1 )
+            phone = addressee->phoneNumbers( KABC::PhoneNumber::Home ).at( 1 );
+          if ( ( phone.isEmpty() ) && ( addressee->phoneNumbers(
+            KABC::PhoneNumber::Work ).count() > 1 ) )
+            phone = addressee->phoneNumbers( KABC::PhoneNumber::Work ).at( 1 );
+          if ( phone.isEmpty() )
+            phone = addressee->phoneNumber( KABC::PhoneNumber::Voice );
+          if ( phone.isEmpty() )
+            phone = addressee->phoneNumber( KABC::PhoneNumber::Msg );
+          if ( phone.isEmpty() )
+            phone = addressee->phoneNumber( KABC::PhoneNumber::Isdn );
+          if ( phone.isEmpty() )
+            phone = addressee->phoneNumber( KABC::PhoneNumber::Car );
+          if ( phone.isEmpty() )
+            phone = addressee->phoneNumber( KABC::PhoneNumber::Pager );
+
+          switch ( cellPhones.count() ) {
+            case 0: break;
+            case 1:
+            case 2:
+              if ( !address.isEmpty() )
+                cell = cellPhones.at( 0 );
+              break;
+            default:
+              cell = cellPhones.at( 2 );
+              break;
+          }
+          break;
+      }
+
+      QString email="";
+      if ( emails.count()>recId ) {
+        email = emails[ recId ];
+        if ( email == addressee->preferredEmail() ) prefFlag |= 1;
+      }
+
+      if ( !address.isEmpty() || !phone.isEmpty() ||
+           !cell.isEmpty()    || !email.isEmpty() ) {
+        t << addresseeId << DELIM             // Address_id
+          << recId << DELIM                   // Record_id
+          << address.street() << DELIM        // Street
+          << address.country() << DELIM       // Country
+          << address.postalCode() << DELIM    // Zipcode
+          << address.locality() << DELIM      // City
+          << phone.number() << DELIM          // Phone
+          << fax.number() << DELIM            // Fax
+          << cell.number() << DELIM           // Mobile
+          << ((recId==typeWork)?0:1) << DELIM // Mobile_type
+          << email << DELIM                   // Email
+          << ((recId==typeWork)?addressee->url().url():QString()) << DELIM
+                                              // Homepage
+          << ((recId==typeWork)?addressee->role():QString()) << DELIM
+                                              // Position
+          << ((recId==typeHome)?addressee->custom(
+             "KADDRESSBOOK", "X-SpousesName" ):QString() ) << DELIM // Comments
+          << recId << DELIM                   // Record_type_id (0,1,2)
+          << DELIM                            // Record_type
+          << ((recId==typeWork)?addressee->organization():QString()) << DELIM
+                                              // Company
+          << ((recId==typeWork)?addressee->custom(
+             "KADDRESSBOOK", "X-Department" ):QString() )<< DELIM // Department
+          << dateString( addressee->revision() ) << DELIM // Change_date
+          << prefFlag << DELIM                // Preferred:
+                                              // ( & 1: preferred email,
+                                              //   & 4: preferred cell phone )
+          << 1 << endl;                       // Status (should always be "1")
+      }
     }
 
-    ++no;
+    ++addresseeId;
   };
 
-  t << "####";
+  t << "####" << endl;
+  t << "AB_CATEGORIES:" << endl;
+  t << "Category_id,Name,Icon_id" << endl;
+
+  //  Write Category List (beware: Category_ID 0 is reserved for none
+  //  Interestingly: The index here is an int sequence and does not
+  //  correspond to the bit reference used above.
+  for ( int i = 0; i < categoryMap.size(); i++ ) {
+    t << ( i + 1 ) << DELIM << categoryMap.at( i ) << DELIM << 0 << endl;
+  }
+  t << "####" << endl;
 }
 
-#include "gmx_xxport.moc"
-
--- kaddressbook/xxport/bookmark_xxport.desktop
+++ kaddressbook/xxport/bookmark_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB Bookmark XXPort Plugin
 Name[af]=KAB boekmerk XXPort inprop module
 Name[ar]=ملحق XXPort لعلامات KAB
+Name[bg]=KAB Bookmark XXPort Plugin
 Name[br]=Lugent XXPorzh sined KAB
 Name[ca]=Connector d'importació/exportació de punts per al KAB
 Name[cs]=Exportní modul záložek
@@ -10,6 +11,7 @@
 Name[da]=KAB Bogmærke XXPort-plugin
 Name[de]=Lesezeichen-Modul für das Adressbuch
 Name[el]=Πρόσθετο εξαγωγής σελιδοδεικτών του KAB
+Name[en_GB]=KAB Bookmark XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de marcadores
 Name[et]=KAB järjehoidjate eksportplugin
 Name[eu]=KAB-en laster-marka in/esportazio plugin-a
@@ -59,6 +61,7 @@
 Comment[da]=Plugin til at eksporte netadresser for kontakter som bogmærker
 Comment[de]=Modul zum Export von Web-Adressen der Kontakte als Lesezeichen
 Comment[el]=Πρόσθετο για εξαγωγή των διευθύνσεων ιστοσελίδων των επαφών σαν σελιδοδείκτες
+Comment[en_GB]=Plugin to export the web addresses of the contacts as bookmarks
 Comment[es]=Complemento para exportar las direcciones web de los contactos como marcadores
 Comment[et]=Plugin kontaktide veebiaadresside eksportimiseks järjehoidjatena
 Comment[eu]=Kontaktuen web-helbideak laster-markak bezala esportatzeko plugin-a
--- kaddressbook/xxport/ldif_xxport.desktop
+++ kaddressbook/xxport/ldif_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB LDIF XXPort Plugin
 Name[af]=KAB LDIF XXPort inprop module
 Name[ar]=ملحق KAB LDIF XXPort
+Name[bg]=KAB LDIF XXPort Plugin
 Name[br]=Lugent XXPorzh KAB LDIF
 Name[ca]=Connector per importació/exportació de LDIF per a KAB
 Name[cs]=Exportní modul LDIF
@@ -10,6 +11,7 @@
 Name[da]=KAB LDIF XXPort-plugin
 Name[de]=LDIF-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής/εξαγωγής LDIF του KAB
+Name[en_GB]=KAB LDIF XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de LDIF
 Name[et]=KAB LDIF eksport/importplugin
 Name[eu]=KAB-en LDIF in/esportazio plugin-a
@@ -61,6 +63,7 @@
 Comment[da]=Plugin til at importere og eksportere kontakter i Netscape og Mozilla LDIF-format
 Comment[de]=Modul zum Import/Export von Kontakten im LDIF-Format aus Netscape und Mozilla
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή επαφών μορφής LDIF του Netscape και Mozilla
+Comment[en_GB]=Plugin to import and export contacts in Netscape and Mozilla LDIF format
 Comment[es]=Complemento para importar y exportar contactos en el formato LDIF de Netscape y Mozilla
 Comment[et]=Plugin kontaktide importimiseks ja ekportimiseks Netscape ja Mozilla LDIF-vormingus
 Comment[eu]=Netscape eta Mozilla-ren LDIF formatuan kontaktuak in/esportatzeko plugin-a
--- kaddressbook/xxport/eudora_xxport.desktop
+++ kaddressbook/xxport/eudora_xxport.desktop
@@ -3,6 +3,7 @@
 Name=KAB Eudora XXPort Plugin
 Name[af]=KAB Eudora XXPort inprop module
 Name[ar]=ملحق KAB Eudora XXPort
+Name[bg]=KAB Eudora XXPort Plugin
 Name[br]=Lugent XXPorzh Eudora KAB
 Name[ca]=Connector d'importació/exportació Eudora per al KAB
 Name[cs]=Exportní modul do Eudory
@@ -10,12 +11,14 @@
 Name[da]=KAB Eudora XXPort-plugin
 Name[de]=Eudora-Modul für das Adressbuch
 Name[el]=Πρόσθετο εισαγωγής/εξαγωγής Eudora του KAB
+Name[en_GB]=KAB Eudora XXPort Plugin
 Name[es]=Complemento de KAB de importación y exportación de Eudora
 Name[et]=KAB Eudora eksport/importplugin
 Name[eu]=KAB-en Eudora in/esportazio plugin-a
 Name[fa]=وصلۀ KAB Eudora XXPort
 Name[fi]=KAB Euroda -liitännäinen
 Name[fr]=Module d'import / export Eudora pour KAB
+Name[fy]=KAB Eudora XXPort Plugin
 Name[ga]=Breiseán Iompórtála/Easpórtála Eudora le haghaidh KAB
 Name[gl]=Engadido XXPort de Eudora para KA
 Name[he]=תוסף ייבוא/ייצוא עבור Eurdora של KAB
@@ -33,6 +36,7 @@
 Name[nb]=KAB-programtillegg for Eudora-eksport
 Name[nds]=Eudora-Im-/Exportmoduul för KAdressbook
 Name[ne]=KAB यूडोरा XXPort प्लगइन
+Name[nl]=KAB Eudora XXPort Plugin
 Name[nn]=XXPort-programtillegg for KAB Eudora
 Name[pl]=Wtyczka KAB do importu/eksportu wizytówek Eudory
 Name[pt]='Plugin' XXPort para Eudora do KAB
@@ -58,6 +62,7 @@
 Comment[da]=Plugin til at importere og eksportere Eudora-kontakter
 Comment[de]=Modul zum Import/Export von Eudora-Kontakten
 Comment[el]=Πρόσθετο για εισαγωγή και εξαγωγή επαφών του Eudora
+Comment[en_GB]=Plugin to import and export Eudora contacts
 Comment[es]=Complemento para importar y exportar contactos de Eudora
 Comment[et]=Plugin Eudora kontaktide importimiseks ja eksportimiseks
 Comment[eu]=Eudora kontaktuak inportatu/esportatzeko plugin-a
--- kaddressbook/editors/protocols/jabberprotocol.desktop
+++ kaddressbook/editors/protocols/jabberprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=Jabber Protokol
 Comment[de]=Jabber-Protokoll
 Comment[el]=Πρωτόκολλο Jabber
+Comment[en_GB]=Jabber Protocol
 Comment[eo]=Jabber Protokolo
 Comment[es]=Protocolo Jabber
 Comment[et]=Jabberi protokoll
@@ -61,8 +62,62 @@
 Comment[zh_CN]=Jabber 协议
 Comment[zh_TW]=Jabber 協定
 Name=Jabber
+Name[af]=Jabber
+Name[ar]=Jabber
+Name[be]=Jabber
+Name[bg]=Jabber
+Name[br]=Jabber
+Name[ca]=Jabber
+Name[cs]=Jabber
+Name[cy]=Jabber
+Name[da]=Jabber
+Name[de]=Jabber
+Name[el]=Jabber
+Name[en_GB]=Jabber
+Name[eo]=Jabber
+Name[es]=Jabber
+Name[et]=Jabber
+Name[eu]=Jabber
+Name[fi]=Jabber
+Name[fr]=Jabber
+Name[fy]=Jabber
+Name[ga]=Jabber
+Name[gl]=Jabber
+Name[he]=Jabber
+Name[hu]=Jabber
+Name[is]=Jabber
+Name[it]=Jabber
+Name[ja]=Jabber
+Name[ka]=Jabber
+Name[kk]=Jabber
+Name[km]=Jabber
+Name[ko]=Jabber
+Name[lt]=Jabber
+Name[lv]=Jabber
+Name[ms]=Jabber
+Name[nb]=Jabber
+Name[nds]=Jabber
 Name[ne]=ज्याबर
+Name[nl]=Jabber
+Name[nn]=Jabber
+Name[oc]=Jabber
 Name[pa]=ਜੱਬਰ
+Name[pl]=Jabber
+Name[pt]=Jabber
+Name[pt_BR]=Jabber
+Name[ro]=Jabber
+Name[ru]=Jabber
+Name[se]=Jabber
+Name[sk]=Jabber
+Name[sl]=Jabber
+Name[sv]=Jabber
 Name[ta]=ஜாபர்
+Name[tg]=Jabber
+Name[tr]=Jabber
+Name[uk]=Jabber
+Name[uz]=Jabber
+Name[uz@cyrillic]=Jabber
 Name[x-test]=xxJabberxx
+Name[zh_CN]=Jabber
+Name[zh_TW]=Jabber
 
--- kaddressbook/editors/protocols/aimprotocol.desktop
+++ kaddressbook/editors/protocols/aimprotocol.desktop
@@ -13,6 +13,7 @@
 Comment[da]=AIM Protokol
 Comment[de]=AIM-Protokoll
 Comment[el]=Πρωτόκολλο AIM
+Comment[en_GB]=AIM Protocol
 Comment[eo]=AIM-Protokolo
 Comment[es]=Protocolo AIM
 Comment[et]=AIM protokoll
@@ -60,6 +61,62 @@
 Comment[zh_CN]=AIM 协议
 Comment[zh_TW]=AIM 協定
 Name=AIM
+Name[af]=AIM
+Name[ar]=AIM
+Name[be]=AIM
+Name[bg]=AIM
+Name[br]=AIM
+Name[ca]=AIM
+Name[cs]=AIM
+Name[cy]=AIM
+Name[da]=AIM
+Name[de]=AIM
+Name[el]=AIM
+Name[en_GB]=AIM
+Name[eo]=AIM
+Name[es]=AIM
+Name[et]=AIM
+Name[eu]=AIM
+Name[fi]=AIM
+Name[fr]=AIM
+Name[fy]=AIM
+Name[ga]=AIM
+Name[gl]=AIM
+Name[he]=AIM
+Name[hu]=AIM
+Name[is]=AIM
+Name[it]=AIM
+Name[ja]=AIM
+Name[ka]=AIM
+Name[kk]=AIM
+Name[km]=AIM
+Name[ko]=AIM
+Name[lt]=AIM
+Name[lv]=AIM
+Name[ms]=AIM
+Name[nb]=AIM
+Name[nds]=AIM
 Name[ne]=एआईएम
+Name[nl]=AIM
+Name[nn]=AIM
+Name[oc]=AIM
+Name[pa]=AIM
+Name[pl]=AIM
+Name[pt]=AIM
+Name[pt_BR]=AIM
+Name[ro]=AIM
+Name[ru]=AIM
+Name[se]=AIM
+Name[sk]=AIM
+Name[sl]=AIM
+Name[sv]=AIM
+Name[ta]=AIM
+Name[tg]=AIM
+Name[tr]=AIM
+Name[uk]=AIM
+Name[uz]=AIM
+Name[uz@cyrillic]=AIM
 Name[x-test]=xxAIMxx
+Name[zh_CN]=AIM
+Name[zh_TW]=AIM
 
--- kaddressbook/editors/protocols/meanwhileprotocol.desktop
+++ kaddressbook/editors/protocols/meanwhileprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=Meanwhile Protokol
 Comment[de]=Meanwhile-Protokoll
 Comment[el]=Πρωτόκολλο Meanwhile
+Comment[en_GB]=Meanwhile Protocol
 Comment[eo]=Meanwhile Protokolo
 Comment[es]=Protocolo Meanwhile
 Comment[et]=Meanwhile'i protokoll
@@ -59,8 +60,57 @@
 Comment[zh_CN]=Meanwhile 协议
 Comment[zh_TW]=Meanwhile 協定
 Name=Meanwhile
+Name[af]=Meanwhile
+Name[ar]=Meanwhile
+Name[be]=Meanwhile
+Name[bg]=Meanwhile
+Name[br]=Meanwhile
+Name[ca]=Meanwhile
+Name[cs]=Meanwhile
+Name[da]=Meanwhile
+Name[de]=Meanwhile
+Name[el]=Meanwhile
+Name[en_GB]=Meanwhile
+Name[eo]=Meanwhile
+Name[es]=Meanwhile
+Name[et]=Meanwhile
+Name[eu]=Meanwhile
 Name[fa]=در ضمن
+Name[fi]=Meanwhile
+Name[fr]=Meanwhile
+Name[fy]=Meanwhile
+Name[ga]=Meanwhile
+Name[gl]=Meanwhile
+Name[he]=Meanwhile
+Name[hu]=Meanwhile
+Name[is]=Meanwhile
+Name[it]=Meanwhile
+Name[ja]=Meanwhile
+Name[ka]=Meanwhile
+Name[kk]=Meanwhile
+Name[km]=Meanwhile
+Name[ko]=Meanwhile
+Name[lt]=Meanwhile
+Name[lv]=Meanwhile
+Name[ms]=Meanwhile
+Name[nb]=Meanwhile
+Name[nds]=Meanwhile
 Name[ne]=त्यस समयको
+Name[nl]=Meanwhile
+Name[nn]=Meanwhile
 Name[pa]=ਮੀਨਵਾਈਲ
+Name[pl]=Meanwhile
+Name[pt]=Meanwhile
+Name[pt_BR]=Meanwhile
+Name[ro]=Meanwhile
+Name[ru]=Meanwhile
+Name[sk]=Meanwhile
+Name[sl]=Meanwhile
+Name[sv]=Meanwhile
+Name[ta]=Meanwhile
+Name[tr]=Meanwhile
+Name[uk]=Meanwhile
 Name[x-test]=xxMeanwhilexx
+Name[zh_CN]=Meanwhile
+Name[zh_TW]=Meanwhile
 
--- kaddressbook/editors/protocols/skypeprotocol.desktop
+++ kaddressbook/editors/protocols/skypeprotocol.desktop
@@ -11,6 +11,8 @@
 Comment[cs]=Internetová telefonie Skype
 Comment[da]=Skype internettelefoni
 Comment[de]=Internet-Telefonie mit Skype
+Comment[el]=Skype Internet Telephony
+Comment[en_GB]=Skype Internet Telephony
 Comment[eo]=Skype Interreta Telefonado
 Comment[es]=Telefonía por Internet con Skype
 Comment[et]=Internetitelefon Skype
@@ -53,7 +55,55 @@
 Comment[zh_CN]=Skype 网络电话
 Comment[zh_TW]=Skype 網路電話
 Name=Skype
+Name[af]=Skype
+Name[ar]=Skype
+Name[be]=Skype
+Name[bg]=Skype
+Name[br]=Skype
+Name[ca]=Skype
+Name[cs]=Skype
+Name[cy]=Skype
+Name[da]=Skype
+Name[de]=Skype
+Name[el]=Skype
+Name[en_GB]=Skype
 Name[eo]=kype
+Name[es]=Skype
+Name[et]=Skype
+Name[eu]=Skype
+Name[fi]=Skype
+Name[fr]=Skype
+Name[fy]=Skype
+Name[ga]=Skype
+Name[gl]=Skype
+Name[he]=Skype
+Name[hu]=Skype
+Name[is]=Skype
+Name[it]=Skype
+Name[ja]=Skype
+Name[ka]=Skype
+Name[kk]=Skype
+Name[km]=Skype
+Name[ko]=Skype
+Name[lt]=Skype
+Name[lv]=Skype
+Name[nb]=Skype
+Name[nds]=Skype
 Name[ne]=स्काइप
+Name[nl]=Skype
+Name[nn]=Skype
+Name[oc]=Skype
 Name[pa]=ਸਕਾਈਪੀ
+Name[pl]=Skype
+Name[pt]=Skype
+Name[pt_BR]=Skype
+Name[ro]=Skype
+Name[ru]=Skype
+Name[sk]=Skype
+Name[sl]=Skype
+Name[sv]=Skype
+Name[tr]=Skype
+Name[uk]=Skype
 Name[x-test]=xxSkypexx
+Name[zh_CN]=Skype
+Name[zh_TW]=Skype
--- kaddressbook/editors/protocols/icqprotocol.desktop
+++ kaddressbook/editors/protocols/icqprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=ICQ Protokol
 Comment[de]=ICQ-Protokoll
 Comment[el]=Πρωτόκολλο ICQ
+Comment[en_GB]=ICQ Protocol
 Comment[eo]=ICQ Protokolo
 Comment[es]=Protocolo ICQ
 Comment[et]=ICQ protokoll
@@ -61,6 +62,62 @@
 Comment[zh_CN]=ICQ 协议
 Comment[zh_TW]=ICQ 協定
 Name=ICQ
+Name[af]=ICQ
+Name[ar]=ICQ
+Name[be]=ICQ
+Name[bg]=ICQ
+Name[br]=ICQ
+Name[ca]=ICQ
+Name[cs]=ICQ
+Name[cy]=ICQ
+Name[da]=ICQ
+Name[de]=ICQ
+Name[el]=ICQ
+Name[en_GB]=ICQ
+Name[eo]=ICQ
+Name[es]=ICQ
+Name[et]=ICQ
+Name[eu]=ICQ
+Name[fi]=ICQ
+Name[fr]=ICQ
+Name[fy]=ICQ
+Name[ga]=ICQ
+Name[gl]=ICQ
+Name[he]=ICQ
+Name[hu]=ICQ
+Name[is]=ICQ
+Name[it]=ICQ
+Name[ja]=ICQ
+Name[ka]=ICQ
+Name[kk]=ICQ
+Name[km]=ICQ
+Name[ko]=ICQ
+Name[lt]=ICQ
+Name[lv]=ICQ
+Name[ms]=ICQ
+Name[nb]=ICQ
+Name[nds]=ICQ
 Name[ne]=आईसीक्यू
+Name[nl]=ICQ
+Name[nn]=ICQ
+Name[oc]=ICQ
+Name[pa]=ICQ
+Name[pl]=ICQ
+Name[pt]=ICQ
+Name[pt_BR]=ICQ
+Name[ro]=ICQ
+Name[ru]=ICQ
+Name[se]=ICQ
+Name[sk]=ICQ
+Name[sl]=ICQ
+Name[sv]=ICQ
+Name[ta]=ICQ
+Name[tg]=ICQ
+Name[tr]=ICQ
+Name[uk]=ICQ
+Name[uz]=ICQ
+Name[uz@cyrillic]=ICQ
 Name[x-test]=xxICQxx
+Name[zh_CN]=ICQ
+Name[zh_TW]=ICQ
 
--- kaddressbook/editors/protocols/ircprotocol.desktop
+++ kaddressbook/editors/protocols/ircprotocol.desktop
@@ -4,11 +4,29 @@
 X-KDE-ServiceTypes=KABC/IMProtocol,KPluginInfo
 X-KDE-InstantMessagingKABCField=messaging/irc
 Comment=Internet Relay Chat
+Comment[af]=Internet Relay Chat
 Comment[ar]=المحادثة على الإنترنت
 Comment[bg]=Протокол IRC
+Comment[ca]=Internet Relay Chat
+Comment[cs]=Internet Relay Chat
+Comment[da]=Internet Relay Chat
+Comment[de]=Internet Relay Chat
+Comment[el]=Internet Relay Chat
+Comment[en_GB]=Internet Relay Chat
+Comment[eo]=Internet Relay Chat
+Comment[es]=Internet Relay Chat
+Comment[et]=Internet Relay Chat
+Comment[eu]=Internet Relay Chat
 Comment[fa]=گپ بازپخش اینترنت
+Comment[fi]=Internet Relay Chat
+Comment[fr]=Internet Relay Chat
+Comment[fy]=Internet Relay Chat
+Comment[ga]=Internet Relay Chat
+Comment[gl]=Internet Relay Chat
+Comment[he]=Internet Relay Chat
 Comment[hu]=IRC (Internet Relay Chat)
 Comment[is]=Internet spjall
+Comment[it]=Internet Relay Chat
 Comment[ja]=インターネットリレーチャット
 Comment[ka]=IRC
 Comment[kk]=Internet Relay Chat хабарласу
@@ -16,12 +34,22 @@
 Comment[ko]=인터넷 릴레이 채팅
 Comment[lt]=Estafetinis Interneto pokalbis
 Comment[lv]=Interneta tērzēšana
+Comment[ms]=Internet Relay Chat
+Comment[nb]=Internet Relay Chat
+Comment[nds]=Internet Relay Chat
 Comment[ne]=इन्टरनेटबाट प्रसारण कुराकानी
+Comment[nl]=Internet Relay Chat
+Comment[nn]=Internet Relay Chat
 Comment[pa]=ਇੰਟਰਨੈੱਟ ਰੀਲੇਅ ਚਾਟ
 Comment[pl]=IRC (Internet Relay Chat)
+Comment[pt]=Internet Relay Chat
 Comment[pt_BR]=Protocolo de bate-papo na Internet - IRC
+Comment[ro]=Internet Relay Chat
 Comment[ru]=IRC
+Comment[se]=Internet Relay Chat
+Comment[sk]=Internet Relay Chat
 Comment[sl]=Internet Relay Chat (»internetno prenešen klepet«)
+Comment[sv]=Internet Relay Chat
 Comment[ta]=இணைய வழங்கும் அறட்டை
 Comment[tg]=IRC (Internet Relay Chat)
 Comment[tr]=İnternet Genel Sohbeti
@@ -30,6 +58,61 @@
 Comment[zh_CN]=Internet 中继聊天
 Comment[zh_TW]=IRC
 Name=IRC
+Name[af]=IRC
+Name[ar]=IRC
+Name[be]=IRC
+Name[bg]=IRC
+Name[br]=IRC
+Name[ca]=IRC
+Name[cs]=IRC
+Name[cy]=IRC
+Name[da]=IRC
+Name[de]=IRC
+Name[el]=IRC
+Name[en_GB]=IRC
+Name[eo]=IRC
+Name[es]=IRC
+Name[et]=IRC
+Name[eu]=IRC
+Name[fi]=IRC
+Name[fr]=IRC
+Name[fy]=IRC
+Name[ga]=IRC
+Name[gl]=IRC
+Name[he]=IRC
+Name[hu]=IRC
+Name[is]=IRC
+Name[it]=IRC
+Name[ja]=IRC
+Name[ka]=IRC
+Name[kk]=IRC
+Name[km]=IRC
+Name[ko]=IRC
+Name[lt]=IRC
+Name[lv]=IRC
+Name[ms]=IRC
+Name[nb]=IRC
+Name[nds]=IRC
 Name[ne]=आईआरसी
+Name[nl]=IRC
+Name[nn]=IRC
+Name[pa]=IRC
+Name[pl]=IRC
+Name[pt]=IRC
+Name[pt_BR]=IRC
+Name[ro]=IRC
+Name[ru]=IRC
+Name[se]=IRC
+Name[sk]=IRC
+Name[sl]=IRC
+Name[sv]=IRC
+Name[ta]=IRC
+Name[tg]=IRC
+Name[tr]=IRC
+Name[uk]=IRC
+Name[uz]=IRC
+Name[uz@cyrillic]=IRC
 Name[x-test]=xxIRCxx
+Name[zh_CN]=IRC
+Name[zh_TW]=IRC
 
--- kaddressbook/editors/protocols/msnprotocol.desktop
+++ kaddressbook/editors/protocols/msnprotocol.desktop
@@ -8,41 +8,117 @@
 Comment[ar]=مرسال MSN
 Comment[be]=MSN Messenger 
 Comment[bg]=MSN
+Comment[br]=MSN Messenger
+Comment[ca]=MSN Messenger
+Comment[cs]=MSN Messenger
 Comment[cy]=Negesydd MSN
+Comment[da]=MSN Messenger
+Comment[de]=MSN Messenger
+Comment[el]=MSN Messenger
+Comment[en_GB]=MSN Messenger
 Comment[eo]=MSN Mesaĝilo
+Comment[es]=MSN Messenger
+Comment[et]=MSN Messenger
+Comment[eu]=MSN Messenger
 Comment[fa]=پیام‌رسان MSN
+Comment[fi]=MSN Messenger
 Comment[fr]=Messagerie MSN
+Comment[fy]=MSN Messenger
+Comment[ga]=MSN Messenger
+Comment[gl]=MSN Messenger
+Comment[he]=MSN Messenger
+Comment[hu]=MSN Messenger
 Comment[is]=MSN spjallforritið
+Comment[it]=MSN Messenger
 Comment[ja]=MSN メッセンジャー
 Comment[ka]=MSN შიკრიკი
+Comment[kk]=MSN Messenger
 Comment[km]=កម្មវិធីផ្ញើសារ MSN
 Comment[ko]=MSN 메신저
+Comment[lt]=MSN Messenger
 Comment[lv]=MSN tūlītējas ziņampaiņas programma
 Comment[mai]=MSN मेसेंजर
+Comment[ms]=MSN Messenger
+Comment[nb]=MSN Messenger
 Comment[nds]=MSN-Kortnarichtenmaker
 Comment[ne]=एमएसएन मेसेन्जर
+Comment[nl]=MSN Messenger
+Comment[nn]=MSN Messenger
+Comment[oc]=MSN Messenger
 Comment[pa]=MSN ਮੈਂਸਜ਼ਰ
+Comment[pl]=MSN Messenger
+Comment[pt]=MSN Messenger
 Comment[pt_BR]=Mensageiro MSN
 Comment[ro]=Mesagerul MSN
+Comment[ru]=MSN Messenger
+Comment[se]=MSN Messenger
+Comment[sk]=MSN Messenger
+Comment[sl]=MSN Messenger
+Comment[sv]=MSN Messenger
 Comment[ta]=MSN மெசஞ்சர்
+Comment[tg]=MSN Messenger
 Comment[tr]=MSN Mesajcısı
+Comment[uk]=MSN Messenger
 Comment[x-test]=xxMSN Messengerxx
+Comment[zh_CN]=MSN Messenger
+Comment[zh_TW]=MSN Messenger
 Name=MSN Messenger
+Name[af]=MSN Messenger
 Name[ar]=مرسال MSN
 Name[be]=MSN Messenger 
 Name[bg]=MSN
+Name[br]=MSN Messenger
+Name[ca]=MSN Messenger
+Name[cs]=MSN Messenger
 Name[cy]=Negesydd MSN
+Name[da]=MSN Messenger
+Name[de]=MSN Messenger
+Name[el]=MSN Messenger
+Name[en_GB]=MSN Messenger
 Name[eo]=MSN Mesaĝilo
+Name[es]=MSN Messenger
+Name[et]=MSN Messenger
+Name[eu]=MSN Messenger
 Name[fa]=پیام‌رسان MSN
+Name[fi]=MSN Messenger
+Name[fr]=MSN Messenger
+Name[fy]=MSN Messenger
+Name[ga]=MSN Messenger
+Name[gl]=MSN Messenger
+Name[he]=MSN Messenger
+Name[hu]=MSN Messenger
+Name[is]=MSN Messenger
+Name[it]=MSN Messenger
 Name[ja]=MSN メッセンジャー
 Name[ka]=MSN შიკრიკი
+Name[kk]=MSN Messenger
 Name[km]=កម្មវិធីផ្ញើសារ MSN
 Name[ko]=MSN 메신저
+Name[lt]=MSN Messenger
+Name[lv]=MSN Messenger
 Name[mai]=MSN मेसेंजर
+Name[ms]=MSN Messenger
+Name[nb]=MSN Messenger
 Name[nds]=MSN-Kortnarichtenmaker
 Name[ne]=एमएसएन मेसेन्जर
+Name[nl]=MSN Messenger
+Name[nn]=MSN Messenger
+Name[oc]=MSN Messenger
 Name[pa]=MSN ਮੈਂਸਜ਼ਰ
+Name[pl]=MSN Messenger
+Name[pt]=MSN Messenger
+Name[pt_BR]=MSN Messenger
+Name[ro]=MSN Messenger
+Name[ru]=MSN Messenger
+Name[se]=MSN Messenger
+Name[sk]=MSN Messenger
+Name[sl]=MSN Messenger
+Name[sv]=MSN Messenger
 Name[ta]=MSN மெசஞ்சர்
+Name[tg]=MSN Messenger
 Name[tr]=MSN Mesajcısı
+Name[uk]=MSN Messenger
 Name[x-test]=xxMSN Messengerxx
+Name[zh_CN]=MSN Messenger
+Name[zh_TW]=MSN Messenger
 
--- kaddressbook/editors/protocols/yahooprotocol.desktop
+++ kaddressbook/editors/protocols/yahooprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=Yahoo Protokol
 Comment[de]=Yahoo!-Protokoll
 Comment[el]=Πρωτόκολλο Yahoo
+Comment[en_GB]=Yahoo Protocol
 Comment[eo]=Yahoo Protokolo
 Comment[es]=Protocolo Yahoo
 Comment[et]=Yahoo protokoll
@@ -61,13 +62,64 @@
 Comment[zh_CN]=Yahoo 协议
 Comment[zh_TW]=Yahoo 協定
 Name=Yahoo
+Name[af]=Yahoo
 Name[ar]=ياهو
+Name[be]=Yahoo
+Name[bg]=Yahoo
+Name[br]=Yahoo
+Name[ca]=Yahoo
+Name[cs]=Yahoo
+Name[cy]=Yahoo
+Name[da]=Yahoo
 Name[de]=Yahoo!
+Name[el]=Yahoo
+Name[en_GB]=Yahoo
+Name[eo]=Yahoo
+Name[es]=Yahoo
+Name[et]=Yahoo
+Name[eu]=Yahoo
 Name[fa]=یاهو
+Name[fi]=Yahoo
+Name[fr]=Yahoo
+Name[fy]=Yahoo
+Name[ga]=Yahoo
+Name[gl]=Yahoo
+Name[he]=Yahoo
+Name[hu]=Yahoo
+Name[is]=Yahoo
+Name[it]=Yahoo
+Name[ja]=Yahoo
+Name[ka]=Yahoo
+Name[kk]=Yahoo
 Name[km]=យ៉ាហ៊ូ
+Name[ko]=Yahoo
+Name[lt]=Yahoo
+Name[lv]=Yahoo
 Name[mai]=याहू
+Name[ms]=Yahoo
+Name[nb]=Yahoo
+Name[nds]=Yahoo
 Name[ne]=याहू
+Name[nl]=Yahoo
 Name[nn]=Yahoo!
+Name[oc]=Yahoo
 Name[pa]=ਯਾਹੂ
+Name[pl]=Yahoo
+Name[pt]=Yahoo
+Name[pt_BR]=Yahoo
+Name[ro]=Yahoo
+Name[ru]=Yahoo
+Name[se]=Yahoo
+Name[sk]=Yahoo
+Name[sl]=Yahoo
+Name[sv]=Yahoo
+Name[ta]=Yahoo
+Name[tg]=Yahoo
+Name[tr]=Yahoo
+Name[uk]=Yahoo
+Name[uz]=Yahoo
+Name[uz@cyrillic]=Yahoo
 Name[x-test]=xxYahooxx
+Name[zh_CN]=Yahoo
+Name[zh_TW]=Yahoo
 
--- kaddressbook/editors/protocols/gaduprotocol.desktop
+++ kaddressbook/editors/protocols/gaduprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=Gadu-Gadu Protokol
 Comment[de]=Gadu-Gadu-Protokoll
 Comment[el]=Πρωτόκολλο Gadu-Gadu
+Comment[en_GB]=Gadu-Gadu Protocol
 Comment[eo]=Gadu-Gadu Protokolo
 Comment[es]=Protocolo Gadu-Gadu
 Comment[et]=Gadu-Gadu protokoll
@@ -61,8 +62,62 @@
 Comment[zh_CN]=Gadu-Gadu 协议
 Comment[zh_TW]=Gadu-Gadu 協定
 Name=Gadu-Gadu
+Name[af]=Gadu-Gadu
+Name[ar]=Gadu-Gadu
+Name[be]=Gadu-Gadu
+Name[bg]=Gadu-Gadu
+Name[br]=Gadu-Gadu
+Name[ca]=Gadu-Gadu
+Name[cs]=Gadu-Gadu
+Name[cy]=Gadu-Gadu
+Name[da]=Gadu-Gadu
+Name[de]=Gadu-Gadu
+Name[el]=Gadu-Gadu
+Name[en_GB]=Gadu-Gadu
+Name[eo]=Gadu-Gadu
+Name[es]=Gadu-Gadu
+Name[et]=Gadu-Gadu
+Name[eu]=Gadu-Gadu
+Name[fi]=Gadu-Gadu
+Name[fr]=Gadu-Gadu
+Name[fy]=Gadu-Gadu
+Name[ga]=Gadu-Gadu
+Name[gl]=Gadu-Gadu
+Name[he]=Gadu-Gadu
+Name[hu]=Gadu-Gadu
+Name[is]=Gadu-Gadu
+Name[it]=Gadu-Gadu
+Name[ja]=Gadu-Gadu
+Name[ka]=Gadu-Gadu
+Name[kk]=Gadu-Gadu
+Name[km]=Gadu-Gadu
+Name[ko]=Gadu-Gadu
+Name[lt]=Gadu-Gadu
+Name[lv]=Gadu-Gadu
+Name[ms]=Gadu-Gadu
+Name[nb]=Gadu-Gadu
+Name[nds]=Gadu-Gadu
 Name[ne]=गाडु-गाडु
+Name[nl]=Gadu-Gadu
+Name[nn]=Gadu-Gadu
+Name[oc]=Gadu-Gadu
 Name[pa]=ਗਡੁ-ਗਡੁ
+Name[pl]=Gadu-Gadu
+Name[pt]=Gadu-Gadu
+Name[pt_BR]=Gadu-Gadu
+Name[ro]=Gadu-Gadu
+Name[ru]=Gadu-Gadu
+Name[se]=Gadu-Gadu
+Name[sk]=Gadu-Gadu
+Name[sl]=Gadu-Gadu
+Name[sv]=Gadu-Gadu
 Name[ta]=கடு-கடு
+Name[tg]=Gadu-Gadu
+Name[tr]=Gadu-Gadu
+Name[uk]=Gadu-Gadu
+Name[uz]=Gadu-Gadu
+Name[uz@cyrillic]=Gadu-Gadu
 Name[x-test]=xxGadu-Gaduxx
+Name[zh_CN]=Gadu-Gadu
+Name[zh_TW]=Gadu-Gadu
 
--- kaddressbook/editors/protocols/smsprotocol.desktop
+++ kaddressbook/editors/protocols/smsprotocol.desktop
@@ -14,6 +14,7 @@
 Comment[da]=SMS Protokol
 Comment[de]=SMS-Protokoll
 Comment[el]=Πρωτόκολλο SMS
+Comment[en_GB]=SMS Protocol
 Comment[eo]=SMS Protokolo
 Comment[es]=Protocolo SMS
 Comment[et]=SMS protokoll
@@ -61,10 +62,65 @@
 Comment[zh_CN]=手机短信协议
 Comment[zh_TW]=SMS 協定
 Name=SMS
+Name[af]=SMS
+Name[ar]=SMS
+Name[be]=SMS
+Name[bg]=SMS
+Name[br]=SMS
+Name[ca]=SMS
+Name[cs]=SMS
+Name[cy]=SMS
+Name[da]=SMS
+Name[de]=SMS
+Name[el]=SMS
+Name[en_GB]=SMS
+Name[eo]=SMS
+Name[es]=SMS
+Name[et]=SMS
+Name[eu]=SMS
 Name[fa]=پیام کوتاه
+Name[fi]=SMS
+Name[fr]=SMS
+Name[fy]=SMS
+Name[ga]=SMS
+Name[gl]=SMS
+Name[he]=SMS
+Name[hu]=SMS
+Name[is]=SMS
+Name[it]=SMS
+Name[ja]=SMS
+Name[ka]=SMS
+Name[kk]=SMS
 Name[km]=សេវាសារខ្លីៗ
+Name[ko]=SMS
+Name[lt]=SMS
+Name[lv]=SMS
+Name[mai]=SMS
+Name[ms]=SMS
+Name[nb]=SMS
+Name[nds]=SMS
 Name[ne]=एसएमएस
+Name[nl]=SMS
+Name[nn]=SMS
+Name[oc]=SMS
+Name[pa]=SMS
+Name[pl]=SMS
+Name[pt]=SMS
+Name[pt_BR]=SMS
+Name[ro]=SMS
+Name[ru]=SMS
+Name[se]=SMS
+Name[sk]=SMS
+Name[sl]=SMS
+Name[sv]=SMS
+Name[ta]=SMS
+Name[tg]=SMS
 Name[th]=ข้อความ SMS
+Name[tr]=SMS
+Name[uk]=SMS
+Name[uz]=SMS
+Name[uz@cyrillic]=SMS
 Name[x-test]=xxSMSxx
 Name[zh_CN]=手机短信
+Name[zh_TW]=SMS
 
--- kaddressbook/editors/protocols/groupwiseprotocol.desktop
+++ kaddressbook/editors/protocols/groupwiseprotocol.desktop
@@ -8,18 +8,26 @@
 Comment[ar]=مرسال نوفل GroupWise
 Comment[be]=Сервер Novell Groupwise
 Comment[bg]=Месинджър Novell GroupWise
+Comment[ca]=Novell GroupWise Messenger
 Comment[cs]=Novell GroupWise komunikátor
+Comment[da]=Novell GroupWise Messenger
+Comment[de]=Novell GroupWise Messenger
 Comment[el]=GroupWise Messenger της Novell
+Comment[en_GB]=Novell GroupWise Messenger
 Comment[eo]=Novell GroupWise Mesaĝilo
 Comment[es]=Servidor de mensajería de Novell GroupWise
 Comment[et]=Novelli GroupWise Messenger
 Comment[eu]=Novell GroupWise mezularia
 Comment[fa]=مدیر Novell GroupWise
+Comment[fi]=Novell GroupWise Messenger
 Comment[fr]=Messagerie GroupWise de Novell
 Comment[fy]=Novell GroupWise-messenger
 Comment[ga]=Teachtaire Novell GroupWise
+Comment[gl]=Novell GroupWise Messenger
 Comment[he]=מסנג'ר של Novell GroupWise
+Comment[hu]=Novell GroupWise Messenger
 Comment[is]=Novell GroupWise Samskiptatólið
+Comment[it]=Novell GroupWise Messenger
 Comment[ja]=Novell GroupWise メッセンジャー
 Comment[ka]= Novell GroupWise მყისიერი შეტყობინებების მაცნე
 Comment[kk]=Novell GroupWise хабарласу
@@ -28,23 +36,78 @@
 Comment[lt]=Novell GroupWise momentinių žinučių klientas
 Comment[lv]=Novell GroupWise ziņotājs
 Comment[ms]=Pembawa mesej Novell GroupWise 
+Comment[nb]=Novell GroupWise Messenger
 Comment[nds]=Novell-GroupWise-Kortnarichtenmaker
 Comment[ne]=नोभेल समूहगत मेसेन्जर
 Comment[nl]=Novell GroupWise-messenger
+Comment[nn]=Novell GroupWise Messenger
 Comment[pa]=ਨੋਵਲ ਗਰੁੱਪ-ਵਾਈਜ਼ ਮੈਸੈਂਜ਼ਰ
 Comment[pl]=Komunikator Novell GroupWise
+Comment[pt]=Novell GroupWise Messenger
 Comment[pt_BR]=Mensageiro GroupWise da Novell
 Comment[ro]=Mesager Novell GroupWise
 Comment[ru]=Обмен сообщениями Novell GroupWise
+Comment[sk]=Novell GroupWise Messenger
+Comment[sl]=Novell GroupWise Messenger
 Comment[sv]=Novell Groupwise Messenger
 Comment[ta]=நோவல் குழுவாரியான செய்தியாளன்
 Comment[tr]=Novell GroupWise Hızlı Mesajlaşma Uygulaması
+Comment[uk]=Novell GroupWise Messenger
 Comment[x-test]=xxNovell GroupWise Messengerxx
 Comment[zh_CN]=Novell GroupWise 信使
+Comment[zh_TW]=Novell GroupWise Messenger
 Name=GroupWise
+Name[af]=GroupWise
+Name[ar]=GroupWise
+Name[be]=GroupWise
+Name[bg]=GroupWise
+Name[br]=GroupWise
+Name[ca]=GroupWise
+Name[cs]=GroupWise
+Name[da]=GroupWise
+Name[de]=GroupWise
+Name[el]=GroupWise
+Name[en_GB]=GroupWise
+Name[eo]=GroupWise
+Name[es]=GroupWise
+Name[et]=GroupWise
+Name[eu]=GroupWise
+Name[fi]=GroupWise
+Name[fr]=GroupWise
+Name[fy]=GroupWise
+Name[ga]=GroupWise
+Name[gl]=GroupWise
+Name[he]=GroupWise
+Name[hu]=GroupWise
+Name[is]=GroupWise
+Name[it]=GroupWise
+Name[ja]=GroupWise
+Name[ka]=GroupWise
+Name[kk]=GroupWise
+Name[km]=GroupWise
+Name[ko]=GroupWise
+Name[lt]=GroupWise
+Name[lv]=GroupWise
+Name[ms]=GroupWise
+Name[nb]=GroupWise
+Name[nds]=GroupWise
 Name[ne]=समूहगत
+Name[nl]=GroupWise
+Name[nn]=GroupWise
+Name[oc]=GroupWise
 Name[pa]=ਗਰੁੱਪਵਾਈਜ
+Name[pl]=GroupWise
+Name[pt]=GroupWise
+Name[pt_BR]=GroupWise
+Name[ro]=GroupWise
+Name[ru]=GroupWise
+Name[sk]=GroupWise
+Name[sl]=GroupWise
 Name[sv]=Groupwise
 Name[ta]=குழுவாரியாக
+Name[tr]=GroupWise
+Name[uk]=GroupWise
 Name[x-test]=xxGroupWisexx
+Name[zh_CN]=GroupWise
+Name[zh_TW]=GroupWise
 
--- kaddressbook/editors/cryptosettings.desktop
+++ kaddressbook/editors/cryptosettings.desktop
@@ -10,6 +10,7 @@
 Name[da]=Krypto-indstillinger
 Name[de]=Kryptografie-Einstellungen
 Name[el]=Προτιμήσεις κρυπτογραφίας
+Name[en_GB]=Crypto Preferences
 Name[eo]=Agordoj pri Ĉifrado
 Name[es]=Preferencias de cifrado
 Name[et]=Krüptoseadistused
--- kaddressbook/editors/imaddresseditor.desktop
+++ kaddressbook/editors/imaddresseditor.desktop
@@ -8,7 +8,10 @@
 Name[br]=Postelerezh a-benn-kaer
 Name[ca]=Missatgeria instantània
 Name[cs]=Komunikátor
+Name[da]=Instant Messaging
+Name[de]=Instant Messaging
 Name[el]=Στιγμιαίο μήνυμα
+Name[en_GB]=Instant Messaging
 Name[eo]=Rapidmesaĝilo
 Name[es]=Mensajería instantánea
 Name[et]=Kiirsuhtlus
@@ -16,6 +19,7 @@
 Name[fa]=پیام‌دهی فوری
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
+Name[fy]=Instant Messaging
 Name[ga]=Cur Teachtaireachtaí Meandaracha
 Name[gl]=Mensaxería instantánea
 Name[he]=מסרים מיידיים
@@ -34,6 +38,7 @@
 Name[nb]=Lynmelding
 Name[nds]=Kortnarichten-Maker
 Name[ne]=इन्सट्यान्ट मेसेन्जिङ
+Name[nl]=Instant Messaging
 Name[nn]=Lynmelding
 Name[oc]=Messatjariá instantanèa
 Name[pa]=ਤੁਰੰਤ ਮੈਸ਼ਜਿੰਗ
@@ -65,6 +70,7 @@
 Comment[da]=Instant Messaging adresseeditor
 Comment[de]=Editor für Instant Messaging-Adressen
 Comment[el]=Επεξεργαστής διευθύνσεων στιγμιαίων μηνυμάτων
+Comment[en_GB]=Instant Messaging Address Editor
 Comment[eo]=Rapidmesaĝila Adres-Redaktilo
 Comment[es]=Editor de direcciones de mensajería instantánea
 Comment[et]=Kiirsuhtluse aadresside redaktor
--- kaddressbook/editors/kaddressbookimprotocol.desktop
+++ kaddressbook/editors/kaddressbookimprotocol.desktop
@@ -11,6 +11,7 @@
 Name[da]=KAddressbook kvikbesked-protokol
 Name[de]=Adressbuch Instant Messaging Protokoll
 Name[el]=Πρωτόκολλο στιγμιαίου μηνύματος του KAddressbook
+Name[en_GB]=KAddressbook Instant Messaging Protocol
 Name[eo]=KAddressbook Rapidmesaĝila Protokolo
 Name[es]=Protocolo de mensajería instantánea de KAddressbook
 Name[et]=KDE aadressiraamatu kiirsuhtlusprotokoll
--- kaddressbook/kaddressbookpart.desktop
+++ kaddressbook/kaddressbookpart.desktop
@@ -1,27 +1,61 @@
 [Desktop Entry]
 Type=Service
 Name=KAddressBook
+Name[af]=KAddressBook
 Name[ar]=دفتر عناوين كدي
+Name[be]=KAddressBook
+Name[bg]=KAddressBook
+Name[br]=KAddressBook
+Name[ca]=KAddressBook
+Name[cs]=KAddressBook
 Name[cy]=KAddressBook/LlyfrKyfeiriadau
+Name[da]=KAddressBook
 Name[de]=Adressbuch
+Name[el]=KAddressBook
+Name[en_GB]=KAddressBook
+Name[eo]=KAddressBook
+Name[es]=KAddressBook
 Name[et]=KDE aadressiraamat
 Name[eu]=Helbide-liburua
 Name[fi]=Osoitekirja
 Name[fr]=Carnet d'adresses
+Name[fy]=KAddressBook
+Name[ga]=KAddressBook
+Name[gl]=KAddressBook
 Name[he]=פנקס כתובות
+Name[hu]=KAddressBook
+Name[is]=KAddressBook
+Name[it]=KAddressBook
+Name[ja]=KAddressBook
+Name[ka]=KAddressBook
+Name[kk]=KAddressBook
+Name[km]=KAddressBook
+Name[ko]=KAddressBook
+Name[lt]=KAddressBook
+Name[lv]=KAddressBook
 Name[mk]=КАдресар
+Name[ms]=KAddressBook
+Name[nb]=KAddressBook
 Name[nds]=KAdressbook
 Name[ne]=केडीई ठेगाना पुस्तिका
+Name[nl]=KAddressBook
 Name[nn]=KDE-adressebok
 Name[pa]=ਕੇ-ਐਡਰੈੱਸਬੁੱਕ
 Name[pl]=Książka adresowa
+Name[pt]=KAddressBook
+Name[pt_BR]=KAddressBook
 Name[ro]=Cartea de adrese
+Name[ru]=KAddressBook
+Name[se]=KAddressBook
 Name[sk]=Adresár
+Name[sl]=KAddressBook
 Name[sv]=Adressbok
 Name[ta]=கேமுகவரிப் புத்தகம்
 Name[th]=สมุดที่อยู่ K
 Name[tr]=KDE Adres Defteri
+Name[uk]=KAddressBook
 Name[x-test]=xxKAddressBookxx
+Name[zh_CN]=KAddressBook
 Name[zh_TW]=KAddressBook 通訊錄
 Icon=kaddressbook
 X-DocPath=kaddressbook/index.html
--- kaddressbook/kaddressbook_view.desktop
+++ kaddressbook/kaddressbook_view.desktop
@@ -12,6 +12,7 @@
 Comment[da]=KAddressBook visningsplugin
 Comment[de]=Betrachter-Modul für Adressbuch
 Comment[el]=Πρόσθετο προβολής του KAddressBook
+Comment[en_GB]=KAddressBook View Plugin
 Comment[eo]=KAddressBook Rigardo-Kromaĵo
 Comment[es]=Complemento del visor de KAddressBook
 Comment[et]=KDE aadressiraamatu vaatamise plugin
--- kaddressbook/kcmconfigs/kabcustomfields.desktop
+++ kaddressbook/kcmconfigs/kabcustomfields.desktop
@@ -20,6 +20,7 @@
 Name[da]=Brugervalgte sider
 Name[de]=Benutzerdefinierte Seiten
 Name[el]=Προσαρμοσμένες σελίδες
+Name[en_GB]=Custom Pages
 Name[eo]=Propraj Paĝoj
 Name[es]=Páginas personalizadas
 Name[et]=Omaloodud leheküljed
@@ -65,6 +66,7 @@
 Name[uk]=Нетипові сторінки
 Name[x-test]=xxCustom Pagesxx
 Name[zh_CN]=定制页
+Name[zh_TW]=Custom Pages
 Comment=Configure the Custom Pages
 Comment[af]=Stel die pasmaak blaaie op
 Comment[ar]=اضبط مخصص الصفحات
@@ -75,6 +77,7 @@
 Comment[da]=Indstil de selvvalgte sider
 Comment[de]=Einstellungen für benutzerdefinierte Seiten
 Comment[el]=Ρύθμιση των προσαρμοσμένων σελίδων
+Comment[en_GB]=Configure the Custom Pages
 Comment[eo]=Agordi la proprajn paĝojn
 Comment[es]=Configurar las páginas personalizadas
 Comment[et]=Omaloodud lehekülgede seadistamine
--- kaddressbook/kcmconfigs/kabconfig.desktop
+++ kaddressbook/kcmconfigs/kabconfig.desktop
@@ -16,12 +16,15 @@
 Name[be]=Агульныя
 Name[bg]=Общи
 Name[br]=Pennañ
+Name[ca]=General
 Name[cs]=Obecné
 Name[cy]=Cyffredinol
 Name[da]=Generelt
 Name[de]=Allgemein
 Name[el]=Γενικά
+Name[en_GB]=General
 Name[eo]=Ĝenerala
+Name[es]=General
 Name[et]=Üldine
 Name[eu]=Orokorra
 Name[fa]=عمومی
@@ -49,10 +52,12 @@
 Name[ne]=साधारण
 Name[nl]=Algemeen
 Name[nn]=Generelt
+Name[oc]=General
 Name[pa]=ਸਧਾਰਨ
 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral
+Name[ro]=General
 Name[ru]=Главное
 Name[se]=Oppalaš
 Name[sk]=Všeobecné
@@ -66,6 +71,7 @@
 Name[uz@cyrillic]=Умумий
 Name[x-test]=xxGeneralxx
 Name[zh_CN]=常规
+Name[zh_TW]=General
 Comment=Configure the Address Book
 Comment[af]=Stel die adres boek op
 Comment[ar]=اضبط دفتر العناوين
@@ -78,6 +84,7 @@
 Comment[da]=Indstil adressebogen
 Comment[de]=Adressbuch einrichten
 Comment[el]=Ρύθμιση του Βιβλίου διευθύνσεων
+Comment[en_GB]=Configure the Address Book
 Comment[eo]=Agordi la Adreslibron
 Comment[es]=Configurar la libreta de direcciones
 Comment[et]=Aadressiraamatu seadistamine
--- kaddressbook/kcmconfigs/kabldapconfig.desktop
+++ kaddressbook/kcmconfigs/kabldapconfig.desktop
@@ -22,6 +22,7 @@
 Name[da]=LDAP-Opslag
 Name[de]=LDAP-Nachschlagefunktion
 Name[el]=Αναζήτηση LDAP
+Name[en_GB]=LDAP Lookup
 Name[eo]=LDAP-Serĉo
 Name[es]=Búsqueda LDAP
 Name[et]=LDAP otsing
@@ -43,6 +44,7 @@
 Name[lt]=LDAP paieška
 Name[lv]=LDAP meklēšana
 Name[mk]=Пребарување во LDAP
+Name[ms]=LDAP Lookup
 Name[nb]=LDAP oppslag
 Name[nds]=LDAP-Naslaan
 Name[ne]=LDAP खोजी
@@ -64,6 +66,7 @@
 Name[uk]=Пошук через LDAP
 Name[x-test]=xxLDAP Lookupxx
 Name[zh_CN]=LDAP 查询
+Name[zh_TW]=LDAP Lookup
 Comment=Configure the Address Book LDAP Settings
 Comment[af]=Stel die adres boek se LDAP opstelling op.
 Comment[ar]=اضبط إعدادات دفتر عناوين LDAP
@@ -74,6 +77,7 @@
 Comment[da]=Indstil adressebogens LDAP
 Comment[de]=Adressbuch-Modul für LDAP-Einstellungen
 Comment[el]=Αλλάξτε τις ρυθμίσεις LDAP του Βιβλίου διευθύνσεων
+Comment[en_GB]=Configure the Address Book LDAP Settings
 Comment[eo]=Agordo de tenejo
 Comment[es]=Configurar las preferencias de LDAP de la libreta de direcciones
 Comment[et]=Aadressiraamatu LDAP seadistused
--- kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
+++ kaddressbook/thumbnailcreator/ldifvcardthumbnail.desktop
@@ -10,6 +10,7 @@
 Name[da]=Elektroniske forretningskort-filer
 Name[de]=Dateien für elektronische Visitenkarten
 Name[el]=Αρχεία επαγγελματικών ηλεκτρονικών καρτών
+Name[en_GB]=Electronic Business Card Files
 Name[eo]=Dosieroj de Elektronika Vizitkarto
 Name[es]=Archivos de tarjetas de visita electrónicas
 Name[et]=Elektrooniline visiitkaart
--- kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop
+++ kaddressbook/kabcdistlistupdater/kabcdistlistupdater.desktop
@@ -1,9 +1,40 @@
 [Desktop Entry]
 Name=kabcdistlistupdater
+Name[ar]=kabcdistlistupdater
+Name[ca]=kabcdistlistupdater
+Name[cs]=kabcdistlistupdater
+Name[da]=kabcdistlistupdater
+Name[de]=kabcdistlistupdater
+Name[el]=kabcdistlistupdater
+Name[en_GB]=kabcdistlistupdater
+Name[es]=kabcdistlistupdater
+Name[et]=kabcdistlistupdater
+Name[fr]=kabcdistlistupdater
 Name[gl]=kabcdlistlistupdater
+Name[hu]=kabcdistlistupdater
+Name[is]=kabcdistlistupdater
+Name[it]=kabcdistlistupdater
+Name[ja]=kabcdistlistupdater
+Name[km]=kabcdistlistupdater
+Name[ko]=kabcdistlistupdater
+Name[lt]=kabcdistlistupdater
+Name[nb]=kabcdistlistupdater
+Name[nds]=kabcdistlistupdater
+Name[nl]=kabcdistlistupdater
+Name[nn]=kabcdistlistupdater
+Name[pa]=kabcdistlistupdater
+Name[pl]=kabcdistlistupdater
+Name[pt]=kabcdistlistupdater
+Name[pt_BR]=kabcdistlistupdater
+Name[ro]=kabcdistlistupdater
+Name[ru]=kabcdistlistupdater
+Name[sl]=kabcdistlistupdater
 Name[sv]=Uppdatering av adressbokens fördelningslistor
+Name[tr]=kabcdistlistupdater
+Name[uk]=kabcdistlistupdater
 Name[x-test]=xxkabcdistlistupdaterxx
 Name[zh_CN]=kabc 分发列表更新器
+Name[zh_TW]=kabcdistlistupdater
 Exec=kabcdistlistupdater --disable-autostart
 Icon=x-mail-distribution-list
 Type=Application
@@ -13,6 +44,7 @@
 Comment[da]=Værktøj til at opdatere de gamle distributionslister til de nye.
 Comment[de]=Werkzeug zum Aktualisieren alter Verteilerlisten in das neue Format.
 Comment[el]=Εργαλείο ενημέρωσης παλιών λιστών διανομής στις νέες.
+Comment[en_GB]=Tool to update the old distribution lists to the new ones.
 Comment[es]=Herramienta para actualizar viejas listas de distribuciones a nuevas.
 Comment[et]=Tööriist vanade postiloendite uuendamiseks uude vormingusse.
 Comment[fr]=Outil de conversion des anciennes listes de diffusion au nouveau format.
--- kaddressbook/features/resourceselection.desktop
+++ kaddressbook/features/resourceselection.desktop
@@ -4,12 +4,14 @@
 Name[af]=Adres boek bestuur inprop module
 Name[ar]=ملحق إدارة دفتر العناوين
 Name[be]=Утулка "Кіраванне адраснымі кнігамі"
+Name[bg]=Address Book Management Plugin
 Name[br]=Lugent melestradur ar c'harnedoù chomlec'hioù
 Name[ca]=Connector de gestió de llibretes d'adreces
 Name[cs]=Modul pro správu knih adres
 Name[da]=Plugin for adressebogshåndtering
 Name[de]=Adressbuchverwaltungs-Modul
 Name[el]=Πρόσθετο διαχείρισης βιβλίου διευθύνσεων
+Name[en_GB]=Address Book Management Plugin
 Name[eo]=Adresar-administra kromaĵo
 Name[es]=Complemento para gestionar la libreta de direcciones
 Name[et]=Aadressihalduri plugin
@@ -66,6 +68,7 @@
 Comment[da]=Plugin til at håndtere adressebøger
 Comment[de]=Modul zur Verwaltung von Adressbüchern
 Comment[el]=Πρόσθετο για τη διαχείριση βιβλίων διευθύνσεων
+Comment[en_GB]=Plugin for managing address books
 Comment[eo]=Kromaĵo por administri ddresarojn
 Comment[es]=Complemento para gestionar libretas de direcciones
 Comment[et]=Plugin aadressiraamatute haldamiseks
--- kaddressbook/features/distributionlistng.desktop
+++ kaddressbook/features/distributionlistng.desktop
@@ -6,6 +6,7 @@
 Name[da]=KAB Next Generation distributionsliste-plugin
 Name[de]=Verteilerlisten-Modul für Adressbuch (nächste Generation)
 Name[el]=Πρόσθετο λίστας διανομής επόμενης γενιάς του KAB
+Name[en_GB]=KAB Distribution List Next Generation Plugin
 Name[es]=Complemento de nueva generación de listas de distribución de KAB
 Name[et]=KAB postiloendi uue põlvkonna plugin
 Name[fr]=Module de liste de diffusion nouvelle génération pour KAB
@@ -43,6 +44,7 @@
 Comment[da]=Plugin til at håndtere distributionslister
 Comment[de]=Modul zur Verwaltung von Verteilerlisten
 Comment[el]=Πρόσθετο για τη διαχείριση λιστών διανομής
+Comment[en_GB]=Plugin for managing distribution lists
 Comment[eo]=Kromaĵo por administri distribulistojn
 Comment[es]=Complemento para gestionar listas de distribución
 Comment[et]=Plugin postiloendite haldamiseks
--- plugins/kmail/bodypartformatter/text_calendar.desktop
+++ plugins/kmail/bodypartformatter/text_calendar.desktop
@@ -2,24 +2,36 @@
 Name=Application Octetstream
 Name[af]=Application/Octet-stream
 Name[ar]=تطبيق ثماني التدفق
+Name[bg]=Application Octetstream
 Name[ca]=Aplicació Octetstream
 Name[cs]=Aplikace octetstream
 Name[da]=Program oktetstrøm
+Name[de]=Application Octetstream
+Name[el]=Application Octetstream
+Name[en_GB]=Application Octetstream
 Name[eo]=Aplikaĵa Bitokfluo
+Name[es]=Application Octetstream
+Name[et]=Application Octetstream
 Name[eu]=Aplikazioa/zortzikote-jarioa
 Name[fa]=Octetstream کاربرد
 Name[fi]=Octetstream-sovellus
 Name[fr]=Application octetstream
 Name[fy]=Applikaasje octetstream
+Name[ga]=Application Octetstream
 Name[gl]=Aplicación Octetstream
 Name[hu]=Alkalmazás-adatfolyam
+Name[is]=Application Octetstream
+Name[it]=Application Octetstream
 Name[ja]=アプリケーション/オクテットストリーム
 Name[ka]=რვადინებიანი პროგრამა
 Name[kk]=Қолданбаның бинарлы ағымы
 Name[km]=Octetstream កម្មវិធី
+Name[ko]=Application Octetstream
+Name[lt]=Application Octetstream
 Name[lv]=Programma oktetu virkne
 Name[ms]=Aliran Oktet  Aplikasi
 Name[nb]=Program Octetstrøm
+Name[nds]=Application Octetstream
 Name[ne]=अक्टेस्ट्रिम अनुप्रयोग
 Name[nl]=Applicatie octetstroom
 Name[nn]=Oktettstraum frå program
@@ -27,13 +39,16 @@
 Name[pt]=Aplicação Sequência Binária
 Name[pt_BR]=Aplicativo Octetstream
 Name[ru]=Двоичный поток приложения
+Name[sk]=Application Octetstream
 Name[sl]=Programski Octetstream
 Name[sv]=Program-oktettström
 Name[ta]=பயன்பாட்டு எண்மம்
 Name[tg]=Миқдори зиёди бинарии барномот
 Name[tr]=Uygulama Sekizli Akışı
+Name[uk]=Application Octetstream
 Name[x-test]=xxApplication Octetstreamxx
 Name[zh_CN]=应用程序 Octetstream
+Name[zh_TW]=Application Octetstream
 Comment=A bodypart formatter plugin for text/calendar
 Comment[af]='n Data (boodskap lyf) formateer inprop module vir 'text/calendar'
 Comment[ar]=ملحق منسق جزء الجسم لنص/تقويم
@@ -43,6 +58,7 @@
 Comment[da]=Et bodypart formateringsplugin for text/calendar
 Comment[de]=Ein Textinhalt-Formatierer für text/calendar
 Comment[el]=Ένα πρόσθετο μορφοποιητή για text/calendar
+Comment[en_GB]=A bodypart formatter plugin for text/calendar
 Comment[es]=Un complemento de formato para el cuerpo de text/calendar
 Comment[et]=Põhiosa vormindamisplugin (MIME tüübile text/calendar)
 Comment[eu]=Testu/egutegientzako gorputz-zati formateatzaile bat
--- plugins/kmail/bodypartformatter/text_vcard.desktop
+++ plugins/kmail/bodypartformatter/text_vcard.desktop
@@ -2,24 +2,36 @@
 Name=Application Octetstream
 Name[af]=Application/Octet-stream
 Name[ar]=تطبيق ثماني التدفق
+Name[bg]=Application Octetstream
 Name[ca]=Aplicació Octetstream
 Name[cs]=Aplikace octetstream
 Name[da]=Program oktetstrøm
+Name[de]=Application Octetstream
+Name[el]=Application Octetstream
+Name[en_GB]=Application Octetstream
 Name[eo]=Aplikaĵa Bitokfluo
+Name[es]=Application Octetstream
+Name[et]=Application Octetstream
 Name[eu]=Aplikazioa/zortzikote-jarioa
 Name[fa]=Octetstream کاربرد
 Name[fi]=Octetstream-sovellus
 Name[fr]=Application octetstream
 Name[fy]=Applikaasje octetstream
+Name[ga]=Application Octetstream
 Name[gl]=Aplicación Octetstream
 Name[hu]=Alkalmazás-adatfolyam
+Name[is]=Application Octetstream
+Name[it]=Application Octetstream
 Name[ja]=アプリケーション/オクテットストリーム
 Name[ka]=რვადინებიანი პროგრამა
 Name[kk]=Қолданбаның бинарлы ағымы
 Name[km]=Octetstream កម្មវិធី
+Name[ko]=Application Octetstream
+Name[lt]=Application Octetstream
 Name[lv]=Programma oktetu virkne
 Name[ms]=Aliran Oktet  Aplikasi
 Name[nb]=Program Octetstrøm
+Name[nds]=Application Octetstream
 Name[ne]=अक्टेस्ट्रिम अनुप्रयोग
 Name[nl]=Applicatie octetstroom
 Name[nn]=Oktettstraum frå program
@@ -27,13 +39,16 @@
 Name[pt]=Aplicação Sequência Binária
 Name[pt_BR]=Aplicativo Octetstream
 Name[ru]=Двоичный поток приложения
+Name[sk]=Application Octetstream
 Name[sl]=Programski Octetstream
 Name[sv]=Program-oktettström
 Name[ta]=பயன்பாட்டு எண்மம்
 Name[tg]=Миқдори зиёди бинарии барномот
 Name[tr]=Uygulama Sekizli Akışı
+Name[uk]=Application Octetstream
 Name[x-test]=xxApplication Octetstreamxx
 Name[zh_CN]=应用程序 Octetstream
+Name[zh_TW]=Application Octetstream
 Comment=A bodypart formatter plugin for text/vcard
 Comment[af]='n Data (boodskap lyf) formateer inprop module vir 'text/vcard'
 Comment[ar]=ملحق منسق جزء الجسم لنص/vcard
@@ -44,6 +59,7 @@
 Comment[da]=Et bodypart formateringsplugin for text/vcard
 Comment[de]=Ein Textinhalt-Formatierer für text/vcard
 Comment[el]=Ένα πρόσθετο μορφοποιητή για text/vcard
+Comment[en_GB]=A bodypart formatter plugin for text/vcard
 Comment[es]=Un complemento de formato para el cuerpo de text/vcard
 Comment[et]=Põhiosa vormindamisplugin (MIME tüübile text/vcard)
 Comment[eu]=Testu/vcard-en gorputz-zati formateatzaile bat
--- plugins/kmail/bodypartformatter/text_xdiff.desktop
+++ plugins/kmail/bodypartformatter/text_xdiff.desktop
@@ -2,24 +2,36 @@
 Name=Application Octetstream
 Name[af]=Application/Octet-stream
 Name[ar]=تطبيق ثماني التدفق
+Name[bg]=Application Octetstream
 Name[ca]=Aplicació Octetstream
 Name[cs]=Aplikace octetstream
 Name[da]=Program oktetstrøm
+Name[de]=Application Octetstream
+Name[el]=Application Octetstream
+Name[en_GB]=Application Octetstream
 Name[eo]=Aplikaĵa Bitokfluo
+Name[es]=Application Octetstream
+Name[et]=Application Octetstream
 Name[eu]=Aplikazioa/zortzikote-jarioa
 Name[fa]=Octetstream کاربرد
 Name[fi]=Octetstream-sovellus
 Name[fr]=Application octetstream
 Name[fy]=Applikaasje octetstream
+Name[ga]=Application Octetstream
 Name[gl]=Aplicación Octetstream
 Name[hu]=Alkalmazás-adatfolyam
+Name[is]=Application Octetstream
+Name[it]=Application Octetstream
 Name[ja]=アプリケーション/オクテットストリーム
 Name[ka]=რვადინებიანი პროგრამა
 Name[kk]=Қолданбаның бинарлы ағымы
 Name[km]=Octetstream កម្មវិធី
+Name[ko]=Application Octetstream
+Name[lt]=Application Octetstream
 Name[lv]=Programma oktetu virkne
 Name[ms]=Aliran Oktet  Aplikasi
 Name[nb]=Program Octetstrøm
+Name[nds]=Application Octetstream
 Name[ne]=अक्टेस्ट्रिम अनुप्रयोग
 Name[nl]=Applicatie octetstroom
 Name[nn]=Oktettstraum frå program
@@ -27,13 +39,16 @@
 Name[pt]=Aplicação Sequência Binária
 Name[pt_BR]=Aplicativo Octetstream
 Name[ru]=Двоичный поток приложения
+Name[sk]=Application Octetstream
 Name[sl]=Programski Octetstream
 Name[sv]=Program-oktettström
 Name[ta]=பயன்பாட்டு எண்மம்
 Name[tg]=Миқдори зиёди бинарии барномот
 Name[tr]=Uygulama Sekizli Akışı
+Name[uk]=Application Octetstream
 Name[x-test]=xxApplication Octetstreamxx
 Name[zh_CN]=应用程序 Octetstream
+Name[zh_TW]=Application Octetstream
 Comment=A bodypart formatter plugin for text/x-patch
 Comment[ar]=ملحق منسق جزء الجسم لنص/x-patch
 Comment[bg]=Редактор с поддръжка на форматиране за текст/x-diff
@@ -42,6 +57,7 @@
 Comment[da]=Et bodypart formaterings-plugin for text/x-patch
 Comment[de]=Ein Inhaltsformatierungs-Modul für text/x-patch
 Comment[el]=Ένα πρόσθετο μορφοποιητή για text/x-patch
+Comment[en_GB]=A bodypart formatter plugin for text/x-patch
 Comment[es]=Un complemento de formato para el cuerpo de text/x-patch
 Comment[et]=Põhiosa vormindamisplugin (MIME tüübile text/x-patch)
 Comment[fa]=یک وصلۀ قالب‌دهندۀ جزء بدنه برای text/x-patch
--- kdepim-version.h
+++ kdepim-version.h
@@ -58,6 +58,6 @@
     3.2 alpha1
 */
 
-#define KDEPIM_VERSION "4.3.1"
+#define KDEPIM_VERSION "4.3.2"
 
 #endif
--- kitchensync/src/kitchensync.desktop
+++ kitchensync/src/kitchensync.desktop
@@ -1,7 +1,46 @@
 [Desktop Entry]
 Name=KitchenSync
+Name[ar]=KitchenSync
+Name[bg]=KitchenSync
+Name[ca]=KitchenSync
+Name[cs]=KitchenSync
+Name[da]=KitchenSync
+Name[de]=KitchenSync
+Name[el]=KitchenSync
+Name[en_GB]=KitchenSync
+Name[es]=KitchenSync
+Name[et]=KitchenSync
+Name[fi]=KitchenSync
+Name[fr]=KitchenSync
+Name[fy]=KitchenSync
+Name[ga]=KitchenSync
+Name[gl]=KitchenSync
+Name[it]=KitchenSync
+Name[ja]=KitchenSync
+Name[kk]=KitchenSync
+Name[km]=KitchenSync
+Name[ko]=KitchenSync
+Name[lt]=KitchenSync
+Name[lv]=KitchenSync
+Name[nb]=KitchenSync
+Name[nds]=KitchenSync
+Name[ne]=KitchenSync
+Name[nl]=KitchenSync
+Name[nn]=KitchenSync
+Name[pa]=KitchenSync
+Name[pl]=KitchenSync
+Name[pt]=KitchenSync
+Name[pt_BR]=KitchenSync
+Name[ro]=KitchenSync
+Name[ru]=KitchenSync
+Name[sk]=KitchenSync
+Name[sl]=KitchenSync
 Name[sv]=Kitchensync
+Name[tr]=KitchenSync
+Name[uk]=KitchenSync
 Name[x-test]=xxKitchenSyncxx
+Name[zh_CN]=KitchenSync
+Name[zh_TW]=KitchenSync
 GenericName=Synchronization
 GenericName[af]=Sinkronisasie
 GenericName[ar]=المزامنة
--- ktimetracker/ktimetrackerpart.cpp
+++ ktimetracker/ktimetrackerpart.cpp
@@ -60,31 +60,6 @@
   setWidget( mMainWidget );
   setXMLFile( "ktimetrackerui.rc" );
   makeMenus();
-  mMainWidget->openFile( KStandardDirs::locateLocal( "data", 
-                        QString::fromLatin1( "ktimetracker/ktimetracker.ics" ) ) );
-  emit setWindowCaption( KStandardDirs::locateLocal( "data", QString::fromLatin1( "ktimetracker/ktimetracker.ics" ) ) );
-  // connections
-  connect( mMainWidget, SIGNAL( totalTimesChanged( long, long ) ),
-           this, SLOT( updateTime( long, long ) ) );
-  connect( mMainWidget, SIGNAL( statusBarTextChangeRequested( QString ) ),
-                 this, SLOT( setStatusBar( QString ) ) );
-  connect( mMainWidget, SIGNAL( setCaption( const QString& ) ),
-                 this, SIGNAL( setWindowCaption( const QString& ) ) );
-  // Setup context menu request handling
-  connect( mMainWidget,
-           SIGNAL( contextMenuRequested( const QPoint& ) ),
-           this,
-           SLOT( taskViewCustomContextMenuRequested( const QPoint& ) ) );
-
-  if ( KTimeTrackerSettings::trayIcon() ) mTray = new TrayIcon( this );
-  else mTray = new TrayIcon( );
-
-  connect( mTray, SIGNAL( quitSelected() ), SLOT( quit() ) );
-
-  connect( mMainWidget, SIGNAL( timersActive() ), mTray, SLOT( startClock() ) );
-  connect( mMainWidget, SIGNAL( timersInactive() ), mTray, SLOT( stopClock() ) );
-  connect( mMainWidget, SIGNAL( tasksChanged( const QList<Task*>& ) ),
-           mTray, SLOT( updateToolTip( QList<Task*> ) ));
 }
 
 ktimetrackerpart::~ktimetrackerpart()
@@ -93,12 +68,12 @@
 
 KAboutData *ktimetrackerpart::createAboutData()
 {
-  const QByteArray& ba=QByteArray("test");
-  const KLocalizedString name=ki18n("myName");
-  KAboutData* aboutData=new KAboutData( ba, ba, name, ba, name);
+  const QByteArray& appname=QByteArray("ktimetracker");
+  const QByteArray& catalogname=QByteArray("ktimetracker");
+  const KLocalizedString localizedname=ki18n("ktimetracker");
+  const QByteArray version=QByteArray(KTIMETRACKER_VERSION);
+  KAboutData* aboutData=new KAboutData( appname, catalogname, localizedname, version);
   return aboutData;
-  //return KABCore::createAboutData();
-  #warning not implemented
 }
 
 void ktimetrackerpart::makeMenus()
@@ -121,13 +96,35 @@
   emit setStatusBarText(qs);
 }
 
-bool ktimetrackerpart::openFile()
+bool ktimetrackerpart::openFile(QString icsfile)
 {
-  mMainWidget->openFile();
+  mMainWidget->openFile(icsfile);
+  emit setWindowCaption(icsfile);
+
+  if ( KTimeTrackerSettings::trayIcon() ) mTray = new TrayIcon( this );
+  else mTray = new TrayIcon( );
+
+  // connections
+  connect( mMainWidget, SIGNAL( totalTimesChanged( long, long ) ),
+           this, SLOT( updateTime( long, long ) ) );
+  connect( mMainWidget, SIGNAL( statusBarTextChangeRequested( QString ) ),
+                 this, SLOT( setStatusBar( QString ) ) );
+  connect( mMainWidget, SIGNAL( setCaption( const QString& ) ),
+                 this, SIGNAL( setWindowCaption( const QString& ) ) );
+  connect( mTray, SIGNAL( quitSelected() ), SLOT( quit() ) );
+  connect( mMainWidget, SIGNAL( timersActive() ), mTray, SLOT( startClock() ) );
+  connect( mMainWidget, SIGNAL( timersInactive() ), mTray, SLOT( stopClock() ) );
+  connect( mMainWidget, SIGNAL( tasksChanged( const QList<Task*>& ) ),
+           mTray, SLOT( updateToolTip( QList<Task*> ) ));
 
   return true;
 }
 
+bool ktimetrackerpart::openFile()
+{
+  return openFile(KStandardDirs::locateLocal( "data", QString::fromLatin1( "ktimetracker/ktimetracker.ics" ) ));
+}
+
 bool ktimetrackerpart::saveFile()
 {
   mMainWidget->saveFile();
--- ktimetracker/ktimetracker_config_storage.desktop
+++ ktimetracker/ktimetracker_config_storage.desktop
@@ -18,6 +18,7 @@
 Name[da]=Lagring
 Name[de]=Speichern
 Name[el]=Αποθήκευση
+Name[en_GB]=Storage
 Name[es]=Almacenamiento
 Name[et]=Salvesti
 Name[fr]=Stockage
@@ -49,6 +50,7 @@
 Comment[da]=Indstil lagring
 Comment[de]=Einstellungen zum Speichern einrichten
 Comment[el]=Ρύθμιση αποθήκευσης
+Comment[en_GB]=Configure Storage
 Comment[es]=Configurar almacenamiento
 Comment[et]=Salvesti seadistamine
 Comment[fr]=Configuration du stockage
--- ktimetracker/ktimetrackerpart.desktop
+++ ktimetracker/ktimetrackerpart.desktop
@@ -6,6 +6,7 @@
 Name[da]=KTimeTracker-komponent
 Name[de]=Zeiterfassungs-Komponente
 Name[el]=Συστατικό KTimeTracker
+Name[en_GB]=KTimeTracker Component
 Name[es]=Componente de KTimeTracker
 Name[et]=KTimeTrackeri komponent
 Name[fr]=Composant KTimeTracker
--- ktimetracker/mainwindow.cpp
+++ ktimetracker/mainwindow.cpp
@@ -62,7 +62,7 @@
   {
     // now that the Part is loaded, we cast it to a Part to get
     // our hands on it
-    m_part = static_cast<KParts::ReadWritePart *>
+    m_part = static_cast<ktimetrackerpart *>
        (factory->create(this, "ktimetrackerpart" ));
 
     if (m_part)
@@ -73,7 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
-      ((TimetrackerWidget *) (m_part->widget()))->setupActions( actionCollection() );
+      m_part->openFile(icsfile);
       setupGUI();
     }
   }
--- ktimetracker/ktimetrackerpart.h
+++ ktimetracker/ktimetrackerpart.h
@@ -57,10 +57,16 @@
 
     virtual ~ktimetrackerpart();
     static KAboutData *createAboutData();
-
+    /**
+     * openFile() opens the icalendar file that contains the tasks and events.
+     * It has been inherited from KParts::ReadWritePart where it was protected
+     * openFile() just calls openFile(<standard ical file>).
+     */
+    virtual bool openFile();
+    virtual bool openFile(QString icsfile);
+    
 protected:
     virtual bool saveFile();
-    virtual bool openFile();
 
 public Q_SLOTS:
    void setStatusBar(const QString & qs);
--- ktimetracker/ktimetracker_config_display.desktop
+++ ktimetracker/ktimetracker_config_display.desktop
@@ -12,6 +12,7 @@
 X-KDE-Weight=700
 
 Name=Appearance
+Name[af]=Appearance
 Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
@@ -22,6 +23,7 @@
 Name[da]=Udseende
 Name[de]=Erscheinungsbild
 Name[el]=Εμφάνιση
+Name[en_GB]=Appearance
 Name[eo]=Prezentado
 Name[es]=Apariencia
 Name[et]=Välimus
@@ -80,6 +82,7 @@
 Comment[da]=Indstil udseende
 Comment[de]=Erscheinungsbild einrichten
 Comment[el]=Ρύθμιση εμφάνισης
+Comment[en_GB]=Configure Appearance
 Comment[es]=Configurar apariencia
 Comment[et]=Välimuse seadistamine
 Comment[fr]=Configuration de l'apparence
--- ktimetracker/version.h
+++ ktimetracker/version.h
@@ -20,5 +20,5 @@
  */
 
 #ifndef KTIMETRACKER_VERSION
-#define KTIMETRACKER_VERSION "4.3.0"
+#define KTIMETRACKER_VERSION "4.3.1"
 #endif
--- ktimetracker/mainwindow.h
+++ ktimetracker/mainwindow.h
@@ -23,7 +23,7 @@
 #define KARM_MAIN_WINDOW_H
 
 #include <KParts/MainWindow>
-
+#include "ktimetrackerpart.h"
 #include "reportcriteria.h"
 
 class KAccel;
@@ -57,7 +57,7 @@
     TimetrackerWidget *mainWidget;
 
     friend class TrayIcon;
-    KParts::ReadWritePart *m_part;
+    ktimetrackerpart *m_part;
 
   public:
     MainWindow( const QString &icsfile = "" );
--- ktimetracker/support/ktimetracker.desktop
+++ ktimetracker/support/ktimetracker.desktop
@@ -1,12 +1,45 @@
 [Desktop Entry]
 Name=KTimeTracker
 Name[ar]=مقتفي الوقت
+Name[ca]=KTimeTracker
+Name[cs]=KTimeTracker
+Name[da]=KTimeTracker
 Name[de]=KDE-Zeitplaner
+Name[el]=KTimeTracker
+Name[en_GB]=KTimeTracker
+Name[es]=KTimeTracker
+Name[et]=KTimeTracker
+Name[fi]=KTimeTracker
+Name[fr]=KTimeTracker
+Name[ga]=KTimeTracker
+Name[gl]=KTimeTracker
+Name[hu]=KTimeTracker
+Name[is]=KTimeTracker
+Name[it]=KTimeTracker
+Name[ja]=KTimeTracker
+Name[kk]=KTimeTracker
 Name[km]=កម្មវិធីតាមដានរបស់ KTime
+Name[ko]=KTimeTracker
+Name[lt]=KTimeTracker
+Name[lv]=KTimeTracker
+Name[nb]=KTimeTracker
+Name[nds]=KTimeTracker
 Name[ne]=केडीई समय ट्रयाकर
+Name[nl]=KTimeTracker
+Name[nn]=KTimeTracker
+Name[pa]=KTimeTracker
 Name[pl]=Osobisty czasomierz
+Name[pt]=KTimeTracker
+Name[pt_BR]=KTimeTracker
+Name[ro]=KTimeTracker
+Name[ru]=KTimeTracker
+Name[sl]=KTimeTracker
 Name[sv]=Ktimetracker
+Name[tr]=KTimeTracker
+Name[uk]=KTimeTracker
 Name[x-test]=xxKTimeTrackerxx
+Name[zh_CN]=KTimeTracker
+Name[zh_TW]=KTimeTracker
 GenericName=Personal Time Tracker
 GenericName[af]=Persoonlike Tyd Volger
 GenericName[ar]=مقتفي الوقت الشخصي
@@ -18,6 +51,7 @@
 GenericName[da]=Personlig tidsoversigt
 GenericName[de]=Zeiterfassung
 GenericName[el]=Προσωπικός καταγραφέας χρόνου
+GenericName[en_GB]=Personal Time Tracker
 GenericName[eo]=Tempomezurilo por viaj aktivecoj
 GenericName[es]=Gestor personal del tiempo
 GenericName[et]=Personaalne ajaarvestus
--- kjots/Kjots.desktop
+++ kjots/Kjots.desktop
@@ -2,10 +2,42 @@
 X-DocPath=kjots/index.html
 Name=KJots
 Name[ar]=ملاحظات KJots
+Name[bg]=KJots
+Name[ca]=KJots
+Name[cs]=KJots
+Name[da]=KJots
+Name[de]=KJots
+Name[el]=KJots
+Name[en_GB]=KJots
+Name[es]=KJots
+Name[et]=KJots
+Name[fr]=KJots
+Name[ga]=KJots
+Name[gl]=KJots
+Name[hu]=KJots
+Name[it]=KJots
+Name[ja]=KJots
+Name[km]=KJots
+Name[ko]=KJots
+Name[lt]=KJots
+Name[lv]=KJots
+Name[nb]=KJots
+Name[nds]=KJots
+Name[nl]=KJots
+Name[nn]=KJots
 Name[pa]=ਕੇ-ਜੋਟਸ
 Name[pl]=Notatki
+Name[pt]=KJots
+Name[pt_BR]=KJots
+Name[ro]=KJots
+Name[ru]=KJots
+Name[sl]=KJots
 Name[sv]=Kjots
+Name[tr]=KJots
+Name[uk]=KJots
 Name[x-test]=xxKJotsxx
+Name[zh_CN]=KJots
+Name[zh_TW]=KJots
 GenericName=Note Taker
 GenericName[ar]=آخذ الملاحظات
 GenericName[ca]=Bloc de notes
@@ -13,6 +45,7 @@
 GenericName[da]=Notetager
 GenericName[de]=Elektronischer Notizblock
 GenericName[el]=Σημειώσεις
+GenericName[en_GB]=Note Taker
 GenericName[es]=Apuntador de notas
 GenericName[et]=Märkmete rakendus
 GenericName[fr]=Prise de note
--- kjots/kjotspart.desktop
+++ kjots/kjotspart.desktop
@@ -1,12 +1,42 @@
 [Desktop Entry]
 Name=KJotsPart
+Name[ar]=KJotsPart
+Name[bg]=KJotsPart
+Name[ca]=KJotsPart
+Name[cs]=KJotsPart
+Name[da]=KJotsPart
+Name[de]=KJotsPart
+Name[el]=KJotsPart
+Name[en_GB]=KJotsPart
+Name[es]=KJotsPart
+Name[et]=KJotsPart
+Name[fr]=KJotsPart
+Name[ga]=KJotsPart
+Name[gl]=KJotsPart
+Name[hu]=KJotsPart
+Name[it]=KJotsPart
+Name[ja]=KJotsPart
+Name[km]=KJotsPart
+Name[ko]=KJotsPart
 Name[lt]=KJots dalis
+Name[lv]=KJotsPart
+Name[nb]=KJotsPart
+Name[nds]=KJotsPart
+Name[nl]=KJotsPart
 Name[nn]=KJots-del
 Name[pa]=ਕੇਜੋਟਸਪਾਰਟ
 Name[pl]=Moduł Notatek
+Name[pt]=KJotsPart
+Name[pt_BR]=KJotsPart
+Name[ro]=KJotsPart
+Name[ru]=KJotsPart
+Name[sl]=KJotsPart
 Name[sv]=Kjots-delprogram
+Name[tr]=KJotsPart
+Name[uk]=KJotsPart
 Name[x-test]=xxKJotsPartxx
 Name[zh_CN]=KJots 组件
+Name[zh_TW]=KJotsPart
 MimeType=text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;
 X-KDE-ServiceTypes=KParts/ReadOnlyPart
 X-KDE-Library=kjotspart
--- kjots/kjots_config_misc.desktop
+++ kjots/kjots_config_misc.desktop
@@ -24,6 +24,7 @@
 Name[da]=Diverse
 Name[de]=Diverses
 Name[el]=Διάφορα
+Name[en_GB]=Misc
 Name[es]=Varios
 Name[et]=Muud
 Name[eu]=Miszelanea
@@ -78,10 +79,11 @@
 Comment[da]=Diverse opsætning til KJots
 Comment[de]=Verschiedene Einstellungen für KJots
 Comment[el]=Διάφορες ρυθμίσεις για το KJots
+Comment[en_GB]=Setup misc for KJots
 Comment[es]=Configuraciones varias de KJots
 Comment[et]=KJotsi muud seadistused
 Comment[fr]=Configuration (divers) de KJots
-Comment[gl]=Configurar opcións varias do KJots
+Comment[gl]=Configuración de opcións varias do KJots
 Comment[it]=Impostazioni varie per KJots
 Comment[km]=ការដំឡើងផ្សេងៗសម្រាប់ KJots
 Comment[lv]=Dažādi KJots iestatījumi
--- libkdepim/ktimezonecombobox.cpp
+++ libkdepim/ktimezonecombobox.cpp
@@ -116,7 +116,16 @@
 KDateTime::Spec KTimeZoneComboBox::selectedTimeSpec()
 {
   KDateTime::Spec spec;
-  spec.setType( KSystemTimeZones::zone( d->mZones[currentIndex()] ) );
+  if ( currentIndex() == 0 ) { // Floating event
+    spec = KDateTime::Spec( KDateTime::ClockTime );
+  }
+  else if ( currentIndex() == 1 ) { // UTC
+    spec.setType( KDateTime::UTC );
+  }
+  else {
+    spec.setType( KSystemTimeZones::zone( d->mZones[currentIndex()] ) );
+  }
+
   return spec;
 }
 
--- libkdepim/addresseelineedit.cpp
+++ libkdepim/addresseelineedit.cpp
@@ -800,7 +800,7 @@
 
 void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
 {
-  if ( s_LDAPLineEdit != this ) {
+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
     return;
   }
 
@@ -817,7 +817,8 @@
     setText( m_previousAddresses + m_searchString );
     // only complete again if the user didn't change the selection while
     // we were waiting; otherwise the completion box will be closed
-    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
+    QListWidgetItem *current = completionBox()->currentItem();
+    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
       doCompletion( m_lastSearchMode );
     }
   }
--- libkdepim/foldertreewidget.cpp
+++ libkdepim/foldertreewidget.cpp
@@ -34,6 +34,7 @@
 #include <QStyle>
 #include <QPainter>
 #include <QFontMetrics>
+#include <QApplication>
 
 #define FOLDERTREEWIDGETITEM_TYPE ( QTreeWidgetItem::UserType + 0xcafe )
 
@@ -88,8 +89,6 @@
     if ( !item )
       return; // ugh :/
 
-    // FIXME: opt->direction == Qt::RightToLeft ?
-
     // draw the labelText().
     QRect textRect = style->subElementRect( QStyle::SE_ItemViewItemText, &opt, mFolderTreeWidget );
     textRect.setWidth( textRect.width() - ITEM_LABEL_RIGHT_MARGIN );
@@ -164,7 +163,10 @@
 
         painter->drawText( textRect, Qt::AlignLeft | Qt::TextSingleLine | Qt::AlignVCenter, label );
 
-        textRect.setLeft( textRect.left() + labelWidth + ITEM_LABEL_TO_UNREADCOUNT_SPACING );
+        if ( QApplication::isLeftToRight() )
+          textRect.setLeft( textRect.left() + labelWidth + ITEM_LABEL_TO_UNREADCOUNT_SPACING );
+        else
+          textRect.setRight( textRect.right() - labelWidth - ITEM_LABEL_TO_UNREADCOUNT_SPACING );
 
         if ( !( opt.state & QStyle::State_Selected ) ) {
           painter->setPen( QPen( mFolderTreeWidget->unreadCountColor(), 0 ) );
--- console/kabcclient/doc/examples/letters/work_address.desktop
+++ console/kabcclient/doc/examples/letters/work_address.desktop
@@ -9,6 +9,7 @@
 Name[da]=Postadresse erhverv/arbejde
 Name[de]=Postanschrift (geschäftlich)
 Name[el]=Διευθύνσεις επιχείρησης/εργασίας αλληλογραφίας
+Name[en_GB]=Letter business/work address
 Name[es]=Dirección postal de negocios/del trabajo
 Name[et]=Kirja äri/tööaadress
 Name[fr]=Adresse postale professionnelle
--- console/kabcclient/doc/examples/letters/home_address.desktop
+++ console/kabcclient/doc/examples/letters/home_address.desktop
@@ -9,6 +9,7 @@
 Name[da]=Postadresse hjemme/privat
 Name[de]=Postanschrift (privat)
 Name[el]=Διευθύνσεις οικιακής/προσωπικής αλληλογραφίας
+Name[en_GB]=Letter home/private address
 Name[es]=Dirección postal personal/privada
 Name[et]=Kirja kodune/era-aadress
 Name[fr]=Adresse postale personnelle
--- console/konsolekalendar/konsolekalendar.desktop
+++ console/konsolekalendar/konsolekalendar.desktop
@@ -1,12 +1,36 @@
 [Desktop Entry]
 Name=KonsoleKalendar
 Name[af]=Konsole Kalender
+Name[ar]=KonsoleKalendar
+Name[bg]=KonsoleKalendar
+Name[br]=KonsoleKalendar
+Name[ca]=KonsoleKalendar
 Name[cs]=Konzolový kalendář
+Name[cy]=KonsoleKalendar
+Name[da]=KonsoleKalendar
 Name[de]=Konsolen-Kalender
+Name[el]=KonsoleKalendar
+Name[en_GB]=KonsoleKalendar
 Name[eo]=KonzolKalendaro
+Name[es]=KonsoleKalendar
+Name[et]=KonsoleKalendar
+Name[eu]=KonsoleKalendar
+Name[fi]=KonsoleKalendar
+Name[fr]=KonsoleKalendar
 Name[fy]=Konsole-aginda
+Name[ga]=KonsoleKalendar
+Name[gl]=KonsoleKalendar
+Name[he]=KonsoleKalendar
 Name[hu]=Konsole-naptár
+Name[is]=KonsoleKalendar
+Name[it]=KonsoleKalendar
 Name[ja]=コンソールカレンダー
+Name[ka]=KonsoleKalendar
+Name[kk]=KonsoleKalendar
+Name[km]=KonsoleKalendar
+Name[ko]=KonsoleKalendar
+Name[lt]=KonsoleKalendar
+Name[lv]=KonsoleKalendar
 Name[mk]=КонзоленКалендар
 Name[ms]=Kalendar Konsole
 Name[nb]=KonsoleKalender
@@ -15,10 +39,22 @@
 Name[nl]=Konsole-agenda
 Name[nn]=Konsollkalender
 Name[pa]=ਕਨਸੋਲ-ਕੈਲੰਡਰ
+Name[pl]=KonsoleKalendar
+Name[pt]=KonsoleKalendar
+Name[pt_BR]=KonsoleKalendar
 Name[ro]=Calendar de consolă
+Name[ru]=KonsoleKalendar
+Name[se]=KonsoleKalendar
+Name[sk]=KonsoleKalendar
+Name[sl]=KonsoleKalendar
+Name[sv]=KonsoleKalendar
 Name[ta]=கான்சோல் நாள்காட்டி
+Name[tg]=KonsoleKalendar
+Name[tr]=KonsoleKalendar
 Name[uk]=Календар для консолі
 Name[x-test]=xxKonsoleKalendarxx
+Name[zh_CN]=KonsoleKalendar
+Name[zh_TW]=KonsoleKalendar
 Exec=kdialog --sorry "konsolekalendar is a command-line only program.  Please read the handbook at help:/konsolekalendar for more info."
 Icon=konsolekalendar
 Type=Application
--- kpilot/conduits/notepadconduit/notepad-conduit.desktop
+++ kpilot/conduits/notepadconduit/notepad-conduit.desktop
@@ -1,24 +1,54 @@
 [Desktop Entry]
 Type=Service
 Name=NotePad
+Name[af]=NotePad
+Name[ar]=NotePad
+Name[bg]=NotePad
+Name[br]=NotePad
+Name[ca]=NotePad
 Name[cs]=Poznámkový blok
 Name[da]=Notesblok
 Name[de]=Notizen
+Name[el]=NotePad
+Name[en_GB]=NotePad
+Name[es]=NotePad
+Name[et]=NotePad
+Name[eu]=NotePad
 Name[fa]=یادداشت
 Name[fi]=Muistio
 Name[fr]=Notes
+Name[fy]=NotePad
+Name[ga]=NotePad
 Name[gl]=Caderno de Notas
 Name[hu]=Notepad
+Name[is]=NotePad
+Name[it]=NotePad
+Name[ja]=NotePad
+Name[ka]=NotePad
+Name[km]=NotePad
+Name[ko]=NotePad
+Name[lt]=NotePad
 Name[lv]=Piezīmju blociņš
+Name[ms]=NotePad
 Name[nb]=NotisBlokk
+Name[nds]=NotePad
 Name[ne]=नोटप्याड
+Name[nl]=NotePad
+Name[nn]=NotePad
 Name[pa]=ਨੋਟ-ਪੈਡ
 Name[pl]=Notatnik
+Name[pt]=NotePad
+Name[pt_BR]=NotePad
+Name[ro]=NotePad
 Name[ru]=Примечания
+Name[sk]=NotePad
+Name[sl]=NotePad
 Name[sv]=Anteckningar
 Name[ta]=நோட்பேட்
 Name[tg]=Эзоҳот
 Name[th]=แผ่นบันทึก
+Name[tr]=NotePad
+Name[uk]=NotePad
 Name[x-test]=xxNotePadxx
 Name[zh_CN]=记事本
 Name[zh_TW]=筆記本
@@ -31,6 +61,7 @@
 Comment[da]=Denne kanal sikkerhedskopierer NotePad's tegninger til en lokal mappe.
 Comment[de]=Diese Erweiterung (Conduit) sichert NotePad-Zeichnungen in einen lokalen Ordner.
 Comment[el]=Αυτός ο σύνδεσμος δημιουργεί αντίγραφα ασφαλείας σχεδίων του NotePad σε έναν τοπικό φάκελο.
+Comment[en_GB]=This conduit backs up NotePad drawings to a local folder.
 Comment[es]=Este conducto hace una copia de respaldo de los dibujos de NotePad en una carpeta local.
 Comment[et]=See kanal teeb NotePadi joonistustest varukoopia kohalikku kataloogi.
 Comment[eu]=Kanal honek Ohar-blokaren marrazkiak karpeta lokal batera gordetzen ditu.
--- kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
+++ kpilot/conduits/sysinfoconduit/sysinfo_conduit.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Denne kanal skriver information om din håndholdte og synkroniseringen til en fil.
 Comment[de]=Schreibt Daten zum Taschencomputer und den Abgleich in eine Datei
 Comment[el]=Αυτός ο σύνδεσμος γράφει πληροφορίες σχετικά με τον υπολογιστή παλάμης σας και το συγχρονισμό προς ένα αρχείο.
+Comment[en_GB]=This conduit writes information about your handheld and the sync to a file.
 Comment[es]=Este conducto escribe información sobre la agenda electrónica y la sincronización en un archivo.
 Comment[et]=See kanal salvestab info pihuarvuti kohta failina.
 Comment[eu]=Kanal honek zure agenda elektronikoari buruzko informazioa eta sinkronizazio fitxategi batean gordetzen ditu.
@@ -50,6 +51,7 @@
 Name[af]=Stelsel informasie
 Name[ar]=معلومات النظام
 Name[be]=Сістэмная інфармацыя
+Name[bg]=System Information
 Name[br]=Titouroù diwar-benn ar reizhiad
 Name[ca]=Sistema d'informació
 Name[cs]=Informace o systému
@@ -57,6 +59,7 @@
 Name[da]=Systeminformation
 Name[de]=System-Information
 Name[el]=Πληροφορίες συστήματος
+Name[en_GB]=System Information
 Name[eo]=Sisteminformoj
 Name[es]=Información del sistema
 Name[et]=Süsteemi info
--- kpilot/conduits/memofileconduit/memofile-conduit.desktop
+++ kpilot/conduits/memofileconduit/memofile-conduit.desktop
@@ -3,11 +3,13 @@
 Name=Memo File
 Name[af]=Memo Lêer
 Name[ar]=ملف مذكرة
+Name[bg]=Memo File
 Name[ca]=Fitxer de notes
 Name[cs]=Soubor s poznámkou
 Name[da]=Memo-fil
 Name[de]=Notizdatei
 Name[el]=Αρχείο υπομνήματος
+Name[en_GB]=Memo File
 Name[eo]=Memo-dosiero
 Name[es]=Archivo Memo
 Name[et]=Memofail
@@ -57,6 +59,7 @@
 Comment[da]=Denne kanal synkroniserer dine håndholdte memoer med en lokal mappe.
 Comment[de]=Abgleich der Notizen von Taschencomputer und einem lokalen Ordner
 Comment[el]=Αυτός ο σύνδεσμος συγχρονίζει τα υπομνήματα του υπολογιστή παλάμης σας με έναν τοπικό κατάλογο.
+Comment[en_GB]=This conduit syncs your handheld memos with a local directory.
 Comment[eo]=Tiu kanalo sinkronigas viajn poŝkomputil-memoojn kun loka dosierujo.
 Comment[es]=Este conducto sincroniza las memos de la agenda electrónica con un directorio local.
 Comment[et]=See kanal sünkroniseerib pihuarvutis ja arvutis olevad memod.
--- kpilot/conduits/timeconduit/time_conduit.desktop
+++ kpilot/conduits/timeconduit/time_conduit.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Denne kanal sætter tiden på din håndholdte fra PC'ens ur.
 Comment[de]=Überträgt die Zeit vom PC auf das mobile Gerät
 Comment[el]=Αυτός ο σύνδεσμος ρυθμίζει την ώρα στον υπολογιστή παλάμης σας από το ρολόι του υπολογιστή σας.
+Comment[en_GB]=This conduit sets the time on your handheld from the PC clock.
 Comment[es]=Este conducto establece la hora de su agenda electrónica a partir del reloj del PC.
 Comment[et]=See kanal sünkroniseerib pihuarvuti aja PC kellaga.
 Comment[eu]=Kanal honek zure agenda elektronikoko ordua PC-aren ordura ezartzen du.
@@ -18,7 +19,7 @@
 Comment[fr]=Ce canal règle l'heure de votre ordinateur de poche sur celle du PC.
 Comment[fy]=Comment=Dit conduit set de tiid fan jo handheld oan d ehÃ¢n fan de pc-klok.
 Comment[ga]=Sioncrónaíonn an seoladán seo an t-am ar do ríomhaire boise leis an gclog ar do ríomhaire deisce.
-Comment[gl]=Este conduto muda a hora do aparello portátil dende o reloxo do PC.
+Comment[gl]=Este conduto muda a hora do aparello portátil desde o reloxo do PC.
 Comment[hu]=Ez a csatoló beállítja a kéziszámítógép óráját a számítógépé alapján
 Comment[is]=Þessi rás stillir klukku lófatölvunnar eftir klukku PC tölvunnar.
 Comment[it]=Questo condotto imposta l'ora sul tuo palmare prendendola dall'orologio del PC.
@@ -53,6 +54,7 @@
 Name[af]=Tyd sinkronisasie
 Name[ar]=تزامن الوقت
 Name[be]=Сінхранізацыя часу
+Name[bg]=Time Synchronization
 Name[ca]=Sincronització horària
 Name[cs]=Synchronizace času
 Name[cy]=Cydamseriad Amser
--- kpilot/conduits/docconduit/kpalmdoc.desktop
+++ kpilot/conduits/docconduit/kpalmdoc.desktop
@@ -1,9 +1,57 @@
 # KDE Config File
 [Desktop Entry]
 Name=KPalmDOC
+Name[af]=KPalmDOC
+Name[ar]=KPalmDOC
+Name[bg]=KPalmDOC
+Name[br]=KPalmDOC
+Name[ca]=KPalmDOC
+Name[cs]=KPalmDOC
+Name[cy]=KPalmDOC
+Name[da]=KPalmDOC
+Name[de]=KPalmDOC
+Name[el]=KPalmDOC
+Name[en_GB]=KPalmDOC
+Name[es]=KPalmDOC
+Name[et]=KPalmDOC
+Name[eu]=KPalmDOC
+Name[fi]=KPalmDOC
+Name[fr]=KPalmDOC
+Name[fy]=KPalmDOC
+Name[ga]=KPalmDOC
+Name[gl]=KPalmDOC
+Name[hu]=KPalmDOC
+Name[is]=KPalmDOC
+Name[it]=KPalmDOC
+Name[ja]=KPalmDOC
+Name[ka]=KPalmDOC
+Name[km]=KPalmDOC
+Name[ko]=KPalmDOC
+Name[lt]=KPalmDOC
+Name[lv]=KPalmDOC
+Name[ms]=KPalmDOC
+Name[nb]=KPalmDOC
+Name[nds]=KPalmDOC
+Name[ne]=KPalmDOC
+Name[nl]=KPalmDOC
+Name[nn]=KPalmDOC
+Name[pa]=KPalmDOC
+Name[pl]=KPalmDOC
+Name[pt]=KPalmDOC
+Name[pt_BR]=KPalmDOC
+Name[ro]=KPalmDOC
+Name[ru]=KPalmDOC
+Name[se]=KPalmDOC
+Name[sk]=KPalmDOC
+Name[sl]=KPalmDOC
 Name[sv]=Kpalm DOC
 Name[ta]=கேகைdoc
+Name[tg]=KPalmDOC
+Name[tr]=KPalmDOC
+Name[uk]=KPalmDOC
 Name[x-test]=xxKPalmDOCxx
+Name[zh_CN]=KPalmDOC
+Name[zh_TW]=KPalmDOC
 GenericName=PalmDOC Converter
 GenericName[af]=PalmDOC omskakelaar
 GenericName[ar]=المحوّل PalmDOC
@@ -14,6 +62,7 @@
 GenericName[da]=PalmDOC konverterer
 GenericName[de]=PalmDOC-Konvertierung
 GenericName[el]=Μετατροπέας PalmDOC
+GenericName[en_GB]=PalmDOC Converter
 GenericName[eo]=PalmDOC-konvertilo
 GenericName[es]=Conversor de PalmDOC
 GenericName[et]=PalmDOC konverter
--- kpilot/conduits/docconduit/doc_conduit.desktop
+++ kpilot/conduits/docconduit/doc_conduit.desktop
@@ -9,6 +9,7 @@
 Comment[da]=Tilføjer tekstfiler til din håndholdte, passende for DOC-læsere.
 Comment[de]=Gibt Textdateien in Taschencomputer ein, passend für DOC-Leser.
 Comment[el]=Προσθέτει αρχεία κειμένου στον υπολογιστή παλάμης σας, κατάλληλο για αναγνώστες DOC.
+Comment[en_GB]=Adds text files to your handheld, suitable for DOC readers.
 Comment[es]=Añade archivos de texto a su agenda electrónica, útil para lectores de DOC.
 Comment[et]=Lisab DOC-riiderile sobilikud tekstifailid sinu pihuseadmele.
 Comment[eu]=Zure agenda elektronikora DOC irakurleentzako aproposak diren testu fitxategiak gehitzen ditu.
@@ -46,15 +47,58 @@
 Comment[zh_CN]=将文本文件添加到您的手持设备中，以适合 DOC 阅读程序。
 Comment[zh_TW]=新增文字檔到您的掌上型裝置，適用於 DOC 閱讀器。
 Name=Palm DOC
+Name[af]=Palm DOC
+Name[ar]=Palm DOC
+Name[bg]=Palm DOC
+Name[br]=Palm DOC
 Name[ca]=DOC de Palm
+Name[cs]=Palm DOC
 Name[cy]=DOC Palm
+Name[da]=Palm DOC
 Name[de]=Palm-DOC
+Name[el]=Palm DOC
+Name[en_GB]=Palm DOC
+Name[es]=Palm DOC
+Name[et]=Palm DOC
+Name[eu]=Palm DOC
 Name[fa]=رایانۀ جیبی DOC
+Name[fi]=Palm DOC
+Name[fr]=Palm DOC
+Name[fy]=Palm DOC
+Name[ga]=Palm DOC
+Name[gl]=Palm DOC
+Name[hu]=Palm DOC
+Name[is]=Palm DOC
+Name[it]=Palm DOC
+Name[ja]=Palm DOC
+Name[ka]=Palm DOC
+Name[km]=Palm DOC
+Name[ko]=Palm DOC
+Name[lt]=Palm DOC
+Name[lv]=Palm DOC
+Name[ms]=Palm DOC
+Name[nb]=Palm DOC
 Name[nds]=Palm-DOC
 Name[ne]=पाल्म DOC
+Name[nl]=Palm DOC
+Name[nn]=Palm DOC
+Name[pa]=Palm DOC
+Name[pl]=Palm DOC
 Name[pt]=DOC do Palm
+Name[pt_BR]=Palm DOC
+Name[ro]=Palm DOC
+Name[ru]=Palm DOC
+Name[se]=Palm DOC
+Name[sk]=Palm DOC
+Name[sl]=Palm DOC
+Name[sv]=Palm DOC
 Name[ta]=பாம் ஆவணம்
+Name[tg]=Palm DOC
+Name[tr]=Palm DOC
+Name[uk]=Palm DOC
 Name[x-test]=xxPalm DOCxx
+Name[zh_CN]=Palm DOC
+Name[zh_TW]=Palm DOC
 Implemented=file
 X-KDE-ServiceTypes=KPilotConduit
 X-KDE-Library=kpilot_conduit_doc
--- kpilot/conduits/memofile/kpilot-conduit-memofile.desktop
+++ kpilot/conduits/memofile/kpilot-conduit-memofile.desktop
@@ -3,11 +3,13 @@
 Name=Memo File
 Name[af]=Memo Lêer
 Name[ar]=ملف مذكرة
+Name[bg]=Memo File
 Name[ca]=Fitxer de notes
 Name[cs]=Soubor s poznámkou
 Name[da]=Memo-fil
 Name[de]=Notizdatei
 Name[el]=Αρχείο υπομνήματος
+Name[en_GB]=Memo File
 Name[eo]=Memo-dosiero
 Name[es]=Archivo Memo
 Name[et]=Memofail
@@ -57,6 +59,7 @@
 Comment[da]=Denne kanal synkroniserer dine håndholdte memoer med en lokal mappe.
 Comment[de]=Abgleich der Notizen von Taschencomputer und einem lokalen Ordner
 Comment[el]=Αυτός ο σύνδεσμος συγχρονίζει τα υπομνήματα του υπολογιστή παλάμης σας με έναν τοπικό κατάλογο.
+Comment[en_GB]=This conduit syncs your handheld memos with a local directory.
 Comment[eo]=Tiu kanalo sinkronigas viajn poŝkomputil-memoojn kun loka dosierujo.
 Comment[es]=Este conducto sincroniza las memos de la agenda electrónica con un directorio local.
 Comment[et]=See kanal sünkroniseerib pihuarvutis ja arvutis olevad memod.
--- kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop
+++ kpilot/conduits/keyringconduit/kpilot-conduit-keyring.desktop
@@ -6,6 +6,7 @@
 Comment[da]=Denne kanal synkroniserer den håndholdte nøglering, med en database lagret på pc'en.
 Comment[de]=Abgleich der Schlüsselbund-Datenbanken von Taschencomputer und PC.
 Comment[el]=Αυτό το κύκλωμα συγχρονίζει το βιβλίο διευθύνσεων του υπολογιστή παλάμης με το βιβλίο διευθύνσεων του pc.
+Comment[en_GB]=This conduit syncs the handheld keyring database with a database stored on the PC.
 Comment[es]=Este conducto sincroniza la base de datos del anillo de claves de la agenda electrónica con la base de datos almacenada en el equipo.
 Comment[et]=See kanal sünkroniseerib pihuarvuti võtmerõnga andmebaasi ja PC-s leiduva andmebaasi.
 Comment[fr]=Ce canal synchronise le trousseau de clés de l'ordinateur de poche avec une base de données sur votre ordinateur.
@@ -35,6 +36,8 @@
 Name[cs]=Svazek klíčů
 Name[da]=Nøglering
 Name[de]=Schlüsselbund
+Name[el]=Keyring
+Name[en_GB]=Keyring
 Name[es]=Anillo de claves
 Name[et]=Võtmerõngas
 Name[fi]=Avaimenperä
@@ -44,6 +47,7 @@
 Name[hu]=Kulcslista
 Name[it]=Portachiavi
 Name[ja]=鍵リング
+Name[km]=Keyring
 Name[lt]=Raktų ratas
 Name[lv]=Atslēgu saišķis
 Name[mai]=कीरिंग
@@ -60,6 +64,7 @@
 Name[sl]=Šop ključev
 Name[sv]=Nyckelring
 Name[tr]=Anahtar çifti
+Name[uk]=Keyring
 Name[x-test]=xxKeyringxx
 Name[zh_CN]=密钥环
 Name[zh_TW]=金鑰鍊
--- kpilot/conduits/malconduit/mal_conduit.desktop
+++ kpilot/conduits/malconduit/mal_conduit.desktop
@@ -3,11 +3,14 @@
 Name=MAL (AvantGo) Conduit
 Name[af]=MAL (AvantGo) pad
 Name[ar]=قناة MAL (AvantGo)
+Name[bg]=MAL (AvantGo) Conduit
 Name[ca]=Conducte MAL (AvantGo)
 Name[cs]=Propojení s AvantGo
 Name[cy]=Cwndid MAL (AvantGo)
+Name[da]=MAL (AvantGo) Conduit
 Name[de]=MAL- (AvantGo) Abgleich (Conduit)
 Name[el]=Σύνδεσμος MAL (AvantGo)
+Name[en_GB]=MAL (AvantGo) Conduit
 Name[eo]=MAL (AvantGo) Kanalo
 Name[es]=Conducto MAL (AvantGo)
 Name[et]=MAL (AvantGo) kanal
@@ -15,6 +18,7 @@
 Name[fa]=لولۀ MAL (AvantGo)
 Name[fi]=MAL (AvantGo)- yhdyskäytävä
 Name[fr]=Canal MAL (AvantGo)
+Name[fy]=MAL (AvantGo) Conduit
 Name[ga]=Seoladán MAL (AvantGo)
 Name[gl]=Conduto MAL (AvantGo)
 Name[he]=ממשק AvantGo) MAL)
@@ -30,6 +34,7 @@
 Name[nb]=MAL (AvantGo) kanal
 Name[nds]=MAL(AvantGo)-Synkroniseren
 Name[ne]=MAL (AvantGo) कन्ड्युट
+Name[nl]=MAL (AvantGo) Conduit
 Name[nn]=MAL-kopling (AvantGo)
 Name[pl]=Łącznik do MAL (AvantGo)
 Name[pt]=Conduta MAL (AvantGo)
@@ -43,6 +48,7 @@
 Name[tg]=Канали MAL (AvantGo)
 Name[tr]=MAL (AvantGo) Kanalı
 Name[uk]=Акведук MAL (AvantGo)
+Name[xh]=MAL (AvantGo) Conduit
 Name[x-test]=xxMAL (AvantGo) Conduitxx
 Name[zh_CN]=MAL (AvantGo) 管道
 Name[zh_TW]=MAL（AvantGo）導管
--- kpilot/conduits/popmail/popmail-conduit.desktop
+++ kpilot/conduits/popmail/popmail-conduit.desktop
@@ -9,6 +9,7 @@
 Comment[da]=Send post fra din håndholdte gennem KMail.
 Comment[de]=Zum Versenden von E-Mails mit dem Taschencomputer via KMail.
 Comment[el]=Αποστολή αλληλογραφίας από τον υπολογιστή παλάμης σας μέσω του KMail.
+Comment[en_GB]=Send mail from your handheld through KMail.
 Comment[eo]=Sendu poŝton de via poŝkomputilo per KMail.
 Comment[es]=Enviar un correo desde su agenda electrónica mediante KMail.
 Comment[et]=Saadab pihuseadmest KMaili vahendusel e-kirja.
@@ -37,7 +38,7 @@
 Comment[pa]=ਆਪਣੇ ਹੈਂਡਹਿਲਡ ਤੋਂ ਕੇਮੇਲ ਰਾਹੀਂ ਮੇਲ ਭੇਜੋ।
 Comment[pl]=Wysyła pocztę z palmtopa za pomocą KMail.
 Comment[pt]=Enviar um e-mail a partir do seu dispositivo móvel através do KMail.
-Comment[pt_BR]=Envia mensagem do seu handheld através do Kmail.
+Comment[pt_BR]=Envia mensagem do seu handheld através do KMail.
 Comment[ru]=Отправка почты с КПК через KMail.
 Comment[sk]=Pošle poštu z prenosného zariadenia cez KMail.
 Comment[sl]=Pošljite pošto z vašega ročnega računalnika preko KMaila.
@@ -52,12 +53,15 @@
 Name[af]=Pos
 Name[ar]=البريد
 Name[be]=Пошта
+Name[bg]=Mail
 Name[br]=Lizher
 Name[ca]=Correu
 Name[cs]=Pošta
 Name[cy]=Ebost
 Name[da]=E-mail
 Name[de]=E-Mail
+Name[el]=Mail
+Name[en_GB]=Mail
 Name[eo]=Retpoŝto
 Name[es]=Correo
 Name[et]=E-post
--- kpilot/conduits/todo/kpilot-conduit-todo.desktop
+++ kpilot/conduits/todo/kpilot-conduit-todo.desktop
@@ -6,10 +6,11 @@
 Comment[da]=Denne kanal synkroniserer den håndholdtes gøremåls-database med en Akonadi gøremålssamling.
 Comment[de]=Abgleich der Aufgaben-Datenbanken von Taschencomputer und Akonadi-Ressourcen.
 Comment[el]=Αυτό το κύκλωμα συγχρονίζει τη λίστα προς υλοποίηση εργασιών με τη συλλογή προς υλοποίηση εργασιών του Akonadi.
+Comment[en_GB]=This conduit syncs the handheld todo database with an Akonadi Todo Collection.
 Comment[es]=Este conducto sincroniza la base de tareas pendientes de la agenda electrónica con una colección de tareas pendientes de Akonadi.
 Comment[et]=See kanal sünkroniseerib pihuarvuti ülesannete andmebaasi ja Akonadi ülesannete kogu.
 Comment[fr]=Ce canal synchronise la liste de tâches du périphérique avec une collection de liste de tâches Akonadi.
-Comment[gl]=Este conduto sincroniza o base de datos do chaveiro do aparello portátil coa colección da Tarefas do Akonadi.
+Comment[gl]=Este conduto sincroniza o base de datos do chaveiro do aparello portátil coa colección de Tarefas do Akonadi.
 Comment[hu]=Ezzel a csatolóval egy kéziszámítógép feladatai és egy Akonadi-feladatgyűjtemény között lehet szinkronizálást végezni.
 Comment[it]=Questo condotto sincronizza l'elenco delle cose da fare del palmare con una collezione di cose da fare di Akonadi.
 Comment[ja]=このコンジットはハンドヘルドの To-Do データベースを Akonadi の To-Do コレクションと同期させます。
@@ -38,6 +39,7 @@
 Name[da]=Gøremål
 Name[de]=Aufgaben
 Name[el]=Προς υλοποίηση
+Name[en_GB]=To-do
 Name[es]=Tareas pendientes
 Name[et]=Ülesanded
 Name[fr]=Liste de tâches
--- kpilot/conduits/calendar/kpilot-conduit-calendar.desktop
+++ kpilot/conduits/calendar/kpilot-conduit-calendar.desktop
@@ -6,6 +6,7 @@
 Comment[da]=Denne kanal synkroniserer den håndholdtes kalenderdatabase, med en Akonadi kalendersamling.
 Comment[de]=Abgleich der Kalender-Datenbanken von Taschencomputer und Akonadi-Ressourcen.
 Comment[el]=Αυτό το κύκλωμα συγχρονίζει το ημερολόγιο του υπολογιστή παλάμης με τη συλλογή ημερολογίων του Akonadi.
+Comment[en_GB]=This conduit syncs the handheld calendar database with an Akonadi calendar Collection.
 Comment[es]=Este conducto sincroniza la base de datos del calendario de la agenda electrónica con una colección de calendario Akonadi.
 Comment[et]=See kanal sünkroniseerib pihuarvuti kalendri andmebaasi Akonadi kalendrikoguga.
 Comment[fr]=Ce canal synchronise l'agenda du périphérique avec une collection d'agenda Akonadi.
@@ -35,6 +36,7 @@
 Name=Calendar
 Name[af]=Kalender
 Name[ar]=التقويم
+Name[bg]=Calendar
 Name[br]=Deiziadur
 Name[ca]=Calendari
 Name[cs]=Kalendář
@@ -42,6 +44,7 @@
 Name[da]=Kalender
 Name[de]=Kalender
 Name[el]=Ημερολόγιο
+Name[en_GB]=Calendar
 Name[eo]=Kalendaro
 Name[es]=Calendario
 Name[et]=Kalender
@@ -76,6 +79,7 @@
 Name[pl]=Kalendarz
 Name[pt]=Calendário
 Name[pt_BR]=Calendário
+Name[ro]=Calendar
 Name[ru]=Календарь
 Name[se]=Kaleandar
 Name[sk]=Kalendár
--- kpilot/conduits/null/null-conduit.desktop
+++ kpilot/conduits/null/null-conduit.desktop
@@ -1,20 +1,61 @@
 [Desktop Entry]
 Type=Service
 Name=NULL
+Name[af]=NULL
 Name[ar]=فارغة
+Name[be]=NULL
+Name[bg]=NULL
+Name[br]=NULL
 Name[ca]=NUL
+Name[cs]=NULL
+Name[cy]=NULL
+Name[da]=NULL
+Name[de]=NULL
+Name[el]=NULL
+Name[en_GB]=NULL
+Name[es]=NULL
+Name[et]=NULL
+Name[eu]=NULL
 Name[fa]=پوچ
+Name[fi]=NULL
+Name[fr]=NULL
+Name[fy]=NULL
+Name[ga]=NULL
+Name[gl]=NULL
+Name[he]=NULL
+Name[hu]=NULL
+Name[is]=NULL
+Name[it]=NULL
+Name[ja]=NULL
+Name[ka]=NULL
+Name[km]=NULL
 Name[ko]=없음
+Name[lt]=NULL
+Name[lv]=NULL
 Name[mai]=रिक्त
 Name[mk]=Нулов
+Name[ms]=NULL
+Name[nb]=NULL
+Name[nds]=NULL
 Name[ne]=शून्य
+Name[nl]=NULL
+Name[nn]=NULL
 Name[pa]=ਖਾਲੀ
+Name[pl]=NULL
+Name[pt]=NULL
+Name[pt_BR]=NULL
 Name[ro]=NUL
+Name[ru]=NULL
+Name[se]=NULL
 Name[sk]=NIČ
+Name[sl]=NULL
 Name[sv]=Noll
 Name[ta]=வெற்று மதிப்பு
+Name[tg]=NULL
 Name[tr]=BOŞ
+Name[uk]=NULL
 Name[x-test]=xxNULLxx
+Name[zh_CN]=NULL
 Name[zh_TW]=虛擬
 Comment=This conduit does nothing.
 Comment[af]=Hierdie pad doen niks
@@ -26,6 +67,7 @@
 Comment[da]=Denne kanal gør ingenting.
 Comment[de]=Diese Erweiterung (Conduit) ist ohne Funktion
 Comment[el]=Αυτός ο σύνδεσμος δεν κάνει τίποτα.
+Comment[en_GB]=This conduit does nothing.
 Comment[eo]=Tiu kanalo faras nenion.
 Comment[es]=Este conducto no hace nada.
 Comment[et]=See kanal ei tee mitte kui midagi.
--- kpilot/conduits/contacts/kpilot-conduit-contacts.desktop
+++ kpilot/conduits/contacts/kpilot-conduit-contacts.desktop
@@ -6,11 +6,12 @@
 Comment[da]=Denne kanal synkroniserer den håndholdtes adressebogs-database med en Akonadi-samling.
 Comment[de]=Abgleich der Adressbücher von Taschencomputer und Akonadi-Ressourcen.
 Comment[el]=Αυτό το κύκλωμα συγχρονίζει το βιβλίο διευθύνσεων του υπολογιστή παλάμης με μια συλλογή του Akonadi.
+Comment[en_GB]=This conduit syncs the handheld address book database with an Akonadi collection.
 Comment[es]=Este conducto sincroniza la base de datos de la libreta de direcciones de la agenda electrónica con una colección Akonadi.
 Comment[et]=See kanal sünkroniseerib pihuarvuti aadressiraamatu andmebaasi Akonadi koguga.
 Comment[fr]=Ce canal synchronise le carnet d'adresse du périphérique avec une collection Akonadi.
 Comment[ga]=Sioncrónaíonn an seoladán seo bunachar sonraí an leabhair seoltaí ar do ríomhaire boise le Bailiúchán Akonadi.
-Comment[gl]=Este conduto sincroniza o caderno de enderezos do aparello móbil coa colección de calendarios do Akonadi
+Comment[gl]=Este conduto sincroniza o caderno de enderezos do aparello portátil coa colección de calendarios do Akonadi
 Comment[it]=Questo condotto sincronizza la rubrica del palmare con una collezione di Akonadi.
 Comment[ja]=このコンジットはハンドヘルドのアドレス帳データベースを Akonadi のコレクションと同期させます。
 Comment[km]=conduit syncs នេះជាមូលដ្ឋានសៀវភៅអាសយដ្ឋានឧបករណ៍យួរដៃដែលមានបណ្ដុំ Akonadi ។
@@ -33,6 +34,7 @@
 Name[af]=Kontakte
 Name[ar]=جهات الإتصال
 Name[be]=Кантакты
+Name[bg]=Contacts
 Name[br]=Darempredoù
 Name[ca]=Contactes
 Name[cs]=Kontakty
@@ -40,12 +42,14 @@
 Name[da]=Kontakter
 Name[de]=Kontakte
 Name[el]=Επαφές
+Name[en_GB]=Contacts
 Name[eo]=Kontaktoj
 Name[es]=Contactos
 Name[et]=Kontaktid
 Name[eu]=Kontaktuak
 Name[fa]=تماسها
 Name[fi]=Yhteystiedot
+Name[fr]=Contacts
 Name[fy]=Adressen
 Name[ga]=Teagmhálacha
 Name[gl]=Contactos
@@ -63,6 +67,7 @@
 Name[mai]=संपर्क
 Name[mk]=Контакти
 Name[ms]=Orang hubungan
+Name[nb]=Contacts
 Name[nds]=Kontakten
 Name[ne]=सम्पर्क
 Name[nl]=Adressen
--- kpilot/kpilot/kpilotconduit.desktop
+++ kpilot/kpilot/kpilotconduit.desktop
@@ -11,6 +11,7 @@
 Comment[da]=KPilot-kanal
 Comment[de]=KPilot-Abgleich (Conduit)
 Comment[el]=Σύνδεσμος KPilot
+Comment[en_GB]=KPilot Conduit
 Comment[eo]=KPiloto - kanalo
 Comment[es]=Conducto KPilot
 Comment[et]=KPiloti kanal
@@ -18,6 +19,7 @@
 Comment[fa]=لولۀ KPilot
 Comment[fi]=KPilot-yhdyskäytävä
 Comment[fr]=Canal de KPilot
+Comment[fy]=KPilot Conduit
 Comment[ga]=Seoladán KPilot
 Comment[gl]=Conduto do KPilot
 Comment[he]=ממשק של KPilot
@@ -35,6 +37,7 @@
 Comment[nb]=KPilot-kobling
 Comment[nds]=KPilot-Kanaal (Synkroniseren)
 Comment[ne]=केडीई पाइलट कन्ड्युट
+Comment[nl]=KPilot Conduit
 Comment[nn]=KPilot-kopling
 Comment[pl]=Łącznik KPilota
 Comment[pt]=Conduta do KPilot
@@ -49,6 +52,7 @@
 Comment[tr]=KPilot Kanalı
 Comment[uk]=Акведук KPilot
 Comment[vi]=Truyền dẫn KPilot 
+Comment[xh]=KPilot Conduit
 Comment[x-test]=xxKPilot Conduitxx
 Comment[zh_CN]=KPilot 管道
 Comment[zh_TW]=KPilot 導管
--- kpilot/kpilot/kpilotdaemon.desktop
+++ kpilot/kpilot/kpilotdaemon.desktop
@@ -3,29 +3,60 @@
 Name=KPilotDaemon
 Name[af]=Kpilotdaemon
 Name[ar]=مراقب KPilot
+Name[be]=KPilotDaemon
+Name[bg]=KPilotDaemon
+Name[br]=KPilotDaemon
+Name[ca]=KPilotDaemon
+Name[cs]=KPilotDaemon
+Name[cy]=KPilotDaemon
 Name[da]=KPilotDæmon
 Name[de]=KPilot-Dienst
 Name[el]=Δαίμονας KPilot
 Name[en_GB]=KPilotDæmon
 Name[eo]=KPiloto-demono
+Name[es]=KPilotDaemon
 Name[et]=KPiloti deemon
+Name[eu]=KPilotDaemon
+Name[fi]=KPilotDaemon
+Name[fr]=KPilotDaemon
+Name[fy]=KPilotDaemon
+Name[ga]=KPilotDaemon
+Name[gl]=KPilotDaemon
 Name[he]=תהליך הרקע של KPilot
+Name[hr]=KPilotDaemon
+Name[hu]=KPilotDaemon
 Name[is]=KPilot þjónn
+Name[it]=KPilotDaemon
 Name[ja]=KPilot デーモン
 Name[ka]=KPilot-ის დემონი
+Name[km]=KPilotDaemon
+Name[ko]=KPilotDaemon
 Name[lt]=KPilot tarnyba
+Name[lv]=KPilotDaemon
 Name[ms]=Daemon KPilot
+Name[nb]=KPilotDaemon
 Name[nds]=KPilot-Dämoon
 Name[ne]=केडीई पाइलट डेइमोन
+Name[nl]=KPilotDaemon
 Name[nn]=KPilot-teneste
+Name[pa]=KPilotDaemon
 Name[pl]=demon KPilota
+Name[pt]=KPilotDaemon
+Name[pt_BR]=KPilotDaemon
 Name[ro]=Demon KPilot
 Name[ru]=Служба синхронизации КПК
+Name[se]=KPilotDaemon
 Name[sk]=KPilotDémon
+Name[sl]=KPilotDaemon
 Name[sv]=Kpilotdemon
 Name[ta]=கேபைலட் டெமன்
 Name[tg]=Демони KPilot
+Name[tr]=KPilotDaemon
+Name[uk]=KPilotDaemon
+Name[vi]=KPilotDaemon
+Name[xh]=KPilotDaemon
 Name[x-test]=xxKPilotDaemonxx
+Name[zh_CN]=KPilotDaemon
 Name[zh_TW]=KPilot 守護程式
 Exec=kpilotDaemon
 NoDisplay=true
--- kpilot/kpilot/kpilot_config.desktop
+++ kpilot/kpilot/kpilot_config.desktop
@@ -13,12 +13,14 @@
 Name=KPilot Configuration
 Name[af]=KPilot opstelling
 Name[ar]=ضبط KPilot
+Name[bg]=KPilot Configuration
 Name[br]=Kefluniadur KPilot
 Name[ca]=Configuració de KPilot
 Name[cs]=Nastavení KPilotu
 Name[da]=KPilot indstilling
 Name[de]=KPilot-Einrichtung
 Name[el]=Ρύθμιση KPilot
+Name[en_GB]=KPilot Configuration
 Name[eo]=KPilot-Agordo
 Name[es]=Configuración de KPilot
 Name[et]=KPiloti seadistamine
@@ -72,6 +74,7 @@
 Comment[da]=KPilot hovedindstilling
 Comment[de]=Grundeinrichtung für KPilot
 Comment[el]=Κύρια ρύθμιση του KPilot
+Comment[en_GB]=KPilot Main Configuration
 Comment[eo]=KPilot-Ĉefagordo
 Comment[es]=Configuración principal de KPilot
 Comment[et]=KPiloti põhiseadistused
--- kpilot/kpilot/kpilot.desktop
+++ kpilot/kpilot/kpilot.desktop
@@ -2,14 +2,63 @@
 [Desktop Entry]
 Name=KPilot
 Name[af]=Kpilot
+Name[ar]=KPilot
+Name[be]=KPilot
+Name[bg]=KPilot
+Name[br]=KPilot
+Name[ca]=KPilot
+Name[cs]=KPilot
+Name[cy]=KPilot
+Name[da]=KPilot
+Name[de]=KPilot
+Name[el]=KPilot
+Name[en_GB]=KPilot
 Name[eo]=Palm-Piloto
+Name[es]=KPilot
+Name[et]=KPilot
+Name[eu]=KPilot
+Name[fi]=KPilot
 Name[fr]=Palm Pilot
+Name[fy]=KPilot
+Name[ga]=KPilot
+Name[gl]=KPilot
+Name[he]=KPilot
+Name[hr]=KPilot
+Name[hu]=KPilot
+Name[is]=KPilot
+Name[it]=KPilot
+Name[ja]=KPilot
+Name[ka]=KPilot
+Name[km]=KPilot
+Name[ko]=KPilot
+Name[lt]=KPilot
+Name[lv]=KPilot
 Name[mk]=КПилот
+Name[ms]=KPilot
+Name[nb]=KPilot
+Name[nds]=KPilot
 Name[ne]=केडीई पाइलट
+Name[nl]=KPilot
+Name[nn]=KPilot
 Name[pa]=ਕੇ-ਪਾਈਲਟ
+Name[pl]=KPilot
+Name[pt]=KPilot
+Name[pt_BR]=KPilot
+Name[ro]=KPilot
+Name[ru]=KPilot
+Name[se]=KPilot
+Name[sk]=KPilot
+Name[sl]=KPilot
 Name[sv]=Kpilot
 Name[ta]=கேபைலட்
+Name[tg]=KPilot
+Name[tr]=KPilot
+Name[uk]=KPilot
+Name[vi]=KPilot
+Name[xh]=KPilot
 Name[x-test]=xxKPilotxx
+Name[zh_CN]=KPilot
+Name[zh_TW]=KPilot
 GenericName=PalmPilot Tool
 GenericName[af]=Palmpilot Program
 GenericName[ar]=أداة PalmPilot
@@ -21,6 +70,7 @@
 GenericName[da]=Palm Pilot-værktøj
 GenericName[de]=Palm Pilot-Dienstprogramm
 GenericName[el]=Εργαλείο PalmPilot
+GenericName[en_GB]=PalmPilot Tool
 GenericName[eo]=Ilo por Palmpiloto
 GenericName[es]=Herramienta para PalmPilot
 GenericName[et]=PalmPiloti rakendus
--- kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop
+++ kpilot/Documentation/base-conduit-template/kpilot-conduit-contacts.desktop
@@ -37,6 +37,7 @@
 Name[af]=Kontakte
 Name[ar]=جهات الإتصال
 Name[be]=Кантакты
+Name[bg]=Contacts
 Name[br]=Darempredoù
 Name[ca]=Contactes
 Name[cs]=Kontakty
@@ -44,12 +45,14 @@
 Name[da]=Kontakter
 Name[de]=Kontakte
 Name[el]=Επαφές
+Name[en_GB]=Contacts
 Name[eo]=Kontaktoj
 Name[es]=Contactos
 Name[et]=Kontaktid
 Name[eu]=Kontaktuak
 Name[fa]=تماسها
 Name[fi]=Yhteystiedot
+Name[fr]=Contacts
 Name[fy]=Adressen
 Name[ga]=Teagmhálacha
 Name[gl]=Contactos
@@ -67,6 +70,7 @@
 Name[mai]=संपर्क
 Name[mk]=Контакти
 Name[ms]=Orang hubungan
+Name[nb]=Contacts
 Name[nds]=Kontakten
 Name[ne]=सम्पर्क
 Name[nl]=Adressen
--- kpilot/Documentation/base-conduit-template/contacts-conduit.desktop
+++ kpilot/Documentation/base-conduit-template/contacts-conduit.desktop
@@ -6,6 +6,7 @@
 Comment[da]=Denne kanal synkroniserer den håndholdtes adressebog med en database lagret på pc'en.
 Comment[de]=Abgleich der Adressbücher von Taschencomputer und PC.
 Comment[el]=Αυτό το κύκλωμα συγχρονίζει το βιβλίο διευθύνσεων του υπολογιστή παλάμης με τη βάση δεδομένων του υπολογιστή.
+Comment[en_GB]=This conduit syncs the handheld address book with a database stored on the PC.
 Comment[es]=Este conducto sincroniza la libreta de direcciones de la agenda electrónica con la base de datos almacenada en el equipo.
 Comment[et]=See kanal sünkroniseerib pihuarvuti aadressiraamatu PC-s leiduva andmebaasiga.
 Comment[fr]=Ce canal synchronise le carnet d'adresse du périphérique avec une base de données sur votre ordinateur.
@@ -33,6 +34,7 @@
 Name[af]=Kontakte
 Name[ar]=جهات الإتصال
 Name[be]=Кантакты
+Name[bg]=Contacts
 Name[br]=Darempredoù
 Name[ca]=Contactes
 Name[cs]=Kontakty
@@ -40,12 +42,14 @@
 Name[da]=Kontakter
 Name[de]=Kontakte
 Name[el]=Επαφές
+Name[en_GB]=Contacts
 Name[eo]=Kontaktoj
 Name[es]=Contactos
 Name[et]=Kontaktid
 Name[eu]=Kontaktuak
 Name[fa]=تماسها
 Name[fi]=Yhteystiedot
+Name[fr]=Contacts
 Name[fy]=Adressen
 Name[ga]=Teagmhálacha
 Name[gl]=Contactos
@@ -63,6 +67,7 @@
 Name[mai]=संपर्क
 Name[mk]=Контакти
 Name[ms]=Orang hubungan
+Name[nb]=Contacts
 Name[nds]=Kontakten
 Name[ne]=सम्पर्क
 Name[nl]=Adressen
--- knotes/knote_config_style.desktop
+++ knotes/knote_config_style.desktop
@@ -19,8 +19,10 @@
 Name[da]=Stil
 Name[de]=Stil
 Name[el]=Στυλ
+Name[en_GB]=Style
 Name[es]=Estilo
 Name[et]=Stiil
+Name[fr]=Style
 Name[ga]=Stíl
 Name[gl]=Estilo
 Name[it]=Stile
@@ -33,6 +35,7 @@
 Name[nl]=Stijl
 Name[nn]=Stil
 Name[pa]=ਸਟਾਇਲ
+Name[pl]=Style
 Name[pt]=Estilo
 Name[pt_BR]=Estilo
 Name[ro]=Stil
@@ -50,6 +53,7 @@
 Comment[da]=Indstilling af stil
 Comment[de]=Stil-Einstellungen
 Comment[el]=Ρυθμίσεις στυλ
+Comment[en_GB]=Style Settings
 Comment[es]=Preferencias del estilo
 Comment[et]=Stiili seadistused
 Comment[fr]=Paramètres du style
--- knotes/knote_config_display.desktop
+++ knotes/knote_config_display.desktop
@@ -19,6 +19,7 @@
 Name[da]=Vis
 Name[de]=Anzeige
 Name[el]=Εμφάνιση
+Name[en_GB]=Display
 Name[es]=Pantalla
 Name[et]=Vaade
 Name[fr]=Affichage
@@ -51,6 +52,7 @@
 Comment[da]=Opsæt visning af noter
 Comment[de]=Anzeige von Notizen einrichten
 Comment[el]=Ρύθμιση εμφάνισης για τις σημειώσεις
+Comment[en_GB]=Setup display for notes
 Comment[es]=Configurar pantalla para las notas
 Comment[et]=Märkmete vaate seadistamine
 Comment[fr]=Configuration de l'affichage pour les notes
--- knotes/local.desktop
+++ knotes/local.desktop
@@ -10,6 +10,7 @@
 Name[da]=Noter i lokal fil
 Name[de]=Notizen in lokaler Datei
 Name[el]=Σημειώσεις σε τοπικό αρχείο
+Name[en_GB]=Notes in Local File
 Name[eo]=Notoj en loka dosiero
 Name[es]=Notas en un archivo local
 Name[et]=Sedelid kohalikus failis
--- knotes/knote_config_editor.desktop
+++ knotes/knote_config_editor.desktop
@@ -14,20 +14,32 @@
 
 Name=Editor
 Name[ar]=المحرّر
+Name[ca]=Editor
+Name[cs]=Editor
 Name[da]=Redigering
+Name[de]=Editor
 Name[el]=Επεξεργασία
+Name[en_GB]=Editor
+Name[es]=Editor
 Name[et]=Redaktor
 Name[fr]=Éditeur 
 Name[ga]=Eagarthóir
+Name[gl]=Editor
+Name[it]=Editor
 Name[km]=កម្មវិធីនិពន្ធ
 Name[lv]=Redaktors
 Name[mai]=संपादक
 Name[nb]=Redigerer
+Name[nds]=Editor
 Name[nl]=Bewerker
 Name[nn]=Redigeringsprogram
 Name[pa]=ਐਡੀਟਰ
 Name[pl]=Edytor
+Name[pt]=Editor
+Name[pt_BR]=Editor
+Name[ro]=Editor
 Name[ru]=Редактор
+Name[sv]=Editor
 Name[tr]=Düzenleyici
 Name[uk]=Редактор
 Name[x-test]=xxEditorxx
@@ -40,6 +52,7 @@
 Comment[da]=Opsætning af redigering
 Comment[de]=Editor einrichten
 Comment[el]=Ρύθμιση επεξεργασία
+Comment[en_GB]=Setup editor
 Comment[es]=Configurar editor
 Comment[et]=Redaktori seadistamine
 Comment[fr]=Configuration de l'éditeur
--- knotes/knote_config_network.desktop
+++ knotes/knote_config_network.desktop
@@ -19,6 +19,7 @@
 Name[da]=Netværk
 Name[de]=Netzwerk
 Name[el]=Δίκτυο
+Name[en_GB]=Network
 Name[es]=Red
 Name[et]=Võrk
 Name[fr]=Réseau
@@ -51,6 +52,7 @@
 Comment[da]=Netværksindstillinger
 Comment[de]=Netzwerkeinstellungen
 Comment[el]=Ρυθμίσεις δικτύου
+Comment[en_GB]=Network Settings
 Comment[es]=Preferencias de la red
 Comment[et]=Võrguseadistused
 Comment[fr]=Configurations du réseau
--- knotes/knotes_manager.desktop
+++ knotes/knotes_manager.desktop
@@ -4,18 +4,22 @@
 Name[af]=Notas
 Name[ar]=ملاحظات
 Name[be]=Заметкі
+Name[bg]=Notes
 Name[br]=Notennoù
+Name[ca]=Notes
 Name[cs]=Poznámky
 Name[cy]=Nodiadau
 Name[da]=Noter
 Name[de]=Notizen
 Name[el]=Σημειώσεις
+Name[en_GB]=Notes
 Name[eo]=Notoj
 Name[es]=Notas
 Name[et]=Sedelid
 Name[eu]=Oharrak
 Name[fa]=یادداشتها
 Name[fi]=Muistio
+Name[fr]=Notes
 Name[fy]=Notysjes
 Name[ga]=Nótaí
 Name[gl]=Notas
@@ -56,6 +60,7 @@
 Name[uk]=Примітки
 Name[uz]=Yozma xotira
 Name[uz@cyrillic]=Ёзма хотира
+Name[wa]=Notes
 Name[x-test]=xxNotesxx
 Name[zh_CN]=便笺
 Name[zh_TW]=備忘錄
--- knotes/knotes.desktop
+++ knotes/knotes.desktop
@@ -15,6 +15,7 @@
 GenericName[da]=Popop-noter
 GenericName[de]=Haftnotizen
 GenericName[el]=Σημειώσεις
+GenericName[en_GB]=Popup Notes
 GenericName[eo]=Glunotoj
 GenericName[es]=Notas emergentes
 GenericName[et]=Sedelid
@@ -66,18 +67,63 @@
 Name=KNotes
 Name[af]=Knotas
 Name[ar]=ملاحظات KNotes
+Name[be]=KNotes
+Name[bg]=KNotes
+Name[br]=KNotes
+Name[ca]=KNotes
+Name[cs]=KNotes
 Name[cy]=KNodiadau
+Name[da]=KNotes
+Name[de]=KNotes
+Name[el]=KNotes
+Name[en_GB]=KNotes
 Name[eo]=Notoj
+Name[es]=KNotes
+Name[et]=KNotes
+Name[eu]=KNotes
+Name[fi]=KNotes
+Name[fr]=KNotes
+Name[fy]=KNotes
+Name[ga]=KNotes
+Name[gl]=KNotes
+Name[he]=KNotes
 Name[hr]=Bilješka
+Name[hu]=KNotes
+Name[is]=KNotes
+Name[it]=KNotes
+Name[ja]=KNotes
+Name[ka]=KNotes
+Name[kk]=KNotes
+Name[km]=KNotes
+Name[ko]=KNotes
+Name[lt]=KNotes
+Name[lv]=KNotes
 Name[mk]=КБелешки
+Name[ms]=KNotes
+Name[nb]=KNotes
+Name[nds]=KNotes
 Name[ne]=केडीई टिपोट
+Name[nl]=KNotes
+Name[nn]=KNotes
 Name[pa]=ਕੇ-ਨੋਟਿਸ
 Name[pl]=Notatki
+Name[pt]=KNotes
+Name[pt_BR]=KNotes
 Name[ro]=Notițe
+Name[ru]=KNotes
+Name[se]=KNotes
+Name[sk]=KNotes
 Name[sl]=KNotice
 Name[sv]=Knotes
 Name[ta]=கேகுறிப்புகள்
+Name[tg]=KNotes
+Name[tr]=KNotes
+Name[uk]=KNotes
+Name[vi]=KNotes
+Name[wa]=KNotes
+Name[xh]=KNotes
 Name[x-test]=xxKNotesxx
+Name[zh_CN]=KNotes
 Name[zh_TW]=KNotes 便利貼
 
 X-KDE-StartupNotify=true
--- knotes/knote_config_action.desktop
+++ knotes/knote_config_action.desktop
@@ -19,8 +19,10 @@
 Name[da]=Handlinger
 Name[de]=Aktionen
 Name[el]=Ενέργειες
+Name[en_GB]=Actions
 Name[es]=Acciones
 Name[et]=Toimingud
+Name[fr]=Actions
 Name[ga]=Gníomhartha
 Name[gl]=Accións
 Name[it]=Azioni
@@ -51,6 +53,7 @@
 Comment[da]=Opsætning af handlinger til noter
 Comment[de]=Aktionen für Notizen einrichten
 Comment[el]=Ρύθμιση ενεργειών για τις σημειώσεις
+Comment[en_GB]=Setup actions for notes
 Comment[es]=Configurar acciones para las notas
 Comment[et]=Märkmete toimingute seadistamine
 Comment[fr]=Configuration des actions pour les notes
--- kontact/plugins/akregator/akregator.setdlg
+++ kontact/plugins/akregator/akregator.setdlg
@@ -6,8 +6,10 @@
 Name[bg]=Новини
 Name[ca]=Enllaços
 Name[cs]=Kanály
+Name[da]=Feeds
 Name[de]=Nachrichten
 Name[el]=Ροές
+Name[en_GB]=Feeds
 Name[eo]=Fluoj
 Name[es]=Fuentes
 Name[et]=Uudistevood
@@ -34,6 +36,7 @@
 Name[nb]=Kanaler
 Name[nds]=Narichtenströöm
 Name[ne]=फिड
+Name[nl]=Feeds
 Name[nn]=Kjelder
 Name[oc]=Fluses
 Name[pa]=ਫੀਡ
@@ -53,6 +56,7 @@
 Name[uz@cyrillic]=Янгиликлар тасмалари
 Name[x-test]=xxFeedsxx
 Name[zh_CN]=种子
+Name[zh_TW]=Feeds
 Comment=Feed Reader
 Comment[ar]=قارئ التلقيمات
 Comment[ca]=Lector de fonts
@@ -60,6 +64,7 @@
 Comment[da]=Feed-læser
 Comment[de]=Anzeige von RSS-Nachrichtenquellen
 Comment[el]=Αναγνώστης ροών
+Comment[en_GB]=Feed Reader
 Comment[es]=Lector de fuentes
 Comment[et]=Uudistevoogude lugemisvahend
 Comment[fr]=Lecteur de flux
--- kontact/plugins/akregator/akregatorplugin.desktop
+++ kontact/plugins/akregator/akregatorplugin.desktop
@@ -21,8 +21,10 @@
 Comment[br]=Lugant Akregator
 Comment[ca]=Connector Akregator
 Comment[cs]=Modul Akregatoru
+Comment[da]=Akregator Plugin
 Comment[de]=Akregator-Modul
 Comment[el]=Πρόσθετο του Akregator
+Comment[en_GB]=Akregator Plugin
 Comment[eo]=Akregator-kromaĵo
 Comment[es]=Complemento de Akregator
 Comment[et]=Akregatori plugin
@@ -75,8 +77,10 @@
 Name[bg]=Новини
 Name[ca]=Enllaços
 Name[cs]=Kanály
+Name[da]=Feeds
 Name[de]=Nachrichten
 Name[el]=Ροές
+Name[en_GB]=Feeds
 Name[eo]=Fluoj
 Name[es]=Fuentes
 Name[et]=Uudistevood
@@ -103,6 +107,7 @@
 Name[nb]=Kanaler
 Name[nds]=Narichtenströöm
 Name[ne]=फिड
+Name[nl]=Feeds
 Name[nn]=Kjelder
 Name[oc]=Fluses
 Name[pa]=ਫੀਡ
@@ -122,4 +127,5 @@
 Name[uz@cyrillic]=Янгиликлар тасмалари
 Name[x-test]=xxFeedsxx
 Name[zh_CN]=种子
+Name[zh_TW]=Feeds
 
--- kontact/plugins/planner/planner.cpp
+++ kontact/plugins/planner/planner.cpp
@@ -361,7 +361,7 @@
       urlLabel2->setUrl( todo->uid() );
       urlLabel2->installEventFilter( this );
       urlLabel2->setAlignment( Qt::AlignLeft | Qt::AlignTop );
-      urlLabel->setWordWrap( true );
+      urlLabel2->setWordWrap( true );
       if ( stateText == i18nc( "to-do is overdue", "overdue" ) ) {
         urlLabel2->setText( "<font color = red >" + string + "</font>" );
       }
--- kontact/plugins/planner/planner.setdlg
+++ kontact/plugins/planner/planner.setdlg
@@ -1,9 +1,12 @@
 [Planner]
 Name=Planner
 Name[ar]=المُخطِط
+Name[ca]=Planner
 Name[cs]=Plánovač
 Name[da]=Planlægningskalender
 Name[de]=Planer
+Name[el]=Planner
+Name[en_GB]=Planner
 Name[es]=Calendario
 Name[et]=Planeerija
 Name[fr]=Agenda
@@ -17,10 +20,15 @@
 Name[lt]=Planuoklis
 Name[lv]=Plānotājs
 Name[nb]=Planlegger
+Name[nds]=Planner
+Name[nl]=Planner
 Name[nn]=Planleggjar
 Name[pa]=ਪਲੈਨਰ
 Name[pl]=Planowanie
+Name[pt]=Planner
+Name[pt_BR]=Planner
 Name[ro]=Planificator
+Name[ru]=Planner
 Name[sl]=Planer
 Name[sv]=Planering
 Name[th]=แผนงาน
@@ -36,6 +44,7 @@
 Comment[da]=Oversigt for planlægningskalender
 Comment[de]=Planer-Übersicht
 Comment[el]=Σύνοψη Planner
+Comment[en_GB]=Planner Summary
 Comment[es]=Resumen de calendario
 Comment[et]=Planeerija kokkuvõte
 Comment[fr]=Résumé de l'agenda
--- kontact/plugins/planner/kcmplanner.desktop
+++ kontact/plugins/planner/kcmplanner.desktop
@@ -13,9 +13,12 @@
 
 Name=Planner
 Name[ar]=المُخطِط
+Name[ca]=Planner
 Name[cs]=Plánovač
 Name[da]=Planlægningskalender
 Name[de]=Planer
+Name[el]=Planner
+Name[en_GB]=Planner
 Name[es]=Calendario
 Name[et]=Planeerija
 Name[fr]=Agenda
@@ -29,10 +32,15 @@
 Name[lt]=Planuoklis
 Name[lv]=Plānotājs
 Name[nb]=Planlegger
+Name[nds]=Planner
+Name[nl]=Planner
 Name[nn]=Planleggjar
 Name[pa]=ਪਲੈਨਰ
 Name[pl]=Planowanie
+Name[pt]=Planner
+Name[pt_BR]=Planner
 Name[ro]=Planificator
+Name[ru]=Planner
 Name[sl]=Planer
 Name[sv]=Planering
 Name[th]=แผนงาน
@@ -48,6 +56,7 @@
 Comment[da]=Indstilling af planlægningskalender
 Comment[de]=Planer-Einrichtung
 Comment[el]=Ρύθμιση του Planner
+Comment[en_GB]=Planner Setup
 Comment[es]=Configuración inicial de calendario
 Comment[et]=Planeerija seadistamine
 Comment[fr]=Configuration de l'agenda
--- kontact/plugins/planner/plannerplugin.desktop
+++ kontact/plugins/planner/plannerplugin.desktop
@@ -15,9 +15,12 @@
 
 Name=Planner
 Name[ar]=المُخطِط
+Name[ca]=Planner
 Name[cs]=Plánovač
 Name[da]=Planlægningskalender
 Name[de]=Planer
+Name[el]=Planner
+Name[en_GB]=Planner
 Name[es]=Calendario
 Name[et]=Planeerija
 Name[fr]=Agenda
@@ -31,10 +34,15 @@
 Name[lt]=Planuoklis
 Name[lv]=Plānotājs
 Name[nb]=Planlegger
+Name[nds]=Planner
+Name[nl]=Planner
 Name[nn]=Planleggjar
 Name[pa]=ਪਲੈਨਰ
 Name[pl]=Planowanie
+Name[pt]=Planner
+Name[pt_BR]=Planner
 Name[ro]=Planificator
+Name[ru]=Planner
 Name[sl]=Planer
 Name[sv]=Planering
 Name[th]=แผนงาน
@@ -50,6 +58,7 @@
 Comment[da]=Plugin til planlægningskalender
 Comment[de]=Planer-Modul
 Comment[el]=Πρόσθετο Planner
+Comment[en_GB]=Planner Plugin
 Comment[es]=Complemento de calendario
 Comment[et]=Planeerija plugin
 Comment[fr]=Module d'agenda
--- kontact/plugins/knode/knode.setdlg
+++ kontact/plugins/knode/knode.setdlg
@@ -1,12 +1,44 @@
 [KNode]
 Name=Usenet
 Name[ar]=اليوزنت
+Name[ca]=Usenet
+Name[cs]=Usenet
+Name[da]=Usenet
+Name[de]=Usenet
+Name[el]=Usenet
+Name[en_GB]=Usenet
+Name[es]=Usenet
+Name[et]=Usenet
+Name[fi]=Usenet
+Name[fr]=Usenet
+Name[ga]=Usenet
+Name[gl]=Usenet
+Name[hu]=Usenet
+Name[it]=Usenet
+Name[ja]=Usenet
+Name[kk]=Usenet
+Name[km]=Usenet
 Name[ko]=유즈넷
+Name[lt]=Usenet
+Name[lv]=Usenet
+Name[nb]=Usenet
+Name[nds]=Usenet
 Name[ne]=युजनेट
+Name[nl]=Usenet
 Name[nn]=Temagrupper
 Name[pa]=ਯੂਜ਼-ਨੈੱਟ
+Name[pl]=Usenet
+Name[pt]=Usenet
+Name[pt_BR]=Usenet
+Name[ro]=Usenet
+Name[ru]=Usenet
 Name[sl]=Novičarske skupine
+Name[sv]=Usenet
+Name[tr]=Usenet
+Name[uk]=Usenet
 Name[x-test]=xxUsenetxx
+Name[zh_CN]=Usenet
+Name[zh_TW]=Usenet
 Comment=Usenet Component
 Comment[ar]=مكون اليوزنت
 Comment[bg]=Модул за е-поща
@@ -15,6 +47,7 @@
 Comment[da]=Usenet-komponent
 Comment[de]=Usenet-Komponente
 Comment[el]=Συστατικό νέων
+Comment[en_GB]=Usenet Component
 Comment[es]=Componente Usenet
 Comment[et]=Useneti komponent
 Comment[fa]=مؤلفۀ یوزنت
--- kontact/plugins/knode/knodeplugin.desktop
+++ kontact/plugins/knode/knodeplugin.desktop
@@ -27,6 +27,7 @@
 Comment[da]=Kontact KNode-plugin
 Comment[de]=KNode-Modul für Kontact
 Comment[el]=Πρόσθετο KNode του Kontact
+Comment[en_GB]=Kontact KNode Plugin
 Comment[eo]=Kontact-KNode-kromaĵo
 Comment[es]=Complemento de KNode para Kontact
 Comment[et]=Kontacti KNode plugin
@@ -56,7 +57,7 @@
 Comment[pa]=ਕੇਸੰਪਰਕ ਕੇਨੋਡ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Kontact do współpracy z KNode
 Comment[pt]='Plugin' do KNode para o Kontact
-Comment[pt_BR]=Plug-in do Knode para o Kontact
+Comment[pt_BR]=Plug-in do KNode para o Kontact
 Comment[ro]=Modul KNode pentru Kontact
 Comment[ru]=Новости
 Comment[se]=Kontact, KNode-lassemoduvla
@@ -74,9 +75,41 @@
 Comment[zh_TW]=Kontact KNode 外掛程式
 Name=Usenet
 Name[ar]=اليوزنت
+Name[ca]=Usenet
+Name[cs]=Usenet
+Name[da]=Usenet
+Name[de]=Usenet
+Name[el]=Usenet
+Name[en_GB]=Usenet
+Name[es]=Usenet
+Name[et]=Usenet
+Name[fi]=Usenet
+Name[fr]=Usenet
+Name[ga]=Usenet
+Name[gl]=Usenet
+Name[hu]=Usenet
+Name[it]=Usenet
+Name[ja]=Usenet
+Name[kk]=Usenet
+Name[km]=Usenet
 Name[ko]=유즈넷
+Name[lt]=Usenet
+Name[lv]=Usenet
+Name[nb]=Usenet
+Name[nds]=Usenet
 Name[ne]=युजनेट
+Name[nl]=Usenet
 Name[nn]=Temagrupper
 Name[pa]=ਯੂਜ਼-ਨੈੱਟ
+Name[pl]=Usenet
+Name[pt]=Usenet
+Name[pt_BR]=Usenet
+Name[ro]=Usenet
+Name[ru]=Usenet
 Name[sl]=Novičarske skupine
+Name[sv]=Usenet
+Name[tr]=Usenet
+Name[uk]=Usenet
 Name[x-test]=xxUsenetxx
+Name[zh_CN]=Usenet
+Name[zh_TW]=Usenet
--- kontact/plugins/specialdates/specialdates.setdlg
+++ kontact/plugins/specialdates/specialdates.setdlg
@@ -2,11 +2,13 @@
 Name=Special Dates Summary
 Name[af]=Spesiale datums opsomming
 Name[ar]=ملخص المواعيد الخاصة
+Name[bg]=Special Dates Summary
 Name[ca]=Resum de dates especials
 Name[cs]=Souhrn speciálních datumů
 Name[da]=Oversigt over særlige datoer
 Name[de]=Übersicht über besondere Termine
 Name[el]=Σύνοψη σημαντικών ημερομηνιών
+Name[en_GB]=Special Dates Summary
 Name[eo]=Resumo pri Specialaj Datoj
 Name[es]=Resumen de fechas especiales
 Name[et]=Tähtpäevade kokkuvõte
@@ -60,6 +62,7 @@
 Comment[da]=Oversigtskomponent for særlige datoer
 Comment[de]=Komponente für Übersicht über besondere Termine
 Comment[el]=Στοιχείο σύνοψης Σημαντικών Ημερομηνιών
+Comment[en_GB]=Special Dates Summary Component
 Comment[eo]=Specialdatresuma Komponanto
 Comment[es]=Componente de resumen de fechas especiales
 Comment[et]=Tähtpäevade kokkuvõtte komponent
--- kontact/plugins/specialdates/kcmsdsummary.desktop
+++ kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -19,6 +19,7 @@
 Name[da]=Kommende særlige datoer
 Name[de]=Besondere anstehende Termine
 Name[el]=Σημαντικές ημερομηνίες
+Name[en_GB]=Upcoming Special Dates
 Name[es]=Fechas especiales próximas
 Name[et]=Tulevased tähtpäevad
 Name[fa]=تاریخهای ویژۀ آیندۀ نزدیک
@@ -61,6 +62,7 @@
 Comment[da]=Opsætning af oversigt over kommende særlige datoer
 Comment[de]=Einstellung der Übersicht über besondere anstehende Termine
 Comment[el]=Ρύθμιση σύνοψης σημαντικών ημερομηνιών
+Comment[en_GB]=Upcoming Special Dates Summary Setup
 Comment[es]=Configuración del resumen de fechas especiales próximas
 Comment[et]=Tulevaste tähtpäevade kokkuvõtte seadistus
 Comment[fa]=برپایی خلاصۀ تاریخهای ویژۀ آیندۀ نزدیک
--- kontact/plugins/specialdates/specialdatesplugin.desktop
+++ kontact/plugins/specialdates/specialdatesplugin.desktop
@@ -16,12 +16,14 @@
 Name=Special Dates
 Name[af]=Spesiale datums
 Name[ar]=المواعيد الخاصة
+Name[bg]=Special Dates
 Name[br]=Deiziadoù dibar
 Name[ca]=Dates especials
 Name[cs]=Speciální data
 Name[da]=Særlige datoer
 Name[de]=Besondere Termine
 Name[el]=Σημαντικές ημερομηνίες
+Name[en_GB]=Special Dates
 Name[eo]=Specialaj Datoj
 Name[es]=Fechas especiales
 Name[et]=Tähtpäevad
@@ -77,6 +79,7 @@
 Comment[da]=Plugin for særlige datoer
 Comment[de]=Modul für besondere Termine
 Comment[el]=Πρόσθετο σημαντικών ημερομηνιών
+Comment[en_GB]=Special Dates Plugin
 Comment[eo]=Kromaĵo por specialaj datoj
 Comment[es]=Complemento de fechas especiales
 Comment[et]=Tähtpäevade plugin
--- kontact/plugins/knotes/knotes.setdlg
+++ kontact/plugins/knotes/knotes.setdlg
@@ -6,6 +6,7 @@
 Name[da]=Pop-op-noter
 Name[de]=Haftnotizen
 Name[el]=Αναδυόμενες σημειώσεις
+Name[en_GB]=Popup Notes
 Name[es]=Notas emergentes
 Name[et]=Sedelid
 Name[fr]=Affichage de petites notes
@@ -43,6 +44,7 @@
 Comment[da]=Pop-op-notekomponent
 Comment[de]=Haftnotizen-Komponente
 Comment[el]=Συστατικό αναδυόμενων σημειώσεων
+Comment[en_GB]=Popup Notes Component
 Comment[es]=Componente de las notas emergentes
 Comment[et]=Sedelite komponent
 Comment[fr]=Composant de petites de notes
--- kontact/plugins/knotes/knotesplugin.desktop
+++ kontact/plugins/knotes/knotesplugin.desktop
@@ -26,6 +26,7 @@
 Comment[da]=Kontact KNotes-plugin
 Comment[de]=KNotes-Modul für Kontact
 Comment[el]=Πρόσθετο KNotes του Kontact
+Comment[en_GB]=Kontact KNotes Plugin
 Comment[eo]=Kontact-KNotes-kromaĵo
 Comment[es]=Complemento de KNotes para Kontact
 Comment[et]=Kontacti KNotesi plugin
@@ -59,6 +60,7 @@
 Comment[ro]=Modul KNotes pentru Kontact
 Comment[ru]=Заметки
 Comment[se]=Kontact, KNotes-lassemoduvla
+Comment[sk]=Kontact KNotes Plugin
 Comment[sl]=Vstavek KNotes za Kontact
 Comment[sv]=Kontacts insticksprogram för Knotes
 Comment[ta]= கேகுறிப்புகளை சொருகுப்பொருளை தொடர்புகொள்
@@ -77,6 +79,7 @@
 Name[da]=Pop-op-noter
 Name[de]=Haftnotizen
 Name[el]=Αναδυόμενες σημειώσεις
+Name[en_GB]=Popup Notes
 Name[es]=Notas emergentes
 Name[et]=Sedelid
 Name[fr]=Affichage de petites notes
--- kontact/plugins/ktimetracker/ktimetracker.setdlg
+++ kontact/plugins/ktimetracker/ktimetracker.setdlg
@@ -6,6 +6,7 @@
 Name[da]=Tidsstyring
 Name[de]=Zeiterfassung
 Name[el]=Χρονοδιάγραμμα
+Name[en_GB]=Time Tracker
 Name[es]=Gestor de tiempo
 Name[et]=Ajaarvesti
 Name[fr]=Suivi du temps
@@ -42,6 +43,7 @@
 Comment[da]=Tidsstyringskomponent
 Comment[de]=Zeiterfassungs-Komponente
 Comment[el]=Συστατικό χρονικού προγραμματισμού
+Comment[en_GB]=Time Tracker Component
 Comment[es]=Componente de gestión de tiempo
 Comment[et]=Ajaarvesti komponent
 Comment[fr]=Composant de suivi du temps
--- kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
+++ kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
@@ -21,6 +21,7 @@
 Comment[da]=Tidsstyrings-plugin
 Comment[de]=Modul für die persönliche Zeiterfassung
 Comment[el]=Πρόσθετο χρονικού προγραμματισμού
+Comment[en_GB]=TimeTracker Plugin
 Comment[es]=Complemento de gestión del tiempo
 Comment[et]=Ajaarvesti plugin
 Comment[fr]=Module de suivi du temps
@@ -57,6 +58,7 @@
 Name[da]=Tidsstyring
 Name[de]=Zeiterfassung
 Name[el]=Χρονοδιάγραμμα
+Name[en_GB]=Time Tracker
 Name[es]=Gestor de tiempo
 Name[et]=Ajaarvesti
 Name[fr]=Suivi du temps
--- kontact/plugins/kjots/kjots_plugin.desktop
+++ kontact/plugins/kjots/kjots_plugin.desktop
@@ -23,6 +23,7 @@
 Comment[da]=Kontact KJots-plugin
 Comment[de]=KJots-Modul für Kontact
 Comment[el]=Πρόσθετο KJots του Kontact
+Comment[en_GB]=Kontact KJots Plugin
 Comment[es]=Complemento de KJots para Kontact
 Comment[et]=Kontacti KJotsi plugin
 Comment[fr]=Module KJots pour Kontact
@@ -42,7 +43,7 @@
 Comment[pa]=ਕੇ-ਸੰਪਰਕ ਕੇਜੂਟ ਪਲੱਗਇਨ
 Comment[pl]=Wtyczka Kontact do współpracy z Notatkami
 Comment[pt]='Plugin' do KJots para o Kontact
-Comment[pt_BR]=Plug-in do Kjots para o Kontact
+Comment[pt_BR]=Plug-in do KJots para o Kontact
 Comment[ru]=Блокнот
 Comment[sl]=Vstavek KJots za Kontact
 Comment[sv]=Kontact insticksdelprogram för Kjots
@@ -53,10 +54,12 @@
 Comment[zh_TW]=Kontact KJots 外掛程式
 Name=Notebooks
 Name[ar]=دفاتر الملاحظات
+Name[ca]=Notebooks
 Name[cs]=Poznámky
 Name[da]=Notesbøger
 Name[de]=Notizbücher
 Name[el]=Σημειωματάρια
+Name[en_GB]=Notebooks
 Name[es]=Cuadernos de notas
 Name[et]=Märkmed
 Name[fr]=Carnets de notes
--- kontact/plugins/kjots/kjots.setdlg
+++ kontact/plugins/kjots/kjots.setdlg
@@ -1,10 +1,12 @@
 [Notebooks]
 Name=Notebooks
 Name[ar]=دفاتر الملاحظات
+Name[ca]=Notebooks
 Name[cs]=Poznámky
 Name[da]=Notesbøger
 Name[de]=Notizbücher
 Name[el]=Σημειωματάρια
+Name[en_GB]=Notebooks
 Name[es]=Cuadernos de notas
 Name[et]=Märkmed
 Name[fr]=Carnets de notes
@@ -41,6 +43,7 @@
 Comment[da]=Notesbogkomponent
 Comment[de]=Notizblock-Komponente
 Comment[el]=Συστατικό σημειωματάριου
+Comment[en_GB]=Notebooks Component
 Comment[es]=Componente de los cuadernos de notas
 Comment[et]=Märkmete komponent
 Comment[fr]=Composant de carnet de notes
--- kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+++ kontact/plugins/kaddressbook/kaddressbookplugin.desktop
@@ -27,6 +27,7 @@
 Comment[da]=Kontact KAddressbook-plugin
 Comment[de]=Adressbuch-Modul für Kontact
 Comment[el]=Πρόσθετο KAddressBook του Kontact
+Comment[en_GB]=Kontact KAddressBook Plugin
 Comment[es]=Complemento de KAddressbook para Kontact
 Comment[et]=Kontacti KDE aadressiraamatu plugin
 Comment[eu]=Kontact-en KAddressBook plugin-a
@@ -59,6 +60,7 @@
 Comment[ro]=Modul KAddressBook pentru Kontact
 Comment[ru]=Адресная книга
 Comment[se]=Kontact, KDE-čujuhusgirjji lassemoduvla
+Comment[sk]=Kontact KAddressBook Plugin
 Comment[sl]=Vstavek Adresarja za Kontact
 Comment[sv]=Kontact-insticksprogram för adressbok
 Comment[ta]= கேமுகவரிப்புத்தக சொருகுப்பொருளை தொடர்பு கொள்
@@ -74,6 +76,7 @@
 Name[af]=Kontakte
 Name[ar]=جهات الإتصال
 Name[be]=Кантакты
+Name[bg]=Contacts
 Name[br]=Darempredoù
 Name[ca]=Contactes
 Name[cs]=Kontakty
@@ -81,12 +84,14 @@
 Name[da]=Kontakter
 Name[de]=Kontakte
 Name[el]=Επαφές
+Name[en_GB]=Contacts
 Name[eo]=Kontaktoj
 Name[es]=Contactos
 Name[et]=Kontaktid
 Name[eu]=Kontaktuak
 Name[fa]=تماسها
 Name[fi]=Yhteystiedot
+Name[fr]=Contacts
 Name[fy]=Adressen
 Name[ga]=Teagmhálacha
 Name[gl]=Contactos
@@ -104,6 +109,7 @@
 Name[mai]=संपर्क
 Name[mk]=Контакти
 Name[ms]=Orang hubungan
+Name[nb]=Contacts
 Name[nds]=Kontakten
 Name[ne]=सम्पर्क
 Name[nl]=Adressen
--- kontact/plugins/kaddressbook/kaddressbook.setdlg
+++ kontact/plugins/kaddressbook/kaddressbook.setdlg
@@ -3,6 +3,7 @@
 Name[af]=Kontakte
 Name[ar]=جهات الإتصال
 Name[be]=Кантакты
+Name[bg]=Contacts
 Name[br]=Darempredoù
 Name[ca]=Contactes
 Name[cs]=Kontakty
@@ -10,12 +11,14 @@
 Name[da]=Kontakter
 Name[de]=Kontakte
 Name[el]=Επαφές
+Name[en_GB]=Contacts
 Name[eo]=Kontaktoj
 Name[es]=Contactos
 Name[et]=Kontaktid
 Name[eu]=Kontaktuak
 Name[fa]=تماسها
 Name[fi]=Yhteystiedot
+Name[fr]=Contacts
 Name[fy]=Adressen
 Name[ga]=Teagmhálacha
 Name[gl]=Contactos
@@ -33,6 +36,7 @@
 Name[mai]=संपर्क
 Name[mk]=Контакти
 Name[ms]=Orang hubungan
+Name[nb]=Contacts
 Name[nds]=Kontakten
 Name[ne]=सम्पर्क
 Name[nl]=Adressen
@@ -67,6 +71,7 @@
 Comment[da]=Adressebogskomponent
 Comment[de]=Adressbuch-Komponente
 Comment[el]=Στοιχείο βιβλίου διευθύνσεων
+Comment[en_GB]=Address Book Component
 Comment[eo]=Adreslibra Komponanto
 Comment[es]=Componente de la libreta de direcciones
 Comment[et]=Aadressiraamatu komponent
--- kontact/plugins/korganizer/kcmapptsummary.desktop
+++ kontact/plugins/korganizer/kcmapptsummary.desktop
@@ -18,6 +18,7 @@
 Name[da]=Kommende begivenheder
 Name[de]=Anstehende Ereignisse
 Name[el]=Σημαντικά γεγονότα
+Name[en_GB]=Upcoming Events
 Name[es]=Próximos eventos
 Name[et]=Tulevased sündmused
 Name[fi]=Tulevat tapahtumat
@@ -59,6 +60,7 @@
 Comment[da]=Indstilling af oversigt over kommende begivenheder
 Comment[de]=Einstellung der Übersicht über anstehende Ereignisse
 Comment[el]=Ρύθμιση σύνοψης σημαντικών ημερομηνιών
+Comment[en_GB]=Upcoming Events Summary Setup
 Comment[es]=Configuración del resumen de los eventos próximos
 Comment[et]=Tulevaste sündmuste kokkuvõtte seadistus
 Comment[fa]=برپایی خلاصۀ رویدادهای آیندۀ نزدیک
--- kontact/plugins/korganizer/kcmtodosummary.desktop
+++ kontact/plugins/korganizer/kcmtodosummary.desktop
@@ -18,6 +18,7 @@
 Name[da]=Forestående gøremål
 Name[de]=Zu erledigende Aufgaben
 Name[el]=Εργασίες προς υλοποίηση
+Name[en_GB]=Pending To-dos
 Name[es]=Tareas pendientes
 Name[et]=Ootel ülesanded
 Name[fi]=Tekemättömät tehtävät
@@ -59,6 +60,7 @@
 Comment[da]=Indstilling af oversigt over forestående gøremål
 Comment[de]=Einstellung der Übersicht über zu erledigende Aufgaben
 Comment[el]=Ρύθμιση ραντεβού και προς υλοποίηση εργασιών
+Comment[en_GB]=Pending To-dos Summary Setup
 Comment[es]=Configuración del resumen de tareas pendientes
 Comment[et]=Ootel ülesannete kokkuvõtte seadistus
 Comment[fa]=برپایی خلاصۀ کارهایی که باید انجام شوند
--- kontact/plugins/korganizer/todoplugin.desktop
+++ kontact/plugins/korganizer/todoplugin.desktop
@@ -24,6 +24,7 @@
 Comment[da]=Kontact KOrganizer gøremålsliste-plugin
 Comment[de]=Kontact KOrganizer-Aufgabenlisten-Modul
 Comment[el]=Πρόσθετο του Kontact για την προς υλοποίηση λίστα του KOrganizer
+Comment[en_GB]=Kontact KOrganizer To-do List Plugin
 Comment[eo]=Kontact-KOrganizilo-farendaĵlistkromaĵo
 Comment[es]=Complemento de tareas pendientes de KOrganizer para Kontact
 Comment[et]=Kontacti KOrganizeri ülesannete nimekirja plugin
@@ -66,6 +67,7 @@
 Name=To-do List
 Name[af]=Te-doen lys
 Name[ar]=قائمة المهام
+Name[bg]=To-do List
 Name[br]=Roll an traoù d'ober
 Name[ca]=Pendents
 Name[cs]=Seznam úkolů
@@ -73,6 +75,7 @@
 Name[da]=Gøremålsliste
 Name[de]=Aufgaben
 Name[el]=Προς υλοποίηση
+Name[en_GB]=To-do List
 Name[eo]=Farendaĵlisto
 Name[es]=Lista de tareas pendientes
 Name[et]=Ülesanded
--- kontact/plugins/korganizer/korganizer.setdlg
+++ kontact/plugins/korganizer/korganizer.setdlg
@@ -2,6 +2,7 @@
 Name=Calendar
 Name[af]=Kalender
 Name[ar]=التقويم
+Name[bg]=Calendar
 Name[br]=Deiziadur
 Name[ca]=Calendari
 Name[cs]=Kalendář
@@ -9,6 +10,7 @@
 Name[da]=Kalender
 Name[de]=Kalender
 Name[el]=Ημερολόγιο
+Name[en_GB]=Calendar
 Name[eo]=Kalendaro
 Name[es]=Calendario
 Name[et]=Kalender
@@ -43,6 +45,7 @@
 Name[pl]=Kalendarz
 Name[pt]=Calendário
 Name[pt_BR]=Calendário
+Name[ro]=Calendar
 Name[ru]=Календарь
 Name[se]=Kaleandar
 Name[sk]=Kalendár
@@ -68,6 +71,7 @@
 Comment[da]=Calendar-komponent
 Comment[de]=Kalender-Komponente
 Comment[el]=Στοιχείο ημερολογίου
+Comment[en_GB]=Calendar Component
 Comment[eo]=Kalendara Komponanto
 Comment[es]=Componente de calendario
 Comment[et]=Kalendrikomponent
--- kontact/plugins/korganizer/journalplugin.desktop
+++ kontact/plugins/korganizer/journalplugin.desktop
@@ -24,6 +24,7 @@
 Comment[da]=Kontact KOrganizer journal-plugin
 Comment[de]=Kontact KOrganizer-Modul für Journaleinträge
 Comment[el]=Πρόσθετο KOrganizer Χρονικού του Kontact
+Comment[en_GB]=Kontact KOrganizer Journal Plugin
 Comment[eo]=Kontact-KOrganizilo-ĵurnalkromaĵo
 Comment[es]=Complemento de diario de KOrganizer para Kontact
 Comment[et]=Kontacti KOrganizeri päevikuplugin
@@ -66,18 +67,22 @@
 Name=Journal
 Name[af]=Joernaal
 Name[ar]=اليوميات
+Name[bg]=Journal
 Name[br]=Deizlevr
 Name[ca]=Diari
 Name[cs]=Deník
 Name[cy]=Dyddlyfr
+Name[da]=Journal
 Name[de]=Journale
 Name[el]=Χρονικό
+Name[en_GB]=Journal
 Name[eo]=Ĵurnalo
 Name[es]=Diario
 Name[et]=Päevik
 Name[eu]=Egunkaria
 Name[fa]=نشریه
 Name[fi]=Päiväkirja
+Name[fr]=Journal
 Name[fy]=Journaal
 Name[ga]=Dialann
 Name[gl]=Diario
@@ -108,6 +113,7 @@
 Name[ru]=Журнал
 Name[sk]=Žurnál
 Name[sl]=Dnevnik
+Name[sv]=Journal
 Name[ta]=பத்திரிகை
 Name[th]=บันทึกประจำวัน
 Name[tr]=Günlük
--- kontact/plugins/korganizer/korganizerplugin.desktop
+++ kontact/plugins/korganizer/korganizerplugin.desktop
@@ -26,6 +26,7 @@
 Comment[da]=Kontact KOrganizer-plugin
 Comment[de]=KOrganizer-Modul für Kontact
 Comment[el]=Πρόσθετο KOrganizer του Kontact
+Comment[en_GB]=Kontact KOrganizer Plugin
 Comment[eo]=Kontact-KOrganizilo-kromaĵo
 Comment[es]=Complemento de KOrganizer para Kontact
 Comment[et]=Kontacti KOrganizeri plugin
@@ -60,6 +61,7 @@
 Comment[ro]=Modul KOrganizer pentru Kontact
 Comment[ru]=Календарь
 Comment[se]=Kontact, KOrganizer-lassemoduvla
+Comment[sk]=Kontact KOrganizer Plugin
 Comment[sl]=Vstavek KOrganizer za Kontact
 Comment[sv]=Kontact-insticksprogram för Korganizer
 Comment[ta]=கேஅமைப்பாளரை சொருகுப்பொருளை தொடர்புகொள்
@@ -74,6 +76,7 @@
 Name=Calendar
 Name[af]=Kalender
 Name[ar]=التقويم
+Name[bg]=Calendar
 Name[br]=Deiziadur
 Name[ca]=Calendari
 Name[cs]=Kalendář
@@ -81,6 +84,7 @@
 Name[da]=Kalender
 Name[de]=Kalender
 Name[el]=Ημερολόγιο
+Name[en_GB]=Calendar
 Name[eo]=Kalendaro
 Name[es]=Calendario
 Name[et]=Kalender
@@ -115,6 +119,7 @@
 Name[pl]=Kalendarz
 Name[pt]=Calendário
 Name[pt_BR]=Calendário
+Name[ro]=Calendar
 Name[ru]=Календарь
 Name[se]=Kaleandar
 Name[sk]=Kalendár
--- kontact/plugins/kmail/kmailplugin.desktop
+++ kontact/plugins/kmail/kmailplugin.desktop
@@ -28,6 +28,7 @@
 Comment[da]=Kontact KMail-plugin
 Comment[de]=KMail-Modul für Kontact
 Comment[el]=Πρόσθετο KMail του Kontact
+Comment[en_GB]=Kontact KMail Plugin
 Comment[eo]=Kontact-KMail-kromaĵo
 Comment[es]=Complemento de KMail para Kontact
 Comment[et]=Kontacti KMaili plugin
@@ -63,6 +64,7 @@
 Comment[ro]=Modul KMail pentru Kontact
 Comment[ru]=Почта
 Comment[se]=Kontackt, KMail-lassemoduvla
+Comment[sk]=Kontact KMail Plugin
 Comment[sl]=Vstavek KMaila za Kontact
 Comment[sv]=Kontact-insticksprogram för Kmail
 Comment[ta]=கேஅஞ்சல் சொருகுப்பொருளை தொடர்பு கொள்
@@ -78,12 +80,15 @@
 Name[af]=Pos
 Name[ar]=البريد
 Name[be]=Пошта
+Name[bg]=Mail
 Name[br]=Lizher
 Name[ca]=Correu
 Name[cs]=Pošta
 Name[cy]=Ebost
 Name[da]=E-mail
 Name[de]=E-Mail
+Name[el]=Mail
+Name[en_GB]=Mail
 Name[eo]=Retpoŝto
 Name[es]=Correo
 Name[et]=E-post
--- kontact/plugins/kmail/kcmkmailsummary.desktop
+++ kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -20,6 +20,7 @@
 Name[da]=Nye beskeder
 Name[de]=Neue Nachrichten
 Name[el]=Νέα μηνύματα
+Name[en_GB]=New Messages
 Name[es]=Mensajes nuevos
 Name[et]=Uued kirjad
 Name[fa]=پیامهای جدید
@@ -63,6 +64,7 @@
 Comment[da]=Opsætning af postoversigt
 Comment[de]=Mailübersicht-Einstellungen
 Comment[el]=Ρύθμιση σύνοψης αλληλογραφίας
+Comment[en_GB]=Mail Summary Setup
 Comment[es]=Configuración del resumen de correo
 Comment[et]=E-posti kokkuvõtte seadistus
 Comment[eu]=Postaren laburpenaren konfigurazioa
--- kontact/plugins/kmail/kmail.setdlg
+++ kontact/plugins/kmail/kmail.setdlg
@@ -3,12 +3,15 @@
 Name[af]=Pos
 Name[ar]=البريد
 Name[be]=Пошта
+Name[bg]=Mail
 Name[br]=Lizher
 Name[ca]=Correu
 Name[cs]=Pošta
 Name[cy]=Ebost
 Name[da]=E-mail
 Name[de]=E-Mail
+Name[el]=Mail
+Name[en_GB]=Mail
 Name[eo]=Retpoŝto
 Name[es]=Correo
 Name[et]=E-post
@@ -71,6 +74,7 @@
 Comment[da]=E-mail-komponent
 Comment[de]=Mail-Komponente
 Comment[el]=Στοιχείο αλληλογραφίας
+Comment[en_GB]=Mail Component
 Comment[eo]=Retpoŝta Komponanto
 Comment[es]=Componente de correo
 Comment[et]=E-posti komponent
--- kontact/plugins/summary/kcmkontactsummary.desktop
+++ kontact/plugins/summary/kcmkontactsummary.desktop
@@ -18,6 +18,7 @@
 Name[da]=Oversigter
 Name[de]=Übersichten
 Name[el]=Συνόψεις
+Name[en_GB]=Summaries
 Name[es]=Resúmenes
 Name[et]=Kokkuvõtted
 Name[fr]=Résumés
@@ -55,6 +56,7 @@
 Comment[da]=Valg af oversigt
 Comment[de]=Zusammenstellung der Übersicht
 Comment[el]=Επιλογή σύνοψης
+Comment[en_GB]=Summary Selection
 Comment[es]=Selección de resumen
 Comment[et]=Kokkuvõtete valik
 Comment[fr]=Sélection des résumés
--- kontact/plugins/summary/summaryplugin.desktop
+++ kontact/plugins/summary/summaryplugin.desktop
@@ -21,6 +21,7 @@
 Comment[da]=Kontact SummaryView-plugin
 Comment[de]=Übersichts-Modul für Kontact
 Comment[el]=Πρόσθετο προβολής Σύνοψης του Kontact
+Comment[en_GB]=Kontact SummaryView Plugin
 Comment[es]=Complemento de Vista resumen para Kontact
 Comment[et]=Kontakti kokkuvõttevaate plugin
 Comment[eu]=Kontact-en SummaryView plugin-a
@@ -65,6 +66,7 @@
 Name=Summary
 Name[af]=Opsomming
 Name[ar]=الملخّص
+Name[bg]=Summary
 Name[br]=Diverrañ
 Name[ca]=Resum
 Name[cs]=Souhrn
@@ -72,6 +74,7 @@
 Name[da]=Oversigt
 Name[de]=Übersicht
 Name[el]=Σύνοψη
+Name[en_GB]=Summary
 Name[eo]=Resumo
 Name[es]=Resumen
 Name[et]=Kokkuvõte
--- kontact/plugins/summary/summary.setdlg
+++ kontact/plugins/summary/summary.setdlg
@@ -2,6 +2,7 @@
 Name=Summary
 Name[af]=Opsomming
 Name[ar]=الملخّص
+Name[bg]=Summary
 Name[br]=Diverrañ
 Name[ca]=Resum
 Name[cs]=Souhrn
@@ -9,6 +10,7 @@
 Name[da]=Oversigt
 Name[de]=Übersicht
 Name[el]=Σύνοψη
+Name[en_GB]=Summary
 Name[eo]=Resumo
 Name[es]=Resumen
 Name[et]=Kokkuvõte
@@ -69,6 +71,7 @@
 Comment[da]=Oversigtsvisning
 Comment[de]=Zusammenfassungsansicht
 Comment[el]=Προβολή σύνοψης
+Comment[en_GB]=Summary View
 Comment[eo]=Resumrigardo
 Comment[es]=Vista de resumen
 Comment[et]=Kokkuvõttevaade
--- kontact/src/mainwindow.cpp
+++ kontact/src/mainwindow.cpp
@@ -1067,6 +1067,7 @@
     applyMainWindowSettings( KGlobal::config()->group(
                                QString( "MainWindow%1" ).arg( mCurrentPlugin->identifier() ) ) );
   }
+  updateShortcuts(); // for the plugActionList call
 }
 
 void MainWindow::slotOpenUrl( const KUrl &url )
--- kontact/src/kontactconfig.desktop
+++ kontact/src/kontactconfig.desktop
@@ -13,35 +13,120 @@
 X-KDE-Weight=0
 
 Name=Kontact
+Name[af]=Kontact
+Name[ar]=Kontact
+Name[bg]=Kontact
+Name[br]=Kontact
+Name[ca]=Kontact
+Name[cs]=Kontact
+Name[cy]=Kontact
+Name[da]=Kontact
+Name[de]=Kontact
+Name[el]=Kontact
+Name[en_GB]=Kontact
+Name[eo]=Kontact
+Name[es]=Kontact
+Name[et]=Kontact
+Name[eu]=Kontact
+Name[fi]=Kontact
+Name[fr]=Kontact
+Name[fy]=Kontact
+Name[ga]=Kontact
+Name[gl]=Kontact
+Name[he]=Kontact
+Name[hu]=Kontact
+Name[is]=Kontact
+Name[it]=Kontact
+Name[ja]=Kontact
+Name[ka]=Kontact
+Name[kk]=Kontact
+Name[km]=Kontact
+Name[ko]=Kontact
+Name[lt]=Kontact
+Name[lv]=Kontact
 Name[mk]=Контакт
+Name[ms]=Kontact
+Name[nb]=Kontact
+Name[nds]=Kontact
 Name[ne]=सम्पर्क गर्नुहोस्
+Name[nl]=Kontact
 Name[nn]=Kontakt
 Name[pa]=ਕੇ-ਸੰਪਰਕ
+Name[pl]=Kontact
+Name[pt]=Kontact
+Name[pt_BR]=Kontact
+Name[ro]=Kontact
+Name[ru]=Kontact
+Name[se]=Kontact
+Name[sk]=Kontact
+Name[sl]=Kontact
 Name[sv]=Kontakt
 Name[ta]=தொடர்பு கொள்
+Name[tg]=Kontact
+Name[tr]=Kontact
+Name[uk]=Kontact
+Name[uz]=Kontact
+Name[uz@cyrillic]=Kontact
 Name[x-test]=xxKontactxx
+Name[zh_CN]=Kontact
 Name[zh_TW]=Kontact 個人資訊管理
 Comment=KDE Kontact
+Comment[af]=KDE Kontact
 Comment[ar]=كدي Kontact
 Comment[bg]=Управление на личната информация
+Comment[br]=KDE Kontact
 Comment[ca]=Kontact de KDE
+Comment[cs]=KDE Kontact
 Comment[cy]=Kontact KDE
+Comment[da]=KDE Kontact
 Comment[de]=Kontact
+Comment[el]=KDE Kontact
+Comment[en_GB]=KDE Kontact
+Comment[eo]=KDE Kontact
+Comment[es]=KDE Kontact
+Comment[et]=KDE Kontact
+Comment[eu]=KDE Kontact
 Comment[fi]=Kontact
+Comment[fr]=KDE Kontact
+Comment[fy]=KDE Kontact
+Comment[ga]=KDE Kontact
 Comment[gl]=Kontact do KDE
+Comment[he]=KDE Kontact
+Comment[hu]=KDE Kontact
+Comment[is]=KDE Kontact
+Comment[it]=KDE Kontact
+Comment[ja]=KDE Kontact
+Comment[ka]=KDE Kontact
+Comment[kk]=KDE Kontact
+Comment[km]=KDE Kontact
+Comment[ko]=KDE Kontact
+Comment[lt]=KDE Kontact
+Comment[lv]=KDE Kontact
 Comment[mk]=KDE Контакт
 Comment[ms]=Kontact KDE 
+Comment[nb]=KDE Kontact
 Comment[nds]=KDE-Kontact
 Comment[ne]=केडीई सम्पर्क
+Comment[nl]=KDE Kontact
 Comment[nn]=KDE Kontakt
 Comment[pa]=KDE ਸੰਪਰਕ
 Comment[pl]=Kontact dla KDE
 Comment[pt]=Kontact do KDE
 Comment[pt_BR]=Kontact do KDE
 Comment[ro]=Contact KDE
+Comment[ru]=KDE Kontact
+Comment[se]=KDE Kontact
+Comment[sk]=KDE Kontact
+Comment[sl]=KDE Kontact
+Comment[sv]=KDE Kontact
 Comment[ta]=கேடிஇ தொடர்புகொள்
+Comment[tg]=KDE Kontact
+Comment[tr]=KDE Kontact
+Comment[uk]=KDE Kontact
 Comment[wa]=Kontact di KDE
 Comment[x-test]=xxKDE Kontactxx
+Comment[zh_CN]=KDE Kontact
+Comment[zh_TW]=KDE Kontact
 X-KDE-Keywords=kontact
 X-KDE-Keywords[bg]=Kontact
 X-KDE-Keywords[de]=Kontact
--- kontact/src/Kontact.desktop
+++ kontact/src/Kontact.desktop
@@ -1,12 +1,61 @@
 [Desktop Entry]
 Name=Kontact
+Name[af]=Kontact
+Name[ar]=Kontact
+Name[bg]=Kontact
+Name[br]=Kontact
+Name[ca]=Kontact
+Name[cs]=Kontact
+Name[cy]=Kontact
+Name[da]=Kontact
+Name[de]=Kontact
+Name[el]=Kontact
+Name[en_GB]=Kontact
+Name[eo]=Kontact
+Name[es]=Kontact
+Name[et]=Kontact
+Name[eu]=Kontact
+Name[fi]=Kontact
+Name[fr]=Kontact
+Name[fy]=Kontact
+Name[ga]=Kontact
+Name[gl]=Kontact
+Name[he]=Kontact
+Name[hu]=Kontact
+Name[is]=Kontact
+Name[it]=Kontact
+Name[ja]=Kontact
+Name[ka]=Kontact
+Name[kk]=Kontact
+Name[km]=Kontact
+Name[ko]=Kontact
+Name[lt]=Kontact
+Name[lv]=Kontact
 Name[mk]=Контакт
+Name[ms]=Kontact
+Name[nb]=Kontact
+Name[nds]=Kontact
 Name[ne]=सम्पर्क गर्नुहोस्
+Name[nl]=Kontact
 Name[nn]=Kontakt
 Name[pa]=ਕੇ-ਸੰਪਰਕ
+Name[pl]=Kontact
+Name[pt]=Kontact
+Name[pt_BR]=Kontact
+Name[ro]=Kontact
+Name[ru]=Kontact
+Name[se]=Kontact
+Name[sk]=Kontact
+Name[sl]=Kontact
 Name[sv]=Kontakt
 Name[ta]=தொடர்பு கொள்
+Name[tg]=Kontact
+Name[tr]=Kontact
+Name[uk]=Kontact
+Name[uz]=Kontact
+Name[uz@cyrillic]=Kontact
 Name[x-test]=xxKontactxx
+Name[zh_CN]=Kontact
 Name[zh_TW]=Kontact 個人資訊管理
 Exec=kontact
 Type=Application
@@ -21,6 +70,7 @@
 GenericName[da]=Personlig informationshåndtering
 GenericName[de]=Persönlicher Informationsmanager
 GenericName[el]=Προσωπικός διαχειριστής πληροφοριών
+GenericName[en_GB]=Personal Information Manager
 GenericName[eo]=Persona Inform-Mastrumilo
 GenericName[es]=Gestor de información personal
 GenericName[et]=Personaalse info haldur
@@ -28,6 +78,7 @@
 GenericName[fa]=مدیر اطلاعات شخصی
 GenericName[fi]=Henkilötietojen hallinta
 GenericName[fr]=Gestionnaire d'informations personnelles
+GenericName[fy]=Personal Information Manager
 GenericName[ga]=Bainisteoir Faisnéise Pearsanta
 GenericName[gl]=Xestor de información persoal
 GenericName[he]=מנהל מידע אישי
@@ -46,6 +97,7 @@
 GenericName[nb]=Personlig informasjonsbehandler
 GenericName[nds]=Pleger för persöönliche Informatschonen
 GenericName[ne]=व्यक्तिगत सूचना प्रबन्धक
+GenericName[nl]=Personal Information Manager
 GenericName[nn]=Handtering av personleg informasjon
 GenericName[pa]=ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮੈਨੇਜਰ
 GenericName[pl]=Program do zarządzania informacjami osobistymi
--- kontactinterfaces/kontactplugin.desktop
+++ kontactinterfaces/kontactplugin.desktop
@@ -13,14 +13,16 @@
 Name[da]=Kontact-plugin
 Name[de]=Kontact-Modul
 Name[el]=Πρόσθετο Kontact
+Name[en_GB]=Kontact Plugin
 Name[es]=Complemento de Kontact
 Name[et]=Kontacti plugin
 Name[eu]=Kontact plugin-a
 Name[fa]=وصلۀ Kontact
 Name[fi]=Kontact-liitännäinen
 Name[fr]=Module Kontact
+Name[fy]=Kontact Plugin
 Name[ga]=Breiseán Kontact
-Name[gl]=Engadido do Kontact
+Name[gl]=Engadido para Kontact
 Name[he]=תוסף Kontact
 Name[hu]=Kontact-bővítőmodul
 Name[is]=Kontact íforrit
@@ -37,6 +39,7 @@
 Name[nb]=Kontact-programtillegg
 Name[nds]=Kontact-Moduul
 Name[ne]=सम्पर्क प्लगइन
+Name[nl]=Kontact Plugin
 Name[nn]=Kontakt-programtillegg
 Name[pa]=ਕੇ-ਸੰਪਰਕ ਪਲੱਗਇਨ
 Name[pl]=Wtyczka Kontact
@@ -45,6 +48,7 @@
 Name[ro]=Modul Kontact
 Name[ru]=Модуль Kontact
 Name[se]=Kontact-lassemoduvla
+Name[sk]=Kontact Plugin
 Name[sl]=Vstavek za Kontact
 Name[sv]=Kontact-insticksprogram
 Name[ta]=சொருகுப்பொருளை தொடர்புக்கொள்
--- korganizer/datenavigator.cpp
+++ korganizer/datenavigator.cpp
@@ -158,6 +158,8 @@
 
   if ( dateCount == 7 ) {
     selectWeek( d );
+  } else if ( dateCount == 5 ) {
+    selectWorkWeek( d );
   } else {
     selectDates( d, dateCount );
   }
--- korganizer/koeditorgeneraltodo.cpp
+++ korganizer/koeditorgeneraltodo.cpp
@@ -287,11 +287,12 @@
 
   KOEditorGeneral::readIncidence( todo );
 
-  QDateTime dueDT;
-
   if ( todo->hasDueDate() ) {
     enableAlarm( true );
-    dueDT = todo->dtDue().dateTime();
+    KDateTime dueDT = todo->dtDue();
+    if ( dueDT.isUtc() ) {
+      dueDT = dueDT.toLocalZone();
+    }
     mDueDateEdit->setDate( dueDT.date() );
     mDueTimeEdit->setTime( dueDT.time() );
     mDueCheck->setChecked( true );
@@ -308,9 +309,12 @@
   }
 
   if ( todo->hasStartDate() ) {
-    QDateTime start = todo->dtStart().dateTime();
-    mStartDateEdit->setDate( start.date() );
-    mStartTimeEdit->setTime( start.time() );
+    KDateTime startDT = todo->dtStart();
+    if ( startDT.isUtc() ) {
+      startDT = startDT.toLocalZone();
+    }
+    mStartDateEdit->setDate( startDT.date() );
+    mStartTimeEdit->setTime( startDT.time() );
     mStartCheck->setChecked( true );
     mStartSpec = todo->dtStart().timeSpec();
     mTimeZoneComboStart->selectTimeSpec( todo->dtStart().timeSpec() );
@@ -446,11 +450,11 @@
   if( mDueCheck->isChecked() || mStartCheck->isChecked() ) {
     mTimeButton->setEnabled( true );
   } else {
-    mTimeButton->setEnabled(false);
-    mTimeButton->setChecked(false);
+    mTimeButton->setEnabled( false );
+    mTimeButton->setChecked( false );
   }
 
-  if (enable) {
+  if ( enable ) {
     mStartTimeEdit->setEnabled( mTimeButton->isChecked() );
     mTimeZoneComboStart->setEnabled( mTimeButton->isChecked() );
   } else {
--- korganizer/dbuscalendar.desktop
+++ korganizer/dbuscalendar.desktop
@@ -1,22 +1,41 @@
 [Desktop Entry]
 Name=DBUSCalendar
 Name[ar]=التقويم DBUS
+Name[bg]=DBUSCalendar
+Name[ca]=DBUSCalendar
+Name[cs]=DBUSCalendar
+Name[da]=DBUSCalendar
 Name[de]=D-Bus-Kalender
 Name[el]=Ημερολόγιο DBUS
+Name[en_GB]=DBUSCalendar
 Name[es]=Calendario DBUS
+Name[et]=DBUSCalendar
+Name[fr]=DBUSCalendar
 Name[ga]=Féilire DBUS
 Name[gl]=Calendario DBUS
 Name[hu]=D-Bus-naptár
+Name[it]=DBUSCalendar
 Name[ja]=D-Bus カレンダー
+Name[km]=DBUSCalendar
+Name[ko]=DBUSCalendar
 Name[lt]=DBUSkalendorius
+Name[lv]=DBUSCalendar
 Name[nb]=DBUSKalender
 Name[nds]=D-Bus-Kalenner
 Name[nl]=D-BusCalendar
+Name[nn]=DBUSCalendar
+Name[pa]=DBUSCalendar
 Name[pl]=KalendarzDBUS
 Name[pt]=Calendário DBUS
+Name[pt_BR]=DBUSCalendar
 Name[ro]=CalendarDBUS
+Name[ru]=DBUSCalendar
+Name[sl]=DBUSCalendar
 Name[sv]=DBus-kalender
+Name[tr]=DBUSCalendar
+Name[uk]=DBUSCalendar
 Name[x-test]=xxDBUSCalendarxx
+Name[zh_CN]=DBUSCalendar
 Name[zh_TW]=DBUS行事曆
 Type=ServiceType
 X-KDE-ServiceType=DBUS/Organizer
--- korganizer/korganizer_part.desktop
+++ korganizer/korganizer_part.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Kalender- og planlægningsprogram
 Comment[de]=Ein Kalender und Zeitplaner
 Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
+Comment[en_GB]=Calendar and Scheduling Program
 Comment[eo]=Kalendara kaj plana programo
 Comment[es]=Calendario y planificador
 Comment[et]=Kalendri ja ajakava haldamise rakendus
@@ -66,16 +67,61 @@
 Name=KOrganizer
 Name[af]=Korganizer
 Name[ar]=برنامج المنظَم KOrganizer
+Name[bg]=KOrganizer
+Name[br]=KOrganizer
+Name[ca]=KOrganizer
+Name[cs]=KOrganizer
 Name[cy]=KTrefnydd
+Name[da]=KOrganizer
+Name[de]=KOrganizer
+Name[el]=KOrganizer
+Name[en_GB]=KOrganizer
 Name[eo]=KOrganizilo
+Name[es]=KOrganizer
+Name[et]=KOrganizer
+Name[eu]=KOrganizer
+Name[fi]=KOrganizer
+Name[fr]=KOrganizer
+Name[fy]=KOrganizer
+Name[ga]=KOrganizer
+Name[gl]=KOrganizer
+Name[he]=KOrganizer
+Name[hr]=KOrganizer
+Name[hu]=KOrganizer
+Name[is]=KOrganizer
+Name[it]=KOrganizer
+Name[ja]=KOrganizer
+Name[ka]=KOrganizer
+Name[kk]=KOrganizer
+Name[km]=KOrganizer
+Name[ko]=KOrganizer
+Name[lt]=KOrganizer
+Name[lv]=KOrganizer
 Name[mk]=КОрганизатор
+Name[ms]=KOrganizer
+Name[nb]=KOrganizer
+Name[nds]=KOrganizer
 Name[ne]=केडीई आयोजक
+Name[nl]=KOrganizer
+Name[nn]=KOrganizer
 Name[pa]=ਕੇ-ਪਰਬੰਧਕ
 Name[pl]=Organizator
+Name[pt]=KOrganizer
+Name[pt_BR]=KOrganizer
 Name[ro]=Organizator
+Name[ru]=KOrganizer
+Name[se]=KOrganizer
+Name[sk]=KOrganizer
+Name[sl]=KOrganizer
 Name[sv]=Korganizer
 Name[ta]=கேஅமைப்பாளர்
+Name[tg]=KOrganizer
+Name[tr]=KOrganizer
+Name[uk]=KOrganizer
+Name[vi]=KOrganizer
+Name[xh]=KOrganizer
 Name[x-test]=xxKOrganizerxx
+Name[zh_CN]=KOrganizer
 Name[zh_TW]=KOrganizer 行事曆
 X-KDE-ServiceTypes=Browser/View
 X-KDE-Library=korganizerpart
--- korganizer/koeditorgeneralevent.cpp
+++ korganizer/koeditorgeneralevent.cpp
@@ -276,9 +276,9 @@
   } else {
     mTimeZoneComboStart->selectLocalTimeSpec();
     mTimeZoneComboEnd->selectLocalTimeSpec();
-    mStartSpec = mTimeZoneComboStart->selectedTimeSpec();
-    mEndSpec = mTimeZoneComboEnd->selectedTimeSpec();
   }
+  mStartSpec = mTimeZoneComboStart->selectedTimeSpec();
+  mEndSpec = mTimeZoneComboEnd->selectedTimeSpec();
   mTimeZoneComboStart->setEnabled( enabled );
   mTimeZoneComboEnd->setEnabled( enabled );
 
@@ -415,13 +415,7 @@
   KOEditorGeneral::setDefaults( allDay );
   mHasTimeCheckbox->setChecked( !allDay );
   setTimeEditorsEnabled( !allDay );
-
-  mTimeZoneComboStart->selectLocalTimeSpec();
-  mTimeZoneComboEnd->selectLocalTimeSpec();
-  mStartSpec = mTimeZoneComboStart->selectedTimeSpec();
-  mEndSpec = mTimeZoneComboEnd->selectedTimeSpec();
-
-  setDateTimes( from, to );
+  setDateTimes( KDateTime( from, mStartSpec ), KDateTime( to, mEndSpec ) );
 }
 
 void KOEditorGeneralEvent::readEvent( Event *event, bool isTemplate )
@@ -430,8 +424,16 @@
   setTimeEditorsEnabled( !event->allDay() );
 
   if ( !isTemplate ) {
-    // the rest is for the events only
-    setDateTimes( event->dtStart(), event->dtEnd() );
+    // Convert UTC to local timezone, if needed (i.e. for kolab #204059)
+    KDateTime startDT = event->dtStart();
+    KDateTime endDT = event->dtEnd();
+    if ( startDT.isUtc() ) {
+      startDT = startDT.toLocalZone();
+    }
+    if ( endDT.isUtc() ) {
+      endDT = endDT.toLocalZone();
+    }
+    setDateTimes( startDT, endDT );
   } else {
     // set the start/end time from the template, only as a last resort #190545
     if ( !event->dtStart().isValid() || !event->dtEnd().isValid() ) {
--- korganizer/korgac/CMakeLists.txt
+++ korganizer/korgac/CMakeLists.txt
@@ -3,8 +3,8 @@
 
 add_subdirectory( pixmaps ) 
 add_subdirectory( tests ) 
-include_directories( ${CMAKE_SOURCE_DIR}/korganizer ${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR} )
-
+include_directories( ${CMAKE_SOURCE_DIR}/korganizer )
+include_directories( BEFORE ${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR} )
 
 ########### next target ###############
 
--- korganizer/korgac/korgac.desktop
+++ korganizer/korgac/korgac.desktop
@@ -9,6 +9,7 @@
 Name[da]=KOrganizer-påmindelsesklient
 Name[de]=KOrganizer Erinnerungsfunktion
 Name[el]=Πελάτης υπενθύμισης του KOrganizer
+Name[en_GB]=KOrganizer Reminder Client
 Name[eo]=Alarmilo por Organizilo
 Name[es]=Cliente de recordatorio de KOrganizer
 Name[et]=KOrganizeri meeldetuletuse klientprogramm
--- korganizer/interfaces/calendar/calendarplugin.desktop
+++ korganizer/interfaces/calendar/calendarplugin.desktop
@@ -6,6 +6,7 @@
 Name[da]=Kalenders plugin-grænseflade
 Name[de]=Kalender-Modulschnittstelle
 Name[el]=Διασύνδεση προσθέτου ημερολογίου
+Name[en_GB]=Calendar Plugin Interface
 Name[es]=Complemento de interfaz del calendario
 Name[et]=Kalendriplugina liides
 Name[fr]=Interface de module d'agenda
@@ -48,6 +49,7 @@
 Comment[da]=Calendar-plugin
 Comment[de]=Kalender-Modul
 Comment[el]=Πρόσθετο ημερολογίου
+Comment[en_GB]=Calendar Plugin
 Comment[eo]=Kalendaro-kromaĵo
 Comment[es]=Complemento de calendario
 Comment[et]=Kalendriplugin
--- korganizer/interfaces/calendar/calendardecoration.desktop
+++ korganizer/interfaces/calendar/calendardecoration.desktop
@@ -6,6 +6,7 @@
 Name[da]=Kalenderdekorations-plugin
 Name[de]=Dekoration für den Kalender
 Name[el]=Διασύνδεση διακόσμησης ημερολογίου
+Name[en_GB]=Calendar Decoration Interface
 Name[es]=Interfaz de decoración del calendario
 Name[et]=Kalendri dekoratsiooni liides
 Name[fr]=Interface de décoration d'agenda
@@ -48,6 +49,7 @@
 Comment[da]=Calendar-dekorations-plugin
 Comment[de]=Dekoration für den Kalender
 Comment[el]=Πρόσθετο διακόσμησης ημερολογίου
+Comment[en_GB]=Calendar Decoration Plugin
 Comment[eo]=Kalendarornama kromaĵo
 Comment[es]=Complemento de decoración del calendario
 Comment[et]=Kalendri dekoratsiooni plugin
--- korganizer/interfaces/korganizer/korgprintplugin.desktop
+++ korganizer/interfaces/korganizer/korgprintplugin.desktop
@@ -6,6 +6,7 @@
 Name[da]=Grænseflade til KOrganizer print-plugin
 Name[de]=KOrganizer-Druckschnittstelle
 Name[el]=Διασύνδεση προσθέτου εκτύπωσης KOrganizer
+Name[en_GB]=KOrganizer Print Plugin Interface
 Name[es]=Interfaz del complemento de impresión de KOrganizer
 Name[et]=KOrganizeri trükkimisplugina liides
 Name[fr]=Interface de module d'impression d'agenda
@@ -42,14 +43,20 @@
 Comment[bg]=Модул KOrganizer
 Comment[br]=Perzh KOrganizer
 Comment[ca]=Part de KOrganizer
+Comment[cs]=KOrganizer Part
 Comment[cy]=KTrefnydd Part
+Comment[da]=KOrganizer Part
 Comment[de]=KOrganizer-Komponente
+Comment[el]=KOrganizer Part
+Comment[en_GB]=KOrganizer Part
 Comment[eo]=Organizilo-parto
 Comment[es]=Parte de KOrganizer
 Comment[et]=KOrganizeri komponent
 Comment[eu]=KOrganizer zatia
 Comment[fa]=بخش KOrganizer
+Comment[fi]=KOrganizer Part
 Comment[fr]=Composant KOrganizer
+Comment[fy]=KOrganizer Part
 Comment[ga]=Comhpháirt KOrganizer
 Comment[gl]=Parte KOrganizer
 Comment[he]=רכיב KOrganizer
@@ -66,6 +73,7 @@
 Comment[lv]=KOrganizer daļa
 Comment[mk]=Дел од КОрганизатор
 Comment[ms]=Bahagian KOrganizer
+Comment[nb]=KOrganizer Part
 Comment[nds]=KOrganizer-Komponent
 Comment[ne]=केडीई आयोजक भाग
 Comment[nl]=KOrganizer-component
@@ -84,6 +92,7 @@
 Comment[tg]=Қисмати органайзер
 Comment[tr]=KOrganizer Parçası
 Comment[uk]=Складова KOrganizer
+Comment[vi]=KOrganizer Part
 Comment[xh]=Indawana yeKOrganizer
 Comment[x-test]=xxKOrganizer Partxx
 Comment[zh_CN]=KOrganizer 部件
--- korganizer/interfaces/korganizer/korganizerpart.desktop
+++ korganizer/interfaces/korganizer/korganizerpart.desktop
@@ -6,6 +6,7 @@
 Name[da]=Grænseflade til KOrganizer Part
 Name[de]=KOrganizer-Komponenten-Schnittstelle
 Name[el]=Διασύνδεση KOrganizer Part
+Name[en_GB]=KOrganizer Part Interface
 Name[es]=Interfaz de parte de KOrganizer
 Name[et]=KOrganizeri komponendi liides
 Name[fr]=Interface de composant KOrganizer
@@ -43,14 +44,20 @@
 Comment[bg]=Модул KOrganizer
 Comment[br]=Perzh KOrganizer
 Comment[ca]=Part de KOrganizer
+Comment[cs]=KOrganizer Part
 Comment[cy]=KTrefnydd Part
+Comment[da]=KOrganizer Part
 Comment[de]=KOrganizer-Komponente
+Comment[el]=KOrganizer Part
+Comment[en_GB]=KOrganizer Part
 Comment[eo]=Organizilo-parto
 Comment[es]=Parte de KOrganizer
 Comment[et]=KOrganizeri komponent
 Comment[eu]=KOrganizer zatia
 Comment[fa]=بخش KOrganizer
+Comment[fi]=KOrganizer Part
 Comment[fr]=Composant KOrganizer
+Comment[fy]=KOrganizer Part
 Comment[ga]=Comhpháirt KOrganizer
 Comment[gl]=Parte KOrganizer
 Comment[he]=רכיב KOrganizer
@@ -67,6 +74,7 @@
 Comment[lv]=KOrganizer daļa
 Comment[mk]=Дел од КОрганизатор
 Comment[ms]=Bahagian KOrganizer
+Comment[nb]=KOrganizer Part
 Comment[nds]=KOrganizer-Komponent
 Comment[ne]=केडीई आयोजक भाग
 Comment[nl]=KOrganizer-component
@@ -85,6 +93,7 @@
 Comment[tg]=Қисмати органайзер
 Comment[tr]=KOrganizer Parçası
 Comment[uk]=Складова KOrganizer
+Comment[vi]=KOrganizer Part
 Comment[xh]=Indawana yeKOrganizer
 Comment[x-test]=xxKOrganizer Partxx
 Comment[zh_CN]=KOrganizer 部件
--- korganizer/koeditorgeneraljournal.cpp
+++ korganizer/koeditorgeneraljournal.cpp
@@ -148,9 +148,13 @@
 {
   setSummary( journal->summary() );
   if ( !tmpl ) {
-    setDate( journal->dtStart().date() );
+    KDateTime startDT = journal->dtStart();
+    if ( startDT.isUtc() ) {
+      startDT = startDT.toLocalZone();
+    }
+    setDate( startDT.date() );
     if ( !journal->allDay() ) {
-      setTime( journal->dtStart().time() );
+      setTime( startDT.time() );
     } else {
       setTime( QTime( -1, -1, -1 ) );
     }
--- korganizer/plugins/picoftheday/picoftheday.desktop
+++ korganizer/plugins/picoftheday/picoftheday.desktop
@@ -8,6 +8,7 @@
 Name[da]=Wikipedia dagens billede-plugin for kalendere
 Name[de]=Bild des Tages aus Wikipedia für den Kalender
 Name[el]=Πρόσθετο εικόνας της ημέρας της Wikipedia για Ημερολόγια
+Name[en_GB]=Wikipedia Picture Of the Day Plugin for Calendars
 Name[es]=Complemento de imagen del día de la Wikipedia para calendarios
 Name[et]=Wikipedia päevapildi plugin kalendritele
 Name[fa]=عکس ویکی پدیا از وصلۀ روز برای تقویمها
@@ -46,6 +47,7 @@
 Comment[da]=Dette plugin viser Dagens billede fra Wikipedia
 Comment[de]=Dieses Modul stellt das Bild des Tages aus Wikipedia zur Verfügung.
 Comment[el]=Αυτό το πρόσθετο προσφέρει την εικόνα της ημέρας της Wikipedia.
+Comment[en_GB]=This plugin provides the Wikipedia Picture of the Day
 Comment[es]=Este complemento provee la Imagen del Día de Wikipedia
 Comment[et]=See plugin näitab Wikipedia päevapilti
 Comment[fr]=Ce module externe fourni l'image du jour de Wikipédia
--- korganizer/plugins/datenums/datenums.desktop
+++ korganizer/plugins/datenums/datenums.desktop
@@ -9,6 +9,7 @@
 Name[da]=Datonumre-plugin for kalendere
 Name[de]=Kalendertag-Modul für Kalender
 Name[el]=Πρόσθετο αριθμού ημερών για Ημερολόγια
+Name[en_GB]=Date Numbers Plugin for Calendars
 Name[eo]=Datnumera kromaĵo por Kalendaro
 Name[es]=Complemento de números de fecha para calendarios
 Name[et]=Kuupäeva nummerdamise plugin kalendritele
@@ -59,6 +60,7 @@
 Comment[da]=For hver dag viser dette plugin nummeret for dagen i året for oven i agendavisningen. For eksempel er 1. februar 1 is den 32. dag i året.
 Comment[de]=Für jeden Tag des Jahres wird mit diesem Modul der Kalendertag oben in der Tagesansicht angezeigt. Der 1. Februar ist beispielsweise der 32. Kalendertag des Jahres.
 Comment[el]=Για κάθε μέρα, αυτό το πρόσθετο εμφανίζει τον αύξοντα αριθμό της ημέρας του έτους στην προβολή προγράμματος εργασίας. Για παράδειγμα, η 1ι Φεβρουαρίου είναι η ημέρα 32 του έτους.
+Comment[en_GB]=For each day this plugin shows its daynumber of the year at the top of the agenda view. For example, February 1 is day 32 of the year.
 Comment[es]=Para cada día, este complemento muestra su número de día en el año en la parte superior de la vista de agenda. Por ejemplo, el 1 de febrero es el día número 32 del año.
 Comment[et]=See plugin näitab iga päevakavavaate ülaosas iga päeva järjekorranumbrit aastas. Näiteks 1. veebruar on aasta 32. päev.
 Comment[eu]=Egun bakoitzeko, plugin honek bere urteko egun-zenbakia erakutsiko du agenda ikuspegiaren goiko aldean. Adibidez, Otsailak 1 urtearen 32. eguna da.
--- korganizer/plugins/printing/year/yearprint.desktop
+++ korganizer/plugins/printing/year/yearprint.desktop
@@ -3,11 +3,13 @@
 Name=Yearly Print Style
 Name[af]=Druk styl: Jaarliks
 Name[ar]=نمط الطباعة السنوي
+Name[bg]=Yearly Print Style
 Name[ca]=Estil d'impressió anual
 Name[cs]=Roční tiskový styl
 Name[da]=Yearly udskriftsstil
 Name[de]=Jahres-Druckstil
 Name[el]=Στυλ ετήσιας εκτύπωσης
+Name[en_GB]=Yearly Print Style
 Name[eo]=Pojara Presostilo
 Name[es]=Estilo de impresión anual
 Name[et]=Aastakalendri trükkimise stiil
@@ -52,6 +54,7 @@
 Comment[da]=Dette plugin gør at du kan udskrive en årlig kalender
 Comment[de]=Mit diesem Modul können Jahresübersichten gedruckt werden.
 Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώσετε ένα ετήσιο ημερολόγιο.
+Comment[en_GB]=This plugin allows you to print out a yearly calendar.
 Comment[es]=Este complemento le permite imprimir un calendario anual.
 Comment[et]=See plugin võimaldab trükkida terve aasta kalendri.
 Comment[fa]=این وصله، به شما اجازه می‌دهد که مدخلهای نشریه )مدخلهای روزانه( را چاپ کنید.
--- korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
+++ korganizer/plugins/printing/whatsnext/whatsnextprint.desktop
@@ -3,11 +3,13 @@
 Name=What's Next Print Style
 Name[af]=Wat is volgende - druk styl
 Name[ar]=ما هو نمط الطباعة التالي
+Name[bg]=What's Next Print Style
 Name[ca]=Estil d'impressió Què toca ara?
 Name[cs]=Styl deníku - co je nového
 Name[da]=Hvad er det næste-udskriftsstil
 Name[de]=„Was kommt als nächstes“-Druckstil
 Name[el]=Στυλ εκτύπωσης 'Τί νέο υπάρχει'
+Name[en_GB]=What's Next Print Style
 Name[eo]="Kio postsekvas"-Presostilo
 Name[es]=Estilo de impresión de «Qué es lo siguiente»
 Name[et]="Mis järgmiseks?" trükkimise stiil
@@ -17,7 +19,7 @@
 Name[fr]=Impression des évènements à venir
 Name[fy]=Printstyl foar Wat komt der no
 Name[ga]=Priontáil Rudaí Le Teacht
-Name[gl]=Estilo de Impresión do Quen Ven Agora
+Name[gl]=Estilo de Impresión do Que Ven Agora
 Name[hu]=A közeljövő eseményeinek kinyomtatása
 Name[is]=Hvað er næst prentstíll
 Name[it]=Stile di stampa "cosa viene dopo"
@@ -57,6 +59,7 @@
 Comment[da]=Dette plugin gør at du kan udskrive en liste med alle kommende begivenheder og opgaver.
 Comment[de]=Mit diesem Modul kann eine Liste der als nächstes anliegenden Ereignisse und Aufgaben gedruckt werden
 Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε μία λίστα γεγονότων ή προς υλοποίηση εργασιών.
+Comment[en_GB]=This plugin allows you to print out a list of all upcoming events and to-dos.
 Comment[es]=Este complemento le permite imprimir una lista de todos los próximos eventos y tareas pendientes.
 Comment[et]=See plugin võimaldab trükkida kõigi eelseisvate sündmuste ja ülesannete nimekirja.
 Comment[eu]=Plugin honek gertatuko diren gertaera eta egitekoen zerrenda bat inprimatzeko aukera ematen dizu.
--- korganizer/plugins/printing/journal/journalprint.desktop
+++ korganizer/plugins/printing/journal/journalprint.desktop
@@ -3,11 +3,13 @@
 Name=Journal Print Style
 Name[af]=Joernaal druk styl
 Name[ar]=نمط طباعة السّجل اليومي
+Name[bg]=Journal Print Style
 Name[ca]=Estil d'impressió del diari
 Name[cs]=Tiskový styl deníku
 Name[da]=Journal udskriftsstil
 Name[de]=Journal-Druckstil
 Name[el]=Στυλ εκτύπωσης χρονικού
+Name[en_GB]=Journal Print Style
 Name[eo]=Ĵurnal-Presostilo
 Name[es]=Estilo de impresión del diario
 Name[et]=Päeviku trükkimise stiil
@@ -57,6 +59,7 @@
 Comment[da]=Dette plugin gør at du kan udskrive journalindgange (dagbogsindgange).
 Comment[de]=Mit diesem Modul können Journaleinträge (Tagebucheinträge) gedruckt werden.
 Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε καταχωρήσεις χρονικού.
+Comment[en_GB]=This plugin allows you to print out journal entries (diary entries).
 Comment[es]=Este complemento le permite imprimir entradas del diario.
 Comment[et]=See plugin võimaldab trükkida päeviku sissekandeid.
 Comment[eu]=Plugin honek egunkarien sarrerak (eguneroko sarrerak) inprimatzeko aukera ematen dizu.
--- korganizer/plugins/printing/list/listprint.desktop
+++ korganizer/plugins/printing/list/listprint.desktop
@@ -3,11 +3,13 @@
 Name=List Print Style
 Name[af]=Lys druk styl
 Name[ar]=قائمة نمط الطباعة
+Name[bg]=List Print Style
 Name[ca]=Estil d'impressió en llista
 Name[cs]=Styl deníku - seznam
 Name[da]=Listeudskriftsstil
 Name[de]=Listen-Druckstil
 Name[el]=Στυλ εκτύπωσης λίστας
+Name[en_GB]=List Print Style
 Name[eo]=List-Presostilo
 Name[es]=Estilo de impresión de listas
 Name[et]=Nimekirja trükkimise stiil
@@ -57,6 +59,7 @@
 Comment[da]=Dette plugin gør at du kan udskrive begivenheder og opgaver på en liste.
 Comment[de]=Mit diesem Modul können Ereignisse und Aufgaben in Listenform ausgedruckt werden.
 Comment[el]=Αυτό το πρόσθετο σας επιτρέπει να εκτυπώνετε λίστες γεγονότων και προς υλοποίηση λίστες σε μορφή λίστας.
+Comment[en_GB]=This plugin allows you to print out events and to-dos in list form.
 Comment[es]=Este complemento le permite imprimir eventos y tareas pendientes en forma de lista.
 Comment[et]=See plugin võimaldab trükkida sündmusi ja ülesandeid nimekirjana.
 Comment[eu]=Plugin honek gertaerak eta egitekoak zerrenda moduan inprimatzeko aukera ematen dizu.
--- korganizer/plugins/timespanview/timespanview.desktop
+++ korganizer/plugins/timespanview/timespanview.desktop
@@ -3,11 +3,13 @@
 Name=Timespan View Plugin for KOrganizer
 Name[af]=Tydlyn aansig inprop module vir KOrganizer
 Name[ar]=ملحق عرض شريط الوقت لبرنامج المنظَم
+Name[bg]=Timespan View Plugin for KOrganizer
 Name[ca]=Connector de vista de període temporal per a KOrganizer
 Name[cs]=Modul časového pohledu pro KOrganizer
 Name[da]=Timespan-visning-plugin for KOrganizer
 Name[de]=Zeitspannenansicht-Modul für KOrganizer
 Name[el]=Πρόσθετο προβολής εργασιών του KOrganizer
+Name[en_GB]=Timespan View Plugin for KOrganizer
 Name[eo]=Tempgamrigardo-kromaĵo por Organizilo
 Name[es]=Complemento de visor de periodo de tiempo para KOrganizer
 Name[et]=KOrganizeri perioodivaate plugin
@@ -54,6 +56,7 @@
 Comment[da]=Pluginnet sørger for en tidsintervalsvisning i Korganizer (som ligner gøremål eller månedsvisning). Hvis du aktiverer dette plugin kan du skifte til tidsintervalvisning og vise dine begivenheder som i et Gantt-diagram.
 Comment[de]=Mit diesem Modul wird KOrganizer um eine Zeitspannenansicht (ähnlich der Aufgaben- und Monatsansicht) erweitert. Wenn Sie es einschalten, können Sie zur Zeitspannenansicht wechseln und sich Ihre Ereignisse wie in einem Gantt-Diagramm ansehen.
 Comment[el]=Αυτό το πρόσθετο παρέχει μία προβολή 'ανοίγματος' χρόνου για το korganizer (όπως οι μηνιαίες προβολές των προς υλοποίηση εργασιών). Αν το ενεργοποιήσετε, μπορείτε να αλλάξετε σε προβολή 'ανοίγματος' χρόνου και να δείτε τα γεγονότα σας όπως ένα διάγραμμα του Gantt.
+Comment[en_GB]=This plugin provides a timespan view for korganizer (like the to-do or month views). If you enable this plugin, you can switch to the timespan view and view your events like in a Gantt diagram.
 Comment[es]=Este complemento proporciona una vista de periodo de tiempo para KOrganizer (como la vista de tareas pendientes o la mensual). Si habilita este complemento, puede pasar a la vista de periodo de tiempo y ver sus eventos como un diagrama de Gantt.
 Comment[et]=See plugin lisab KOrganizerile perioodivaate (nagu ülesannete või kuuvaade). Selle lubamisel saab lülituda perioodivaatele ning näha oma sündmusi Gantti diagrammina.
 Comment[eu]=Plugin honek KOrganizer-entzat denbora barruti ikuspegi bat eskeintzen du. Plugin hau gaitzen baduzu denbora-barruti ikuspegira alda zaitezke gertaerak Gantt diagrama batean bezala ikusi.
--- korganizer/plugins/hebrew/hebrew.desktop
+++ korganizer/plugins/hebrew/hebrew.desktop
@@ -10,6 +10,7 @@
 Name[da]=Jødisk kalender-plugin
 Name[de]=Modul für jüdischen Kalender
 Name[el]=Πρόσθετο εβραϊκού ημερολογίου
+Name[en_GB]=Jewish Calendar Plugin
 Name[eo]=Judkalendar-kromaĵo
 Name[es]=Complemento de calendario judío
 Name[et]=Juudi kalendri plugin
@@ -60,6 +61,7 @@
 Comment[da]=Viser alle datoer i KOrganizer - også i det jødiske kalendersystem.
 Comment[de]=Zeigt alle Daten in KOrganizer auch im jüdischen Kalendarium an.
 Comment[el]=Εμφανίζει όλες τις ημερομηνίες στο korganizer και στο εβραϊκό ημερολογιακό σύστημα.
+Comment[en_GB]=Shows all dates in KOrganizer also in the Jewish calendar system.
 Comment[es]=Muestra todas las fechas en KOrganizer también en el sistema de calendario judío.
 Comment[et]=Näitab KOrganizeris kõiki kuupäevi ka juudi kalendri järgi.
 Comment[fa]=همۀ تاریخهای KOrganizer، همچنین سیستم تقویم یهودی را نمایش می‌دهد.
--- korganizer/plugins/thisdayinhistory/thisdayinhistory.desktop
+++ korganizer/plugins/thisdayinhistory/thisdayinhistory.desktop
@@ -7,6 +7,7 @@
 Name[da]=Wikipedias 'denne dag i historien'-plugin
 Name[de]=Wikipedia-Modul „Dieser Tag in der Geschichte“
 Name[el]=Πρόσθετο 'Αυτή η ημέρα στην Ιστορία' της Wikipedia
+Name[en_GB]=Wikipedia 'This Day in History' Plugin
 Name[es]=Complemento de «Este día en la historia» de la Wikipedia
 Name[et]=Wikipedia 'täna ajaloos' plugin
 Name[fi]=Wikipedian "Tämä päivä historiassa" -liitännäinen
@@ -42,6 +43,7 @@
 Comment[da]=Dette plugin viser links til Wikipedias 'denne dag i historien'-sider
 Comment[de]=Dieses Modul stellt eine Verknüpfung auf „Dieser Tag in der Geschichte“ in Wikipedia zur Verfügung.
 Comment[el]=Αυτό το πρόσθετο προσφέρει δεσμούς στις σελίδες 'Αυτή η ημέρα στην Ιστορία' της Wikipedia
+Comment[en_GB]=This plugin provides links to Wikipedia's 'This Day in History' pages
 Comment[es]=Este complemento provee un enlace a la página «Este día en la historia» de la Wikipedia
 Comment[et]=See plugin näitab Wikipedia 'täna ajaloos' lehekülgi
 Comment[fr]=Ce module externe fourni un lien vers la page « Ce jour dans l'histoire » de Wikipédia
--- korganizer/views/monthview/monthview.cpp
+++ korganizer/views/monthview/monthview.cpp
@@ -29,10 +29,9 @@
 #include "koglobals.h"
 #include "koprefs.h"
 #include "koeventpopupmenu.h"
-#include "kohelper.h"
 
-#include <kcal/incidence.h>
-#include <kcal/calendar.h>
+#include <KCal/Incidence>
+#include <KCal/Calendar>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -131,9 +130,12 @@
   DateList list;
 
   if ( mScene->selectedItem() ) {
-    IncidenceMonthItem *tmp = dynamic_cast<IncidenceMonthItem *>( mScene->selectedItem() );
+    IncidenceMonthItem *tmp = qobject_cast<IncidenceMonthItem *>( mScene->selectedItem() );
     if ( tmp ) {
-      list << tmp->realStartDate();
+      QDate selectedItemDate = tmp->realStartDate();
+      if ( selectedItemDate.isValid() ) {
+        list << selectedItemDate;
+      }
     }
   }
 
@@ -297,7 +299,7 @@
   Incidence::List selected;
 
   if ( mScene->selectedItem() ) {
-    IncidenceMonthItem *tmp = dynamic_cast<IncidenceMonthItem *>( mScene->selectedItem() );
+    IncidenceMonthItem *tmp = qobject_cast<IncidenceMonthItem *>( mScene->selectedItem() );
     if ( tmp ) {
       incidenceSelected = tmp->incidence();
 
@@ -319,10 +321,13 @@
   QDate selectedItemDate;
 
   if ( mScene->selectedItem() ) {
-    IncidenceMonthItem *tmp = dynamic_cast<IncidenceMonthItem *>( mScene->selectedItem() );
+    IncidenceMonthItem *tmp = qobject_cast<IncidenceMonthItem *>( mScene->selectedItem() );
     if ( tmp ) {
       incidenceSelected = tmp->incidence();
       selectedItemDate = tmp->realStartDate();
+      if ( !selectedItemDate.isValid() ) {
+        return;
+      }
     }
   }
 
@@ -355,7 +360,7 @@
     // cause the event to span into the displayed date range.
     int offset = 0;
     Event *event;
-    if ( ( event = dynamic_cast<Event *>( incidence ) ) ) {
+    if ( ( event = static_cast<Event *>( incidence ) ) ) {
       offset = incDtStart.daysTo( incDtEnd );
     }
 
--- korganizer/views/monthview/monthscene.cpp
+++ korganizer/views/monthview/monthscene.cpp
@@ -29,12 +29,13 @@
 #include "koprefs.h"
 #include "koglobals.h"
 
-#include <kcal/incidence.h>
-#include <kcalendarsystem.h>
+#include <KCal/Incidence>
+
+#include <KCalendarSystem>
 
-#include <QPaintEvent>
-#include <QGraphicsSceneWheelEvent>
 #include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneWheelEvent>
+#include <QPaintEvent>
 
 using namespace KOrg;
 
@@ -553,7 +554,7 @@
 
     selectItem( mClickedItem );
     if ( mouseEvent->button() == Qt::RightButton ) {
-      IncidenceMonthItem *tmp = dynamic_cast<IncidenceMonthItem *>( mClickedItem );
+      IncidenceMonthItem *tmp = qobject_cast<IncidenceMonthItem *>( mClickedItem );
       if ( tmp ) {
         emit showIncidencePopupSignal( mCalendar,
                                        tmp->incidence(), tmp->realStartDate() );
--- korganizer/views/monthview/monthitem.cpp
+++ korganizer/views/monthview/monthitem.cpp
@@ -208,7 +208,7 @@
   QDateTime start( startDate() );
   QDateTime end( endDate() );
 
-  if ( end.isValid() ) {
+  if ( start.isValid() && end.isValid() ) {
     return start.daysTo( end );
   }
 
@@ -217,6 +217,10 @@
 
 bool MonthItem::greaterThan( const MonthItem *e1, const MonthItem *e2 )
 {
+  if ( !e1->startDate().isValid() || !e2->startDate().isValid() ) {
+    return false;
+  }
+
   if ( e1->startDate() == e2->startDate() ) {
     if ( e1->daySpan() == e2->daySpan() ) {
       if ( e1->allDay() ) {
@@ -242,6 +246,10 @@
 
 void MonthItem::updatePosition()
 {
+  if ( !startDate().isValid() || !endDate().isValid() ) {
+    return;
+  }
+
   int firstFreeSpace = 0;
   for ( QDate d = startDate(); d <= endDate(); d = d.addDays( 1 ) ) {
     MonthCell *cell = mMonthScene->mMonthCellMap.value( d );
@@ -281,7 +289,7 @@
 
   // first set to 0, because it's used in startDate()
   mRecurDayOffset = 0;
-  if ( recurStartDate.isValid() ) {
+  if ( startDate().isValid() && recurStartDate.isValid() ) {
     mRecurDayOffset = startDate().daysTo( recurStartDate );
   }
 }
@@ -292,7 +300,7 @@
 
 bool IncidenceMonthItem::greaterThanFallback( const MonthItem *other ) const
 {
-  const IncidenceMonthItem *o = dynamic_cast<const IncidenceMonthItem *>( other );
+  const IncidenceMonthItem *o = qobject_cast<const IncidenceMonthItem *>( other );
   if ( !o ) {
     return MonthItem::greaterThanFallback( other );
   }
@@ -310,6 +318,10 @@
 
 QDate IncidenceMonthItem::realStartDate() const
 {
+  if ( !mIncidence ) {
+    return QDate();
+  }
+
   KDateTime dt;
   if ( mIsEvent || mIsJournal ) {
     dt = mIncidence->dtStart();
@@ -328,6 +340,10 @@
 }
 QDate IncidenceMonthItem::realEndDate() const
 {
+  if ( !mIncidence ) {
+    return QDate();
+  }
+
   KDateTime dt;
   if ( mIsEvent ) {
     dt = mIncidence->dtEnd();
@@ -364,16 +380,21 @@
 {
   Q_ASSERT( isMoveable() );
 
-  updateDates( startDate().daysTo( newStartDate ),
-               startDate().daysTo( newStartDate ) );
+  if ( startDate().isValid() && newStartDate.isValid() ) {
+    updateDates( startDate().daysTo( newStartDate ),
+                 startDate().daysTo( newStartDate ) );
+  }
 }
 void IncidenceMonthItem::finalizeResize( const QDate &newStartDate,
                                          const QDate &newEndDate )
 {
   Q_ASSERT( isResizable() );
 
-  updateDates( startDate().daysTo( newStartDate ),
-               endDate().daysTo( newEndDate ) );
+  if ( startDate().isValid() && endDate().isValid() &&
+       newStartDate.isValid() && newEndDate.isValid() ) {
+    updateDates( startDate().daysTo( newStartDate ),
+                 endDate().daysTo( newEndDate ) );
+  }
 }
 
 void IncidenceMonthItem::updateDates( int startOffset, int endOffset )
@@ -523,6 +544,10 @@
 {
   QList<QPixmap *> ret;
 
+  if ( !mIncidence ) {
+    return ret;
+  }
+
   if ( mIsEvent ) {
 
    // smartins: Disabling the event Pixmap because:
--- korganizer/views/todoview/kotodomodel.cpp
+++ korganizer/views/todoview/kotodomodel.cpp
@@ -630,11 +630,11 @@
   }
 
   TodoTreeNode *node = static_cast<TodoTreeNode *>( child.internalPointer() );
-  // every model index given out by us has a valid internal pointer, so
-  // that's save:
-  TodoTreeNode *parent = node->mParent;
-
-  return getModelIndex( parent );
+  if ( node->isValid() ) {
+    return getModelIndex( node->mParent );
+  } else {
+    return QModelIndex();
+  }
 }
 
 int KOTodoModel::columnCount( const QModelIndex &/*parent*/ ) const
--- korganizer/korganizer.desktop
+++ korganizer/korganizer.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Kalender- og planlægningsprogram
 Comment[de]=Ein Kalender und Zeitplaner
 Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
+Comment[en_GB]=Calendar and Scheduling Program
 Comment[eo]=Kalendara kaj plana programo
 Comment[es]=Calendario y planificador
 Comment[et]=Kalendri ja ajakava haldamise rakendus
@@ -67,16 +68,61 @@
 Name=KOrganizer
 Name[af]=Korganizer
 Name[ar]=برنامج المنظَم KOrganizer
+Name[bg]=KOrganizer
+Name[br]=KOrganizer
+Name[ca]=KOrganizer
+Name[cs]=KOrganizer
 Name[cy]=KTrefnydd
+Name[da]=KOrganizer
+Name[de]=KOrganizer
+Name[el]=KOrganizer
+Name[en_GB]=KOrganizer
 Name[eo]=KOrganizilo
+Name[es]=KOrganizer
+Name[et]=KOrganizer
+Name[eu]=KOrganizer
+Name[fi]=KOrganizer
+Name[fr]=KOrganizer
+Name[fy]=KOrganizer
+Name[ga]=KOrganizer
+Name[gl]=KOrganizer
+Name[he]=KOrganizer
+Name[hr]=KOrganizer
+Name[hu]=KOrganizer
+Name[is]=KOrganizer
+Name[it]=KOrganizer
+Name[ja]=KOrganizer
+Name[ka]=KOrganizer
+Name[kk]=KOrganizer
+Name[km]=KOrganizer
+Name[ko]=KOrganizer
+Name[lt]=KOrganizer
+Name[lv]=KOrganizer
 Name[mk]=КОрганизатор
+Name[ms]=KOrganizer
+Name[nb]=KOrganizer
+Name[nds]=KOrganizer
 Name[ne]=केडीई आयोजक
+Name[nl]=KOrganizer
+Name[nn]=KOrganizer
 Name[pa]=ਕੇ-ਪਰਬੰਧਕ
 Name[pl]=Organizator
+Name[pt]=KOrganizer
+Name[pt_BR]=KOrganizer
 Name[ro]=Organizator
+Name[ru]=KOrganizer
+Name[se]=KOrganizer
+Name[sk]=KOrganizer
+Name[sl]=KOrganizer
 Name[sv]=Korganizer
 Name[ta]=கேஅமைப்பாளர்
+Name[tg]=KOrganizer
+Name[tr]=KOrganizer
+Name[uk]=KOrganizer
+Name[vi]=KOrganizer
+Name[xh]=KOrganizer
 Name[x-test]=xxKOrganizerxx
+Name[zh_CN]=KOrganizer
 Name[zh_TW]=KOrganizer 行事曆
 GenericName=Personal Organizer
 GenericName[af]=Persoonlike Organiseerder
--- korganizer/koeventpopupmenu.cpp
+++ korganizer/koeventpopupmenu.cpp
@@ -95,7 +95,7 @@
   mCurrentIncidence = incidence;
   mCurrentDate = qd;
 
-  if ( mCurrentIncidence ) {
+  if ( mCurrentIncidence && qd.isValid() ) {
 
     if ( mCurrentIncidence->recurs() ) {
       KDateTime thisDateTime( qd, KOPrefs::instance()->timeSpec() );
--- korganizer/kcmconfigs/korganizer_configdesignerfields.desktop
+++ korganizer/kcmconfigs/korganizer_configdesignerfields.desktop
@@ -22,6 +22,7 @@
 Name[da]=Brugervalgte sider
 Name[de]=Benutzerdefinierte Seiten
 Name[el]=Προσαρμοσμένες σελίδες
+Name[en_GB]=Custom Pages
 Name[eo]=Propraj Paĝoj
 Name[es]=Páginas personalizadas
 Name[et]=Omaloodud leheküljed
@@ -67,6 +68,7 @@
 Name[uk]=Нетипові сторінки
 Name[x-test]=xxCustom Pagesxx
 Name[zh_CN]=定制页
+Name[zh_TW]=Custom Pages
 Comment=Configure the Custom Pages
 Comment[af]=Stel die pasmaak blaaie op
 Comment[ar]=اضبط مخصص الصفحات
@@ -77,6 +79,7 @@
 Comment[da]=Indstil de selvvalgte sider
 Comment[de]=Einstellungen für benutzerdefinierte Seiten
 Comment[el]=Ρύθμιση των προσαρμοσμένων σελίδων
+Comment[en_GB]=Configure the Custom Pages
 Comment[eo]=Agordi la proprajn paĝojn
 Comment[es]=Configurar las páginas personalizadas
 Comment[et]=Omaloodud lehekülgede seadistamine
--- korganizer/kcmconfigs/korganizer_configviews.desktop
+++ korganizer/kcmconfigs/korganizer_configviews.desktop
@@ -23,6 +23,7 @@
 Name[da]=Visninger
 Name[de]=Ansichten
 Name[el]=Προβολές
+Name[en_GB]=Views
 Name[eo]=Rigardoj
 Name[es]=Vistas
 Name[et]=Vaated
@@ -83,6 +84,7 @@
 Comment[da]=KOrganizer visningsindstilling
 Comment[de]=Ansichts-Einstellungen für KOrganizer
 Comment[el]=Ρύθμιση προβολής του KOrganizer
+Comment[en_GB]=KOrganizer View Configuration
 Comment[eo]=KOrganizilo-Rigardagordo
 Comment[es]=Configuración de la vista de KOrganizer
 Comment[et]=KOrganizeri vaateseadistused
--- korganizer/kcmconfigs/korganizer_configtime.desktop
+++ korganizer/kcmconfigs/korganizer_configtime.desktop
@@ -20,6 +20,7 @@
 Name[da]=Tid og dato
 Name[de]=Zeit und Datum
 Name[el]=Ώρα και Ημερομηνία
+Name[en_GB]=Time and Date
 Name[es]=Fecha y hora
 Name[et]=Kellaaeg ja kuupäev
 Name[fi]=Aika ja päiväys
@@ -61,6 +62,7 @@
 Comment[da]=Konfiguration af tid og dato for KOrganizer
 Comment[de]=KOrganizer-Einstellungen für Zeit/Datum
 Comment[el]=Ρύθμιση ώρας και ημερομηνίας του KOrganizer
+Comment[en_GB]=KOrganizer Time and Date Configuration
 Comment[es]=Configuración de la fecha y hora de KOrganizer
 Comment[et]=KOrganizeri ajaseadistused
 Comment[fi]=KOrganizerin aika-asetukset
--- korganizer/kcmconfigs/korganizer_configplugins.desktop
+++ korganizer/kcmconfigs/korganizer_configplugins.desktop
@@ -23,6 +23,7 @@
 Name[da]=Plugin
 Name[de]=Module
 Name[el]=Πρόσθετα
+Name[en_GB]=Plugins
 Name[eo]=Kromaĵoj
 Name[es]=Complementos
 Name[et]=Pluginad
@@ -30,6 +31,7 @@
 Name[fa]=وصله‌ها
 Name[fi]=Liitännäiset
 Name[fr]=Modules externes
+Name[fy]=Plugins
 Name[ga]=Breiseáin
 Name[gl]=Engadidos
 Name[he]=תוספים
@@ -49,6 +51,7 @@
 Name[nb]=Programtillegg
 Name[nds]=Modulen
 Name[ne]=प्लगइन
+Name[nl]=Plugins
 Name[nn]=Programtillegg
 Name[oc]=Ajustons
 Name[pa]=ਪਲੱਗਇਨਾਂ
@@ -79,6 +82,7 @@
 Comment[da]=KOrganizer plugin-indstilling
 Comment[de]=Modul-Einrichtung für KOrganizer
 Comment[el]=Ρύθμιση προσθέτων του KOrganizer
+Comment[en_GB]=KOrganizer Plugin Configuration
 Comment[eo]=KOrganizilo-Kromaĵagordo
 Comment[es]=Configuración de los complementos de KOrganizer
 Comment[et]=KOrganizeri pluginate seadistused
--- korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop
+++ korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop
@@ -22,6 +22,7 @@
 Name[da]=Gruppeskemalægning
 Name[de]=Gruppenplanung
 Name[el]=Προγραμματισμός ομάδας
+Name[en_GB]=Group Scheduling
 Name[es]=Planificación de grupos
 Name[et]=Grupitöö ajakavad
 Name[eu]=Talde antolaketa
@@ -75,6 +76,7 @@
 Comment[da]=KOrganizer gruppeskemalægning indstilling
 Comment[de]=Einrichtung von Gruppen-Planungen für KOrganizer
 Comment[el]=Ρύθμιση προγραμματισμού ομάδας του KOrganizer
+Comment[en_GB]=KOrganizer Group Scheduling Configuration
 Comment[es]=Configuración de la planificación de grupos de KOrganizer
 Comment[et]=Korganizeri grupitöö ajakavade seadistamine
 Comment[eu]=KOrganizer-en talde antolaketaren konfigurazioa
--- korganizer/kcmconfigs/korganizer_configfreebusy.desktop
+++ korganizer/kcmconfigs/korganizer_configfreebusy.desktop
@@ -21,6 +21,8 @@
 Name[cy]=Rhydd/Prysur
 Name[da]=Fri/Optaget
 Name[de]=Frei/Belegt
+Name[el]=Free/Busy
+Name[en_GB]=Free/Busy
 Name[eo]=Libera/Okupita
 Name[es]=Libre/Ocupado
 Name[et]=Vaba/hõivatud
@@ -78,6 +80,7 @@
 Comment[da]=KOrganizer Fri/Optaget-indstilling
 Comment[de]=Frei/Belegt-Festlegung für KOrganizer
 Comment[el]=Ρυθμίσεις KOrganizer Free/Busy
+Comment[en_GB]=KOrganizer Free/Busy Configuration
 Comment[eo]=KOrganizilo Agordo pri libero/okupito
 Comment[es]=Configuración de libre/ocupado de KOrganizer
 Comment[et]=KOrganizeri vaba/hõivatuse seadistused
--- korganizer/kcmconfigs/korganizer_configmain.desktop
+++ korganizer/kcmconfigs/korganizer_configmain.desktop
@@ -18,12 +18,15 @@
 Name[be]=Агульныя
 Name[bg]=Общи
 Name[br]=Pennañ
+Name[ca]=General
 Name[cs]=Obecné
 Name[cy]=Cyffredinol
 Name[da]=Generelt
 Name[de]=Allgemein
 Name[el]=Γενικά
+Name[en_GB]=General
 Name[eo]=Ĝenerala
+Name[es]=General
 Name[et]=Üldine
 Name[eu]=Orokorra
 Name[fa]=عمومی
@@ -51,10 +54,12 @@
 Name[ne]=साधारण
 Name[nl]=Algemeen
 Name[nn]=Generelt
+Name[oc]=General
 Name[pa]=ਸਧਾਰਨ
 Name[pl]=Ogólne
 Name[pt]=Geral
 Name[pt_BR]=Geral
+Name[ro]=General
 Name[ru]=Главное
 Name[se]=Oppalaš
 Name[sk]=Všeobecné
@@ -68,6 +73,7 @@
 Name[uz@cyrillic]=Умумий
 Name[x-test]=xxGeneralxx
 Name[zh_CN]=常规
+Name[zh_TW]=General
 Comment=KOrganizer Main Configuration
 Comment[af]=KOrganizer hoof opstelling
 Comment[ar]=اعدادات برنامج المنظم الرئيسية
@@ -79,6 +85,7 @@
 Comment[da]=KOrganizer hovedindstilling
 Comment[de]=Grundeinrichtung für KOrganizer
 Comment[el]=Κύρια ρύθμιση του KOrganizer
+Comment[en_GB]=KOrganizer Main Configuration
 Comment[eo]=KOrganizilo-Ĉefagordo
 Comment[es]=Configuración principal de KOrganizer
 Comment[et]=KOrganizeri põhiseadistused
--- korganizer/korganizer-import.desktop
+++ korganizer/korganizer-import.desktop
@@ -10,6 +10,7 @@
 Comment[da]=Kalender- og planlægningsprogram
 Comment[de]=Ein Kalender und Zeitplaner
 Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
+Comment[en_GB]=Calendar and Scheduling Program
 Comment[eo]=Kalendara kaj plana programo
 Comment[es]=Calendario y planificador
 Comment[et]=Kalendri ja ajakava haldamise rakendus
@@ -68,16 +69,61 @@
 Name=KOrganizer
 Name[af]=Korganizer
 Name[ar]=برنامج المنظَم KOrganizer
+Name[bg]=KOrganizer
+Name[br]=KOrganizer
+Name[ca]=KOrganizer
+Name[cs]=KOrganizer
 Name[cy]=KTrefnydd
+Name[da]=KOrganizer
+Name[de]=KOrganizer
+Name[el]=KOrganizer
+Name[en_GB]=KOrganizer
 Name[eo]=KOrganizilo
+Name[es]=KOrganizer
+Name[et]=KOrganizer
+Name[eu]=KOrganizer
+Name[fi]=KOrganizer
+Name[fr]=KOrganizer
+Name[fy]=KOrganizer
+Name[ga]=KOrganizer
+Name[gl]=KOrganizer
+Name[he]=KOrganizer
+Name[hr]=KOrganizer
+Name[hu]=KOrganizer
+Name[is]=KOrganizer
+Name[it]=KOrganizer
+Name[ja]=KOrganizer
+Name[ka]=KOrganizer
+Name[kk]=KOrganizer
+Name[km]=KOrganizer
+Name[ko]=KOrganizer
+Name[lt]=KOrganizer
+Name[lv]=KOrganizer
 Name[mk]=КОрганизатор
+Name[ms]=KOrganizer
+Name[nb]=KOrganizer
+Name[nds]=KOrganizer
 Name[ne]=केडीई आयोजक
+Name[nl]=KOrganizer
+Name[nn]=KOrganizer
 Name[pa]=ਕੇ-ਪਰਬੰਧਕ
 Name[pl]=Organizator
+Name[pt]=KOrganizer
+Name[pt_BR]=KOrganizer
 Name[ro]=Organizator
+Name[ru]=KOrganizer
+Name[se]=KOrganizer
+Name[sk]=KOrganizer
+Name[sl]=KOrganizer
 Name[sv]=Korganizer
 Name[ta]=கேஅமைப்பாளர்
+Name[tg]=KOrganizer
+Name[tr]=KOrganizer
+Name[uk]=KOrganizer
+Name[vi]=KOrganizer
+Name[xh]=KOrganizer
 Name[x-test]=xxKOrganizerxx
+Name[zh_CN]=KOrganizer
 Name[zh_TW]=KOrganizer 行事曆
 GenericName=Personal Organizer
 GenericName[af]=Persoonlike Organiseerder
--- korganizer/freebusymanager.cpp
+++ korganizer/freebusymanager.cpp
@@ -38,6 +38,8 @@
 #include "freebusymanager.h"
 #include "koprefs.h"
 #include "mailscheduler.h"
+#include "actionmanager.h"
+#include "korganizer.h"
 
 #include <kabc/stdaddressbook.h>
 #include <kabc/addressee.h>
@@ -50,6 +52,7 @@
 #include <kcal/icalformat.h>
 
 #include <kio/job.h>
+#include <kio/jobuidelegate.h>
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -74,6 +77,11 @@
   : QObject( manager ), mManager( manager ), mEmail( email )
 {
   KIO::Job *job = KIO::get( url, KIO::NoReload, KIO::HideProgressInfo );
+
+  //pass the mainwindow to the job so any prompts are active
+  KOrg::MainWindow *korg = ActionManager::findInstance( KUrl() );
+  job->ui()->setWindow( korg->topLevelWidget() );
+
   connect( job, SIGNAL(result(KJob *)), SLOT(slotResult(KJob *)) );
   connect( job, SIGNAL(data(KIO::Job *,const QByteArray &)),
            SLOT(slotData(KIO::Job *,const QByteArray &)) );
@@ -317,6 +325,11 @@
     kDebug() << targetURL;
 
     KIO::Job *job = KIO::file_copy( src, targetURL, -1, KIO::Overwrite | KIO::HideProgressInfo );
+
+    //pass the mainwindow to the job so any prompts are active
+    KOrg::MainWindow *korg = ActionManager::findInstance( KUrl() );
+    job->ui()->setWindow( korg->topLevelWidget() );
+
     connect( job, SIGNAL(result(KJob *)), SLOT(slotUploadFreeBusyResult(KJob *)) );
   }
 }

Property changes on: .
___________________________________________________________________
Added: svn:externals
   +

Places

File 4_3_BRANCH.diff of Package kdepim4 (Revision be33e285c8d7a8b0f53dd9679709d8c8)

Places