* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

38 files changed, 180 insertions, 320 deletions

diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 428084646..6689a5a30 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -57,7 +57,7 @@ class Plugin : public Kontact::Plugin
                        const TQStringList & );
     ~Plugin();
 
-    int weight() const { return 700; }
+    int weight() const { return 475; }
 
     AkregatorPartIface_stub *interface();
 
diff --git a/kontact/plugins/akregator/akregatorplugin.desktop b/kontact/plugins/akregator/akregatorplugin.desktop
index 015ae80a1..6b44fbc4a 100644
--- a/kontact/plugins/akregator/akregatorplugin.desktop
+++ b/kontact/plugins/akregator/akregatorplugin.desktop
@@ -17,24 +17,17 @@ Comment=Feed Reader Component (Akregator Plugin)
 Comment[bg]=Приставка за Akregator
 Comment[ca]=Component lector d'enllaços (endollable de l'Akregator)
 Comment[da]=Feed-læserkomponent (Akregator-plugin)
-Comment[de]=News-Leser (Akregator-Modul)
+Comment[de]=Feedreader Komponente
 Comment[el]=Συστατικό ανάγνωσης ροών (Πρόσθετο του Akregator)
-Comment[es]=Componente de lectura de fuentes (complemento de Akregator)
 Comment[et]=Uudistevoogude plugin (Akregator)
-Comment[fr]=Composant du lecteur de flux (Module pour Akregator)
-Comment[is]=Fréttastraumalestur (Akregator íforrit)
 Comment[it]=Componente lettore fonti (plugin Akregator)
 Comment[ja]=フィードリーダーコンポーネント (Akregator プラグイン)
-Comment[km]=មមាសភាគ​កម្មវិធី​អាន​មតិព័ត៌មាន (កម្មវិធី​ជំនួយ Akregator​)
 Comment[nds]=Stroomleser-Komponent (Akregator-Moduul)
 Comment[nl]=Component om feeds te lezen (Akregator-plugin)
-Comment[pl]=Składnik do czytania kanałów RSS (wtyczka Akregator)
-Comment[ru]=Просмотр лент новостей (модуль Akregator)
-Comment[sk]=Komponent na čítanie kanálov (Modul pre Akregator)
+Comment[pl]=Składnik do czytania niusów (wtyczka Akregator)
 Comment[sr]=Компонента читања довода (прикључак Akregator-а)
 Comment[sr@Latn]=Komponenta čitanja dovoda (priključak Akregator-a)
 Comment[sv]=Komponent för läsning av kanaler (Akregator-insticksprogram)
-Comment[tr]=Kaynak Okuyucu Bileşeni (Akregator Eklentisi)
 Comment[zh_CN]=新闻源阅读器组件(Akregator 插件)
 Comment[zh_TW]=Feed 閱讀器組件（Akregator 外掛程式）
 Name=Feeds
@@ -43,7 +36,7 @@ Name[bg]=Новини
 Name[ca]=Enllaços
 Name[cs]=Kanály
 Name[da]=Kilder
-Name[de]=Nachrichten
+Name[de]=Feeds
 Name[el]=Ροές
 Name[eo]=Fluoj
 Name[es]=Orígenes
@@ -60,7 +53,6 @@ Name[hu]=Hírforrások
 Name[is]=Fréttastraumar
 Name[it]=Fonti
 Name[ja]=フィード
-Name[ka]=კვება
 Name[kk]=Ақпарлар
 Name[km]=មតិព័ត៌មាន
 Name[lt]=Kanalai
@@ -73,7 +65,7 @@ Name[pl]=Kanały
 Name[pt]=Fontes
 Name[pt_BR]=Fontes de Notícias
 Name[ru]=Ленты новостей
-Name[sk]=Kanály
+Name[sk]=Kŕmitka
 Name[sl]=Viri
 Name[sr]=Доводи
 Name[sr@Latn]=Dovodi
@@ -81,7 +73,6 @@ Name[sv]=Kanaler
 Name[ta]=உள்ளீடுகள்
 Name[tr]=Haberler
 Name[uk]=Подачі
-Name[uz]=Yangiliklar tasmalari
-Name[uz@cyrillic]=Янгиликлар тасмалари
+Name[uz]=Янгиликлар тасмалари
 Name[zh_CN]=种子
 
diff --git a/kontact/plugins/akregator/akregatorplugin3.2.desktop b/kontact/plugins/akregator/akregatorplugin3.2.desktop
index 7bd29ffbc..81f9f074b 100644
--- a/kontact/plugins/akregator/akregatorplugin3.2.desktop
+++ b/kontact/plugins/akregator/akregatorplugin3.2.desktop
@@ -35,7 +35,6 @@ Comment[hu]=Akregator bővítőmodul
 Comment[is]=Akregator íforrit
 Comment[it]=Plugin aKregator
 Comment[ja]=Akregator プラグイン
-Comment[ka]=Akregator-ის მოდული
 Comment[kk]=Akregator модулі
 Comment[km]=កម្មវិធី​ជំនួយ Akregator
 Comment[lt]=Akregator priedas
@@ -58,8 +57,7 @@ Comment[sv]=Akregator-insticksprogram
 Comment[ta]=Akregator சொருகுப்பொருள்
 Comment[tr]=Akregator Eklentisi
 Comment[uk]=Втулок Akregator
-Comment[uz]=Akregator plagini
-Comment[uz@cyrillic]=Akregator плагини
+Comment[uz]=Akregator плагини
 Comment[zh_CN]=Akregator 插件
 Comment[zh_TW]=Akregator 外掛程式
 Name=Feeds
@@ -85,7 +83,6 @@ Name[hu]=Hírforrások
 Name[is]=Fréttastraumar
 Name[it]=Fonti
 Name[ja]=フィード
-Name[ka]=კვება
 Name[kk]=Ақпарлар
 Name[km]=មតិព័ត៌មាន
 Name[lt]=Kanalai
@@ -98,7 +95,7 @@ Name[pl]=Kanały
 Name[pt]=Fontes
 Name[pt_BR]=Fontes de Notícias
 Name[ru]=Ленты новостей
-Name[sk]=Kanály
+Name[sk]=Kŕmitka
 Name[sl]=Viri
 Name[sr]=Доводи
 Name[sr@Latn]=Dovodi
@@ -106,7 +103,6 @@ Name[sv]=Kanaler
 Name[ta]=உள்ளீடுகள்
 Name[tr]=Haberler
 Name[uk]=Подачі
-Name[uz]=Yangiliklar tasmalari
-Name[uz@cyrillic]=Янгиликлар тасмалари
+Name[uz]=Янгиликлар тасмалари
 Name[zh_CN]=种子
 
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index e3128cdfb..d0493f1d0 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -145,8 +145,7 @@ bool KAddressbookPlugin::isRunningStandalone()
 
 bool KAddressbookPlugin::canDecodeDrag( TQMimeSource *mimeSource )
 {
-  return TQTextDrag::canDecode( mimeSource ) ||
-    KPIM::MailListDrag::canDecode( mimeSource );
+  return KPIM::MailListDrag::canDecode( mimeSource );
 }
 
 #include <dcopref.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
index f5208ea52..29e5cb23f 100644
--- a/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
+++ b/kontact/plugins/kaddressbook/kaddressbookplugin.desktop
@@ -19,23 +19,17 @@ Comment=Contacts Component (KAdressbook Plugin)
 Comment[bg]=Приставка за адресника
 Comment[ca]=Component de contactes (endollable del KAdressbook)
 Comment[da]=Kontaktkomponent (KAddressbook-plugin)
-Comment[de]=Kontakte-Komponente (Adressbuch-Modul)
+Comment[de]=Adressbuch-Komponente (KAddressbook-Modul)
 Comment[el]=Συστατικό επαφών (Πρόσθετο του KAdressbook)
-Comment[es]=Componente de contactos (complemento de KAddressbook)
 Comment[et]=Kontaktide plugin (KDE aadressiraamat)
-Comment[fr]=Composant des contacts (module externe KAdressBook)
-Comment[is]=Vistfangaskráreining (KAddressBook íforrit)
 Comment[it]=Componente contatti (plugin KAddressbook)
 Comment[ja]=アドレス帳コンポーネント (KAddressbook プラグイン)
-Comment[km]=សមាសភាគ​ទំនាក់ទំន​ង (កម្មវិធី​ជំនួយ KAdressbook​)
 Comment[nds]=Kontakten-Komponent (KAddressbook-Moduul)
 Comment[nl]=Adresboekcomponent (KAddressbook-plugin)
 Comment[pl]=Składnik wizytówek (wtyczka KAddressBook)
-Comment[ru]=Контакты (модуль KAddressBook)
 Comment[sr]=Компонента контаката (прикључак KAddressBook-а)
 Comment[sr@Latn]=Komponenta kontakata (priključak KAddressBook-a)
 Comment[sv]=Kontaktkomponent (adressboksinsticksprogram)
-Comment[tr]=Kişiler Bileşeni (KAdresDefteri Eklentisi)
 Comment[zh_CN]=联系人组件(KAddressbook 插件)
 Comment[zh_TW]=聯絡人組件（KAddressBook 外掛程式）
 Name=Contacts
@@ -66,7 +60,6 @@ Name[hu]=Névjegyek
 Name[is]=Tengiliðir
 Name[it]=Contatti
 Name[ja]=コンタクト
-Name[ka]=კონტაქტები
 Name[kk]=Контакттар
 Name[km]=ទំនាក់ទំនង
 Name[lt]=Kontaktai
@@ -92,9 +85,8 @@ Name[sv]=Kontakter
 Name[ta]=தொடர்புகள்
 Name[tg]=Алоқот
 Name[th]=ที่อยู่ติดต่อ
-Name[tr]=Kişiler
+Name[tr]=Bağlantılar
 Name[uk]=Контакти
-Name[uz]=Aloqalar
-Name[uz@cyrillic]=Алоқалар
+Name[uz]=Алоқалар
 Name[zh_CN]=联系人
 Name[zh_TW]=聯絡人
diff --git a/kontact/plugins/karm/karmplugin.desktop b/kontact/plugins/karm/karmplugin.desktop
index 469989fe6..c6b39dfc3 100644
--- a/kontact/plugins/karm/karmplugin.desktop
+++ b/kontact/plugins/karm/karmplugin.desktop
@@ -16,23 +16,17 @@ Comment=Time Tracker Component (KArm Plugin)
 Comment[bg]=Приставка за KArm
 Comment[ca]=Component de seguiment dels temps (endollable del KArm)
 Comment[da]=Time Tracker-komponent (KArm-plugin)
-Comment[de]=Zeitplaner-Komponente (KArm-Modul)
+Comment[de]=Zeiterfassungskomponente (KArm-Modul)
 Comment[el]=Συστατικό γραμμής χρόνου (Πρόσθετο του KArm)
-Comment[es]=Componente de seguimiento de tiempos (complemento de KArm)
 Comment[et]=Ajaarvestaja plugin (KArm)
-Comment[fr]=Composant de suivi temporel (Module pour KArm)
-Comment[is]=Tímastjórnunareining (KArm íforrit)
 Comment[it]=Componente segna-tempo (plugin Karm)
 Comment[ja]=タイムトラッカーコンポーネント (KArm プラグイン)
-Comment[km]=សមាសភាគ​កម្មវិធី​តាមដាន​ពេលវេលា (កម្មវិធី​ជំនួយ KArm​)
 Comment[nds]=Tietlogbook-Komponent (KArm-Moduul)
 Comment[nl]=Tijdsregistratiecomponent (KArm-plugin)
 Comment[pl]=Składnik śledzenia czasu (wtyczka KArm)
-Comment[ru]=Отслеживание времени (модуль KArm)
 Comment[sr]=Компонента праћења времена (прикључак KArm-а)
 Comment[sr@Latn]=Komponenta praćenja vremena (priključak KArm-a)
 Comment[sv]=Komponent för tidmätning (Karm-insticksprogram)
-Comment[tr]=Zaman İzleyici Bileşeni (KArm Eklentisi)
 Comment[zh_CN]=时间追踪组件(KArm 插件)
 Comment[zh_TW]=時間追蹤器組件（KArm 外掛程式）
 
@@ -41,17 +35,11 @@ Name[bg]=Таймер
 Name[ca]=Cronòmetre
 Name[de]=Stoppuhr
 Name[el]=Χρονόμετρο
-Name[es]=Temporizador
 Name[et]=Ajaarvestaja
-Name[fr]=Minuteur
-Name[is]=Tímamælir
 Name[ja]=タイマー
-Name[km]=កម្មវិធី​កំណត់​ពេលវេលា
 Name[nds]=Tietgever
 Name[nl]=Tijdklok
 Name[pl]=Stoper
-Name[ru]=Таймер
-Name[sk]=Časovač
 Name[sr]=Тајмер
 Name[sr@Latn]=Tajmer
 Name[sv]=Tidmätning
diff --git a/kontact/plugins/kitchensync/kitchensync.desktop b/kontact/plugins/kitchensync/kitchensync.desktop
index 0b1ac5078..8b8fd76b3 100644
--- a/kontact/plugins/kitchensync/kitchensync.desktop
+++ b/kontact/plugins/kitchensync/kitchensync.desktop
@@ -16,25 +16,17 @@ Comment=Synchronization Component (Kitchensynk Plugin)
 Comment[bg]=Приставка за синхронизация
 Comment[ca]=Component de sincronització (endollable del KitchenSync)
 Comment[da]=Synkronisergingskomponent (Kitchensync-plugin)
-Comment[de]=Abgleich-Komponente (KitchenSync-Modul)
+Comment[de]=Synchronisationskomponente (KitchenSync-Modul)
 Comment[el]=Συστατικό συγχρονισμού (Πρόσθετο του Kitchensynk)
-Comment[en_GB]=Synchronisation Component (Kitchensynk Plugin)
-Comment[es]=Componente de sincronización (complemento de KitchenSync)
 Comment[et]=Sünkroniseerimise plugin (KitchenSync)
-Comment[fr]=Composant de synchronisation (Module KitchenSync)
-Comment[is]=Samstillingareining (KitchenSync íforrit)
 Comment[it]=Componente di sincronizzazione (plugin KitchenSync)
 Comment[ja]=同期コンポーネント (KitchenSync プラグイン)
-Comment[km]=ការ​ធ្វើ​សមកាលកម្ម​សមាសភាគ (កម្មវិធី​ជំនួយ Kitchensynk​)
 Comment[nds]=Synkroniseer-Komponent (Kitchensynk-Moduul)
 Comment[nl]=Synchronisatiecomponent (Kitchensynk-plugin)
 Comment[pl]=Składnik synchronizacji (wtyczka KitchenSync)
-Comment[ru]=Синхронизация (модуль KitchenSync)
-Comment[sk]=Synchronizačný komponent (Modul pre Kitchensynk)
 Comment[sr]=Компонента синхронизације (прикључак KitchenSync-а)
 Comment[sr@Latn]=Komponenta sinhronizacije (priključak KitchenSync-a)
 Comment[sv]=Synkroniseringskomponent (Kitchensynk-insticksprogram)
-Comment[tr]=Eşzamanlama Eklentisi (Kitchensynk Eklentisi)
 Comment[zh_CN]=同步组件(KitchenSync 插件)
 Comment[zh_TW]=同步組件（KitchenSynk 外掛程式）
 Name=Sync
@@ -42,11 +34,8 @@ Name[bg]=Синхронизация
 Name[de]=Abgleich
 Name[el]=Συγχρονισμός
 Name[et]=Sünkroniseerimine
-Name[fr]=Synchroniser
-Name[is]=Samstilling
 Name[ja]=同期
 Name[nds]=Synkroniseren
 Name[pl]=Synchronizacja
-Name[ru]=Синхронизация
 Name[sv]=Synkronisering
 Name[zh_TW]=同步
diff --git a/kontact/plugins/kmail/Makefile.am b/kontact/plugins/kmail/Makefile.am
index d176693a3..f390aff4e 100644
--- a/kontact/plugins/kmail/Makefile.am
+++ b/kontact/plugins/kmail/Makefile.am
@@ -1,5 +1,7 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_builddir)/kmail \
            -I$(top_srcdir)/libkdepim \
+           -I$(top_srcdir)/libkdenetwork \
+           -I$(top_srcdir)/certmanager/lib \
            -I$(top_srcdir) $(all_includes)
 
 kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la
diff --git a/kontact/plugins/kmail/kcmkmailsummary.desktop b/kontact/plugins/kmail/kcmkmailsummary.desktop
index 2b8c7d99e..d616429e7 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.desktop
+++ b/kontact/plugins/kmail/kcmkmailsummary.desktop
@@ -16,22 +16,15 @@ Name[ca]=Resum de correu
 Name[da]=Oversigt over e-mail
 Name[de]=E-Mail-Übersicht
 Name[el]=Επισκόπηση αλληλογραφίας
-Name[es]=Resumen de correo electrónico
 Name[et]=E-posti ülevaade
-Name[fr]=Aperçu du courriel
-Name[is]=Yfirsýn á tölvupóst
 Name[it]=Panoramica posta elettronica
 Name[ja]=メールの要約
-Name[km]=ទិដ្ឋភាព​ទូទៅ​របស់​អ៊ីមែល
 Name[nds]=Nettpost-Översicht
 Name[nl]=E-mailoverzicht
 Name[pl]=Poczta
-Name[ru]=Сведения о почте
-Name[sk]=Prehľad pošty
 Name[sr]=Преглед е-поште
 Name[sr@Latn]=Pregled e-pošte
 Name[sv]=E-postöversikt
-Name[tr]=E-Postalara Genel Bakış
 Name[zh_CN]=邮件概览
 Name[zh_TW]=郵件概要
 Comment=E-Mail Summary Setup
@@ -40,22 +33,15 @@ Comment[ca]=Configuració del resum de correu
 Comment[da]=Opsætning af post-opsummering
 Comment[de]=Einstellungen für E-Mail-Übersicht
 Comment[el]=Ρύθμιση σύνοψης αλληλογραφίας
-Comment[es]=Configuración del resumen de correo electrónico
 Comment[et]=E-posti kokkuvõtte seadistus
-Comment[fr]=Configuration du résumé des courriels
-Comment[is]=Uppsetning póstyfirlits
 Comment[it]=Impostazioni sommario posta elettronica
 Comment[ja]=メール要約の設定
-Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​អ៊ីមែល
 Comment[nds]=Instellen för Nettpost-Översicht
 Comment[nl]=Instellingen voor e-mailoverzicht
 Comment[pl]=Ustawienia podsumowania e-maili
-Comment[ru]=Настройка сводки почты
-Comment[sk]=Nastavenie súhrnu pošty
 Comment[sr]=Подешавање сажетка е-поште
 Comment[sr@Latn]=Podešavanje sažetka e-pošte
 Comment[sv]=Inställning av e-postöversikt
-Comment[tr]=E-Posta Özet Yapılandırması
 Comment[zh_CN]=邮件摘要设置
 Comment[zh_TW]=郵件摘要設定
 Keywords=email, summary, configure, settings
@@ -72,7 +58,7 @@ Keywords[et]=e-post, meil, seadistamine, seadistused
 Keywords[eu]=eposta, laburpena, konfiguratu, ezarpenak
 Keywords[fa]=email، خلاصه، پیکربندی، تنظیمات
 Keywords[fi]=sähköposti, yhteenveto, asetukset
-Keywords[fr]=message,messagerie,courriel,résumé,vue,configurer,paramètres,paramètre
+Keywords[fr]=message,messagerie,courrier,résumé,vue,configurer,paramètres,paramètre
 Keywords[fy]=email,e-mail,e-post,oersicht,gearfetting,ynstellings, konfiguraasje
 Keywords[ga]=ríomhphost, achoimre, cumraigh, socruithe
 Keywords[gl]=email, resumo, configurar, opcións
@@ -81,7 +67,6 @@ Keywords[hu]=e-mail,áttekintés,konfigurálás,beállítások
 Keywords[is]=tölvupóstur, yfirlit, stillingar, stilla
 Keywords[it]=posta elettronica, email, sommario, configura, impostazioni
 Keywords[ja]=メール,要約,設定,設定
-Keywords[ka]=ელფოსტა,დაიჯესტი,კონფიგურაცია,პარამეტრები
 Keywords[km]=អ៊ីមែល,សង្ខេប,កំណត់​រចនាសម្ព័ន្ធ,ការ​កំណត់
 Keywords[lt]=email, summary, configure, settings, e. paštas, santrauka, konfigūruoti, nustatymai
 Keywords[mk]=email, summary, configure, settings, е-пошта, преглед, конфигурација, поставувања
@@ -91,10 +76,10 @@ Keywords[nds]=Nettpost,Nettbreef,Översicht,instellen
 Keywords[ne]=इमेल, सारांश, कन्फिगर, सेटिङ
 Keywords[nl]=email,e-mail,overzicht,samenvatting,instellingen,configuratie
 Keywords[nn]=e-post,samandrag,oppsett,innstillingar
-Keywords[pl]=e-mail,list,podsumowanie,konfiguracja,ustawienia
+Keywords[pl]=email,list,podsumowanie,konfiguracja,ustawienia
 Keywords[pt]=e-mail, sumário, configurar, configuração
 Keywords[pt_BR]=e-mail, resumo, configurar, configurações
-Keywords[ru]=email,summary,configure,settings,настройки,сводка,почта
+Keywords[ru]=email,summary,configure,settings,настройки,дайджест,почта
 Keywords[sk]=email,súhrn,nastavenie
 Keywords[sl]=e-pošta,pošta,povzetek,nastavi,nastavitve
 Keywords[sr]=емаил, сажетак, подеси, поставке
diff --git a/kontact/plugins/kmail/kmailplugin.desktop b/kontact/plugins/kmail/kmailplugin.desktop
index 55ba5e97b..7758a8e2a 100644
--- a/kontact/plugins/kmail/kmailplugin.desktop
+++ b/kontact/plugins/kmail/kmailplugin.desktop
@@ -22,46 +22,31 @@ Comment[ca]=Component de correu (endollable del KMail)
 Comment[da]=Post-komponent (KMail-plugin)
 Comment[de]=E-Mail-Komponente (KMail-Modul)
 Comment[el]=Συστατικό αλληλογραφίας (Πρόσθετο του KMail)
-Comment[es]=Componente de correo electrónico (complemento de KMail)
 Comment[et]=E-posti plugin (KMail)
-Comment[fr]=Composant de courriel (Module pour KMail)
-Comment[is]=Pósteining (KMail íforrit)
 Comment[it]=Componente posta elettronica (plugin KMail)
 Comment[ja]=メールコンポーネント (KMail プラグイン)
-Comment[km]=សមាសភាគ​អ៊ីមែល (កម្មវិធី​ជំនួយ KMail)
 Comment[nds]=Nettpost-Komponent (KMail-Moduul)
 Comment[nl]=E-mailcomponent (KMail-plugin)
 Comment[pl]=Składnik poczty (wtyczka KMail)
-Comment[pt_BR]=Componente de e-mail (plug-in do KMail)
-Comment[ru]=Электронная почта (модуль KMail)
-Comment[sk]=Poštový komponent (Model pre KMail)
 Comment[sr]=Компонента е-поште (прикључак KMail-а)
 Comment[sr@Latn]=Komponenta e-pošte (priključak KMail-a)
 Comment[sv]=E-postkomponent (Kmail-insticksprogram)
-Comment[tr]=E-Posta Bileşeni (KMail Eklentisi)
 Comment[zh_CN]=邮件组件(KMail 插件)
 Comment[zh_TW]=電子郵件組件（KMail 外掛程式）
 Name=E-Mail
 Name[bg]=Е-поща
 Name[ca]=Correu
 Name[da]=E-mail
+Name[de]=E-Mail
 Name[el]=Αλληλογραφία
-Name[es]=Correo electrónico
 Name[et]=E-post
-Name[fr]=Courriel
-Name[is]=Tölvupóstur
 Name[it]=Posta elettronica
 Name[ja]=メール
-Name[km]=អ៊ីមែល
 Name[nds]=Nettpost
 Name[nl]=E-mail
 Name[pl]=E-mail
-Name[pt_BR]=E-mail
-Name[ru]=Электронная почта
-Name[sk]=Pošta
 Name[sr]=Е-пошта
 Name[sr@Latn]=E-pošta
 Name[sv]=E-post
-Name[tr]=E-Posta
 Name[zh_CN]=邮件
 Name[zh_TW]=電子郵件
diff --git a/kontact/plugins/knode/knodeplugin.desktop b/kontact/plugins/knode/knodeplugin.desktop
index d84c16f7e..559eaadde 100644
--- a/kontact/plugins/knode/knodeplugin.desktop
+++ b/kontact/plugins/knode/knodeplugin.desktop
@@ -19,21 +19,15 @@ Comment[ca]=Component de notícies (endollable del KNode)
 Comment[da]=Nyhedskomponent (KNode-plugin)
 Comment[de]=News-Komponente (KNode-Modul)
 Comment[el]=Συστατικό ανάγνωσης νέων (Πρόσθετο του KNode)
-Comment[es]=Componente de noticias (complemento de KNode)
 Comment[et]=Uudistelugeja plugin (KNode)
-Comment[fr]=Composant de lecteur de nouvelles (Module pour KNode)
-Comment[is]=Fréttaeining (KNode íforrit)
 Comment[it]=Componente lettore di news (plugin KNode)
 Comment[ja]=ニュースリーダーコンポーネント (KNode プラグイン)
-Comment[km]=សមាសភាគ Newsreader (កម្មវិធី​ជំនួយ KNode)
 Comment[nds]=Narichtenkieker-Komponent (KNode-Moduul)
 Comment[nl]=Nieuwscomponent (KNode-plugin)
 Comment[pl]=Składnik wiadomości (wtyczka KNode)
-Comment[ru]=Новости (модуль KNode)
 Comment[sr]=Компонента вести (прикључак KNode-а)
 Comment[sr@Latn]=Komponenta vesti (priključak KNode-a)
 Comment[sv]=Komponent för läsning av diskussionsgrupper (Knode-insticksprogram)
-Comment[tr]=Haber Okuyucu Bileşeni (KNode Eklentisi)
 Comment[zh_CN]=新闻组阅读器组件(KNode 插件)
 Comment[zh_TW]=新聞閱讀器組件（KNode 外掛程式）
 Name=News
@@ -64,7 +58,6 @@ Name[hi]=समाचार
 Name[hu]=Hírek
 Name[is]=Fréttir
 Name[ja]=ニュース
-Name[ka]=სიახლეები
 Name[kk]=Жаңалықтар
 Name[km]=ព័ត៌មាន
 Name[lt]=Naujienos
@@ -92,7 +85,6 @@ Name[tg]=Ахборот
 Name[th]=ข่าว
 Name[tr]=Haberler
 Name[uk]=Новини
-Name[uz]=Yangiliklar
-Name[uz@cyrillic]=Янгиликлар
+Name[uz]=Янгиликлар
 Name[zh_CN]=新闻
 Name[zh_TW]=新聞
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 4702eb2d2..d4a5e8547 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -386,12 +386,14 @@ void KNotesPart::editNote( TQIconViewItem *item )
 
 void KNotesPart::renameNote()
 {
+  mOldName = mNotesView->currentItem()->text();
   mNotesView->currentItem()->rename();
 }
 
 void KNotesPart::renamedNote( TQIconViewItem* )
 {
-  mManager->save();
+  if ( mOldName != mNotesView->currentItem()->text() )
+    mManager->save();
 }
 
 void KNotesPart::slotOnCurrentChanged( TQIconViewItem* )
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index de41f9aae..764bb4849 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -96,6 +96,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
 
     KNotesResourceManager *mManager;
     TQDict<KNotesIconViewItem> mNoteList;
+  TQString mOldName;
 };
 
 #endif
diff --git a/kontact/plugins/knotes/knotesplugin.desktop b/kontact/plugins/knotes/knotesplugin.desktop
index e7fe8fc0c..71068d94f 100644
--- a/kontact/plugins/knotes/knotesplugin.desktop
+++ b/kontact/plugins/knotes/knotesplugin.desktop
@@ -19,21 +19,15 @@ Comment[ca]=Component de notes (endollable del KNotes)
 Comment[da]=Notatkomponent (KNotes-plugin)
 Comment[de]=Notizen-Komponente (KNotes-Modul)
 Comment[el]=Συσταικό σημειώσεων (Πρόσθετο του KNotes)
-Comment[es]=Componente de notas (complemento de KNotes)
 Comment[et]=Märkmete plugin (KNotes)
-Comment[fr]=Composant de notes (Module KNotes)
-Comment[is]=Minnismiðaeining (KNotes íforrit)
 Comment[it]=Componente note (plugin KNotes)
 Comment[ja]=メモコンポーネント (KNotes プラグイン)
-Comment[km]=សមាសភាគ​ចំណាំ (កម្មវិធី​ជំនួយ KNotes​)
 Comment[nds]=Notizen-Komponent (KNotes-Moduul)
 Comment[nl]=Notitiecomponent (KNotes-plugin)
 Comment[pl]=Składnik notatek (wtyczka KNotes)
-Comment[ru]=Заметки (модуль KNotes)
 Comment[sr]=Компонента белешки (прикључак KNotes-а)
 Comment[sr@Latn]=Komponenta beleški (priključak KNotes-a)
 Comment[sv]=Anteckningskomponent (Knotes-insticksprogram)
-Comment[tr]=Notlar Bileşeni (KNotes Eklentisi)
 Comment[zh_CN]=便笺组件(KNotes 插件)
 Comment[zh_TW]=便條組件（KNotes 外掛程式）
 Name=Notes
@@ -63,7 +57,6 @@ Name[hu]=Feljegyzések
 Name[is]=Minnismiðar
 Name[it]=Note
 Name[ja]=メモ
-Name[ka]=ჩანიშვნები
 Name[kk]=Жазбалар
 Name[km]=ចំណាំ
 Name[lt]=Užrašai
@@ -89,7 +82,6 @@ Name[tg]=Ахборот
 Name[th]=บันทึกช่วยจำ
 Name[tr]=Notlar
 Name[uk]=Примітки
-Name[uz]=Yozma xotira
-Name[uz@cyrillic]=Ёзма хотира
+Name[uz]=Ёзма хотира
 Name[zh_CN]=便笺
 Name[zh_TW]=備忘錄
diff --git a/kontact/plugins/korganizer/journalplugin.desktop b/kontact/plugins/korganizer/journalplugin.desktop
index 8f33753ed..f24c1206c 100644
--- a/kontact/plugins/korganizer/journalplugin.desktop
+++ b/kontact/plugins/korganizer/journalplugin.desktop
@@ -21,21 +21,15 @@ Comment[ca]=Component de diari (endollable del KOrganizer)
 Comment[da]=Journalkomponent (KOrganizer-plugin)
 Comment[de]=Journal-Komponente (KOrganizer-Modul)
 Comment[el]=Συστατικό χρονικών (Πρόσθετο του KOrganizer)
-Comment[es]=Componente de diario (Complemento de KOrganizer)
 Comment[et]=Päevikuplugin (KOrganizer)
-Comment[fr]= Composant de journal (Module KOrganizer)
-Comment[is]=Dagbókareining (Journal KOrganizer íforrit)
 Comment[it]=Componente diario (plugin KOrganizer)
 Comment[ja]=ジャーナルコンポーネント (KOrganizer プラグイン)
-Comment[km]=សមាភាគទិនានុប្បវត្តិ (កម្មវិធី​ជំនួយ KOrganizer​)
 Comment[nds]=Daagböker-Komponent (KOrganizer-Moduul)
 Comment[nl]=Journaalcomponent (KOrganizer-plugin)
 Comment[pl]=Składnik dziennika (wtyczka Korganizer)
-Comment[ru]=Журнал (модуль KOrganizer)
 Comment[sr]=Компонента дневника (прикључак KOrganizer-а)
 Comment[sr@Latn]=Komponenta dnevnika (priključak KOrganizer-a)
 Comment[sv]=Journalkomponent (Korganizer-insticksprogram)
-Comment[tr]=Günlük Bileşeni (KOrganizer Eklentisi)
 Comment[zh_CN]=日记组件(KOrganizer 插件)
 Comment[zh_TW]=日誌組件（KOrganizer 外掛程式）
 Name=Journal
@@ -61,7 +55,6 @@ Name[hu]=Napló
 Name[is]=Dagbók
 Name[it]=Diario
 Name[ja]=ジャーナル
-Name[ka]=ჟურნალი
 Name[kk]=Күнделік
 Name[km]=ទិនានុប្បវត្តិ
 Name[lt]=Dienynas
@@ -83,7 +76,6 @@ Name[ta]=பத்திரிகை
 Name[th]=วารสาร
 Name[tr]=Günlük
 Name[uk]=Журнал
-Name[uz]=Kundalik
-Name[uz@cyrillic]=Кундалик
+Name[uz]=Кундалик
 Name[zh_CN]=日记
 Name[zh_TW]=日誌
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index 2aeca3544..beb4c2e95 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -40,7 +40,7 @@ class JournalPlugin : public Kontact::Plugin
 
     virtual bool createDCOPInterface( const TQString& serviceType );
     virtual bool isRunningStandalone();
-    int weight() const { return 500; }
+    int weight() const { return 525; }
 
     virtual TQStringList invisibleToolbarActions() const;
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.desktop b/kontact/plugins/korganizer/kcmkorgsummary.desktop
index 2f657852e..175ed6242 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.desktop
+++ b/kontact/plugins/korganizer/kcmkorgsummary.desktop
@@ -16,21 +16,15 @@ Name[ca]=Resum de cites i tasques pendents
 Name[da]=Oversigt over møder og gøremål
 Name[de]=Übersicht über Termine und Aufgaben
 Name[el]=Επισκόπηση ραντεβού και προς υλοποίηση εργασιών
-Name[es]=Resumen de citas y tareas pendientes
 Name[et]=Kohtumised ja ülesannete ülevaade
-Name[fr]=Aperçu des rendez-vous et des tâches
-Name[is]=Yfirlit um fundi og verkþætti
 Name[it]=Panoramica appuntamenti e cose da fare
 Name[ja]=約束と To-Do の要約
-Name[km]=ទិដ្ឋភាព​ការ​ណាត់ និង​ការងារ​ត្រូវ​ធ្វើ
 Name[nds]=Termin- un Opgaven-Översicht
 Name[nl]=Overzicht van evenementen en taken
 Name[pl]=Spotkania i zadania
-Name[ru]=Сводка встреч и задач
 Name[sr]=Преглед састанака и обавеза
 Name[sr@Latn]=Pregled sastanaka i obaveza
 Name[sv]=Översikt av möten och uppgifter
-Name[tr]=Randevulara ve Yapılacaklara Genel Bakış
 Name[zh_CN]=约会和待办概览
 Name[zh_TW]=約會與待辦事項概觀
 Comment=Appointments and To-dos Summary Setup
@@ -50,10 +44,9 @@ Comment[fr]=Configuration du résumé des évènements et des tâches
 Comment[fy]=Oersichtsynstellings foar eveneminten en taken
 Comment[gl]=Configuración de sumarios de tarefas e notas
 Comment[hu]=A találkozók és feladatok áttekintőjének beállítása
-Comment[is]=Uppsetning á yfirliti yfir fundi og verkefni
+Comment[is]=Uppsetning á yfirliti yfir fundi og verkþætti
 Comment[it]=Impostazioni sommario appuntamenti e cose da fare
 Comment[ja]=約束と To-Do の要約設定
-Comment[ka]=შეხვედრათა და გასაკეთებელთა რეზიუმეს დაყენება
 Comment[kk]=Кездесулер мен Жоспарлар тұжырымының баптау
 Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​ការ​ណាត់ និង​ការងារ​ត្រូវ​ធ្វើ
 Comment[lt]=Susitikimų ir užduočių santraukos nustatymai
@@ -66,7 +59,7 @@ Comment[nn]=Oppsett av samandrag av avtalar og oppgåver
 Comment[pl]=Ustawienia podsumowania spotkań i zadań
 Comment[pt]=Configuração do Sumário de Compromissos e A-fazeres
 Comment[pt_BR]=Configuração do Resumo de Compromissos e Tarefas
-Comment[ru]=Настройка сводки встреч и задач
+Comment[ru]=Настройка показа встреч и задач
 Comment[sk]=Nastavenie súhrnu pripomienok a úloh
 Comment[sl]=Nastavitve povzetka sestankov in opravil
 Comment[sr]=Подешавање сажетка састанака и обавеза
@@ -97,10 +90,9 @@ Keywords[ga]=féilire, tascanna, cumraigh, socruithe
 Keywords[gl]=calendario, pendentes, configurar, opcións
 Keywords[he]=calendar, todos, configure, settings, יומן, יומנים, משימות, מטלות, הגדרות, תצורה
 Keywords[hu]=naptár,feladatok,konfigurálás,beállítások
-Keywords[is]=dagatal, verkefni, stillingar, stilla
+Keywords[is]=dagatal, verkþættir, stillingar, stilla
 Keywords[it]=calendario, cose da fare, configura, impostazioni
 Keywords[ja]=カレンダー, To-Do, 設定
-Keywords[ka]=კალენდარი,გასაკეთებლები,კონფიგურაცია,პარამეტრები
 Keywords[km]=ប្រតិទិន,ការងារ​ត្រូវ​ធ្វើ,កំណត់​រចនាសម្ព័ន្ធ,ការ​កំណត់
 Keywords[lt]=calendar, todos, configure, settings, kalendorius, darbai, konfigūruoti, nustatymai
 Keywords[ms]=kalendar, tugasan, konfigur, seting
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index b70042353..42a7adcae 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -20,19 +20,40 @@
 */
 
 #include "korg_uniqueapp.h"
-#include <kdebug.h>
 #include "../../korganizer/korganizer_options.h"
 
+#include "core.h"
+#include <dcopref.h>
+#include <kapplication.h>
+#include <kstartupinfo.h>
+#include <kwin.h>
+
 void KOrganizerUniqueAppHandler::loadCommandLineOptions()
 {
-    KCmdLineArgs::addCmdLineOptions( korganizer_options );
+  KCmdLineArgs::addCmdLineOptions( korganizer_options );
 }
 
 int KOrganizerUniqueAppHandler::newInstance()
 {
-    //kdDebug(5602) << k_funcinfo << endl;
-    // Ensure part is loaded
-    (void)plugin()->part();
-    // TODO handle command line options
-    return Kontact::UniqueAppHandler::newInstance();
+  // Ensure part is loaded
+  (void)plugin()->part();
+  DCOPRef korganizer( "korganizer", "KOrganizerIface" );
+  korganizer.send( "handleCommandLine" );
+
+  // Bring korganizer's plugin to front
+  // This bit is duplicated from KUniqueApplication::newInstance()
+  if ( kapp->mainWidget() ) {
+    kapp->mainWidget()->show();
+    KWin::forceActiveWindow( kapp->mainWidget()->winId() );
+    KStartupInfo::appStarted();
+  }
+
+  // Then ensure the part appears in kontact.
+  // ALWAYS use the korganizer plugin; i.e. never show the todo nor journal
+  // plugins when creating a new instance via the command line, even if
+  // the command line options are empty; else we'd need to examine the
+  // options and then figure out which plugin we should show.
+  // kolab/issue3971
+  plugin()->core()->selectPlugin( "kontact_korganizerplugin" );
+  return 0;
 }
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index f0f88c7ca..cd590ec96 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -42,6 +42,10 @@
 
 #include <libkdepim/kvcarddrag.h>
 #include <libkdepim/maillistdrag.h>
+#include <libkdepim/kpimprefs.h>
+
+#include <libkcal/calendarlocal.h>
+#include <libkcal/icaldrag.h>
 
 #include "core.h"
 #include "summarywidget.h"
@@ -78,6 +82,11 @@ KOrganizerPlugin::~KOrganizerPlugin()
 
 Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent )
 {
+  // korg part must be loaded, otherwise when starting kontact on summary view
+  // it won't display our stuff.
+  // If the part is already loaded loadPart() is harmless and just returns
+  loadPart();
+
   return new SummaryWidget( this, parent );
 }
 
@@ -160,27 +169,43 @@ bool KOrganizerPlugin::canDecodeDrag( TQMimeSource *mimeSource )
 
 void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
 {
-  TQString text;
-
-  KABC::VCardConverter converter;
-  if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) {
-    KABC::Addressee::List contacts = converter.parseVCards( text );
-    KABC::Addressee::List::Iterator it;
-
+  KABC::Addressee::List list;
+  if ( KVCardDrag::decode( event, list ) ) {
     TQStringList attendees;
-    for ( it = contacts.begin(); it != contacts.end(); ++it ) {
+    KABC::Addressee::List::Iterator it;
+    for ( it = list.begin(); it != list.end(); ++it ) {
       TQString email = (*it).fullEmail();
-      if ( email.isEmpty() )
+      if ( email.isEmpty() ) {
         attendees.append( (*it).realName() + "<>" );
-      else
+      } else {
         attendees.append( email );
+      }
     }
-
     interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null,
                                   attendees );
     return;
   }
 
+  if ( KCal::ICalDrag::canDecode( event) ) {
+      KCal::CalendarLocal cal( KPimPrefs::timezone() );
+      if ( KCal::ICalDrag::decode( event, &cal ) ) {
+          KCal::Incidence::List incidences = cal.incidences();
+          if ( !incidences.isEmpty() ) {
+              event->accept();
+              KCal::Incidence *i = incidences.first();
+              TQString summary;
+              if ( dynamic_cast<KCal::Journal*>( i ) )
+                  summary = i18n( "Note: %1" ).arg( i->summary() );
+              else
+                  summary = i->summary();
+              interface()->openEventEditor( summary, i->description(), TQString() );
+              return;
+          }
+      // else fall through to text decoding
+      }
+  }
+
+  TQString text;
   if ( TQTextDrag::decode( event, text ) ) {
     kdDebug(5602) << "DROP:" << text << endl;
     interface()->openEventEditor( text );
diff --git a/kontact/plugins/korganizer/korganizerplugin.desktop b/kontact/plugins/korganizer/korganizerplugin.desktop
index 7a29913c1..896320c15 100644
--- a/kontact/plugins/korganizer/korganizerplugin.desktop
+++ b/kontact/plugins/korganizer/korganizerplugin.desktop
@@ -21,22 +21,15 @@ Comment[ca]=Component de calendari (endollable del KOrganizer)
 Comment[da]=Kalenderkomponent (KOrganizer-plugin)
 Comment[de]=Kalender-Komponente (KOrganizer-Modul)
 Comment[el]=Συστατικό ημερολογίου (Πρόσθετο του KOrganizer)
-Comment[es]=Componente de calendario (complemento de KOrganizer)
 Comment[et]=Kalendriplugin (KOrganizer)
-Comment[fr]= Composant de calendrier (Module KOrganizer)
-Comment[is]=Dagatalseining (KOrganizer íforrit)
 Comment[it]=Componente calendario (plugin KOrganizer)
 Comment[ja]=カレンダーコンポーネント (KOrganizer プラグイン)
-Comment[km]=សមាសភាគ​ប្រតិទិន (កម្មវិធីជំនួយ​ KOrganizer​)
 Comment[nds]=Kalenner-Komponent (KOrganizer-Moduul)
 Comment[nl]=Agendacomponent (KOrganizer-plugin)
 Comment[pl]=Składnik kalendarza (wtyczka KOrganizer)
-Comment[ru]=Календарь (модуль KOrganizer)
-Comment[sk]=Kalendárový komponent (Modeul pre KOrganizer)
 Comment[sr]=Компонента календара (прикључак KOrganizer-а)
 Comment[sr@Latn]=Komponenta kalendara (priključak KOrganizer-a)
 Comment[sv]=Kalenderkomponent (Korganizer-insticksprogram)
-Comment[tr]=Takvim Bileşeni (KOrganizer Eklentisi)
 Comment[zh_CN]=日历组件(KOrganizer 插件)
 Comment[zh_TW]=行事曆組件（KOrganizer 外掛程式）
 Name=Calendar
@@ -68,7 +61,6 @@ Name[hu]=Naptár
 Name[is]=Dagatal
 Name[it]=Calendario
 Name[ja]=カレンダー
-Name[ka]=კალენდარი
 Name[kk]=Күнтізбе
 Name[km]=ប្រតិទិន
 Name[lt]=Kalendorius
@@ -95,7 +87,6 @@ Name[tg]=Тақвим
 Name[th]=บันทึกประจำวัน
 Name[tr]=Takvim
 Name[uk]=Календар
-Name[uz]=Kalendar
-Name[uz@cyrillic]=Календар
+Name[uz]=Календар
 Name[zh_CN]=日历
 Name[zh_TW]=行事曆
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index ff3d5da9d..cab7788f9 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -65,7 +65,6 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
   mLayout->setRowStretch( 6, 1 );
 
   mCalendar = KOrg::StdCalendar::self();
-  mCalendar->load();
 
   connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
   connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
@@ -94,6 +93,8 @@ void SummaryWidget::updateView()
   TQLabel *label = 0;
   int counter = 0;
   TQPixmap pm = loader.loadIcon( "appointment", KIcon::Small );
+  TQPixmap pmb = loader.loadIcon( "calendarbirthday", KIcon::Small );
+  TQPixmap pma = loader.loadIcon( "calendaranniversary", KIcon::Small );
 
   TQDate dt;
   TQDate currentDate = TQDate::currentDate();
@@ -101,38 +102,22 @@ void SummaryWidget::updateView()
         dt<=currentDate.addDays( days - 1 );
         dt=dt.addDays(1) ) {
 
-    KCal::Event *ev;
-
-    KCal::Event::List events_orig = mCalendar->events( dt );
-    KCal::Event::List::ConstIterator it = events_orig.begin();
-
-    KCal::Event::List events;
-    events.setAutoDelete( true );
-    TQDateTime qdt;
-
-    // prevent implicitely sharing while finding recurring events
-    // replacing the TQDate with the currentDate
-    for ( ; it != events_orig.end(); ++it ) {
-      ev = (*it)->clone();
-      if ( ev->recursOn( dt ) ) {
-        qdt = ev->dtStart();
-        qdt.setDate( dt );
-        ev->setDtStart( qdt );
-      }
-      events.append( ev );
-    }
+    KCal::Event::List events = mCalendar->events( dt );
 
     // sort the events for this date by summary
-    events = KCal::Calendar::sortEvents( &events,
-                                         KCal::EventSortSummary,
-                                         KCal::SortDirectionAscending );
+    events = KCal::Calendar::sortEventsForDate( &events,
+                                                dt,
+                                                KCal::EventSortSummary,
+                                                KCal::SortDirectionAscending );
     // sort the events for this date by start date
-    events = KCal::Calendar::sortEvents( &events,
-                                         KCal::EventSortStartDate,
-                                         KCal::SortDirectionAscending );
+    events = KCal::Calendar::sortEventsForDate( &events,
+                                                dt,
+                                                KCal::EventSortStartDate,
+                                                KCal::SortDirectionAscending );
 
+    KCal::Event::List::ConstIterator it = events.begin();
     for ( it=events.begin(); it!=events.end(); ++it ) {
-      ev = *it;
+      KCal::Event *ev = *it;
 
       // Count number of days remaining in multiday event
       int span=1; int dayof=1;
@@ -156,7 +141,13 @@ void SummaryWidget::updateView()
 
       // Fill Appointment Pixmap Field
       label = new TQLabel( this );
-      label->setPixmap( pm );
+      if ( ev->categories().contains( "Birthday" ) ) {
+        label->setPixmap( pmb );
+      } else if ( ev->categories().contains( "Anniversary" ) ) {
+        label->setPixmap( pma );
+      } else {
+        label->setPixmap( pm );
+      }
       label->setMaximumWidth( label->minimumSizeHint().width() );
       label->setAlignment( AlignVCenter );
       mLayout->addWidget( label, counter, 0 );
@@ -167,7 +158,7 @@ void SummaryWidget::updateView()
       TQString datestr;
 
       // Modify event date for printing
-      TQDate sD = TQDate::TQDate( dt.year(), dt.month(), dt.day() );
+      TQDate sD = TQDate( dt.year(), dt.month(), dt.day() );
       if ( ( sD.month() == currentDate.month() ) &&
            ( sD.day()   == currentDate.day() ) ) {
         datestr = i18n( "Today" );
@@ -216,7 +207,7 @@ void SummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipString( ev, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
@@ -227,10 +218,10 @@ void SummaryWidget::updateView()
         TQTime sET = ev->dtEnd().time();
         if ( ev->isMultiDay() ) {
           if ( ev->dtStart().date() < dt ) {
-            sST = TQTime::TQTime( 0, 0 );
+            sST = TQTime( 0, 0 );
           }
           if ( ev->dtEnd().date() > dt ) {
-            sET = TQTime::TQTime( 23, 59 );
+            sET = TQTime( 23, 59 );
           }
         }
         datestr = i18n( "Time from - to", "%1 - %2" )
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 3b6ab214f..bc76205c2 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -161,22 +161,18 @@ bool TodoPlugin::isRunningStandalone()
 
 void TodoPlugin::processDropEvent( TQDropEvent *event )
 {
-  TQString text;
-
-  KABC::VCardConverter converter;
-  if ( KVCardDrag::canDecode( event ) && KVCardDrag::decode( event, text ) ) {
-    KABC::Addressee::List contacts = converter.parseVCards( text );
-    KABC::Addressee::List::Iterator it;
-
+  KABC::Addressee::List list;
+  if ( KVCardDrag::decode( event, list ) ) {
     TQStringList attendees;
-    for ( it = contacts.begin(); it != contacts.end(); ++it ) {
+    KABC::Addressee::List::Iterator it;
+    for ( it = list.begin(); it != list.end(); ++it ) {
       TQString email = (*it).fullEmail();
-      if ( email.isEmpty() )
+      if ( email.isEmpty() ) {
         attendees.append( (*it).realName() + "<>" );
-      else
+      } else {
         attendees.append( email );
+      }
     }
-
     interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null,
                                  attendees );
     return;
@@ -185,17 +181,23 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
   if ( KCal::ICalDrag::canDecode( event) ) {
     KCal::CalendarLocal cal( KPimPrefs::timezone() );
     if ( KCal::ICalDrag::decode( event, &cal ) ) {
-      KCal::Journal::List journals = cal.journals();
-      if ( !journals.isEmpty() ) {
+      KCal::Incidence::List incidences = cal.incidences();
+      if ( !incidences.isEmpty() ) {
         event->accept();
-        KCal::Journal *j = journals.first();
-        interface()->openTodoEditor( i18n("Note: %1").arg( j->summary() ), j->description(), TQString() );
+        KCal::Incidence *i = incidences.first();
+        TQString summary;
+        if ( dynamic_cast<KCal::Journal*>( i ) )
+          summary = i18n( "Note: %1" ).arg( i->summary() );
+        else
+          summary = i->summary();
+        interface()->openTodoEditor( summary, i->description(), TQString() );
         return;
       }
       // else fall through to text decoding
     }
   }
 
+  TQString text;
   if ( TQTextDrag::decode( event, text ) ) {
     interface()->openTodoEditor( text );
     return;
@@ -217,8 +219,8 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
                     mail.messageId();
       tf.file()->writeBlock( event->encodedData( "message/rfc822" ) );
       tf.close();
-      interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ), txt,
-                                   uri, tf.name(), TQStringList(), "message/rfc822" );
+      interface()->openTodoEditor( i18n("Mail: %1").arg( mail.subject() ),
+                                   txt, uri, tf.name(), TQStringList(), "message/rfc822", false );
     }
     return;
   }
diff --git a/kontact/plugins/korganizer/todoplugin.desktop b/kontact/plugins/korganizer/todoplugin.desktop
index a571539d8..dde1a0c1b 100644
--- a/kontact/plugins/korganizer/todoplugin.desktop
+++ b/kontact/plugins/korganizer/todoplugin.desktop
@@ -21,22 +21,15 @@ Comment[ca]=Component de llista de pendents (endollable del KOrganizer)
 Comment[da]=Komponent til gøremålsliste (KOrganizer-plugin)
 Comment[de]=Aufgabenlisten-Komponente (KOrganizer-Modul)
 Comment[el]=Συστατικό λίστα προς υλοποίηση εργασιών (Πρόσθετο του KOrganizer)
-Comment[es]=Componente de tareas pendientes (complemento de KOrganizer)
 Comment[et]=Ülesannete nimekirja plugin (KOrganizer)
-Comment[fr]=Composant de la liste des tâches (Module KOrganizer)
-Comment[is]=Verkefnaeining (KOrganizer íforrit)
 Comment[it]=Componente elenco delle cose da fare (plugin KOrganizer)
 Comment[ja]=To-Do リストコンポーネント (KOrganizer プラグイン)
-Comment[km]=សមាសភាគ​បញ្ជី​ការងារ​ត្រូវ​ធ្វើ (កម្មវិធី​ជំនួយ KOrganizer​)
 Comment[nds]=Opgavenlist-Komponent (KOrganizer-Moduul)
 Comment[nl]=Takenlijstcomponent (KOrganizer-plugin)
 Comment[pl]=Składnik zadań (wtyczka KOrganizer)
-Comment[ru]=Задачи (модуль KOrganizer)
-Comment[sk]=Komponent zoznamu úloh (Modul pre KOrganizer)
 Comment[sr]=Прикључак листе обавеза (прикључак KOrganizer-а)
 Comment[sr@Latn]=Priključak liste obaveza (priključak KOrganizer-a)
 Comment[sv]=Uppgiftslistkomponent (Korganizer-insticksprogram)
-Comment[tr]=Yapılacak İşler Bileşeni (KOrganizer eklentisi)
 Comment[zh_CN]=待办清单组件(KOrganizer 插件)
 Comment[zh_TW]=待辦事項清單組件（KOrganizer 外掛程式）
 Name=To-do
@@ -45,21 +38,14 @@ Name[ca]=Pendents
 Name[da]=Gøremål
 Name[de]=Aufgaben
 Name[el]=Προς υλοποίηση εργασίες
-Name[es]=Tareas pendientes
 Name[et]=Ülesanded
-Name[fr]=Tâches
-Name[is]=Verkefni
 Name[it]=Cose da fare
 Name[ja]=To-Do
-Name[km]=​ការងារ​ត្រូវ​ធ្វើ
 Name[nds]=Opgaav
 Name[nl]=Takenlijst
 Name[pl]=Lista zadań
-Name[ru]=Задачи
-Name[sk]=Zoznam úloh
 Name[sr]=Обавезе
 Name[sr@Latn]=Obaveze
 Name[sv]=Uppgift
-Name[tr]=Yapılacak Ögeleri
 Name[zh_CN]=待办清单
 Name[zh_TW]=待辦事項
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index e58ee6aa0..953aa42cb 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -67,7 +67,6 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
   mLayout->setRowStretch( 6, 1 );
 
   mCalendar = KOrg::StdCalendar::self();
-  mCalendar->load();
 
   connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
   connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
@@ -169,7 +168,7 @@ void TodoSummaryWidget::updateView()
       connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
                this, TQT_SLOT( popupMenu( const TQString& ) ) );
 
-      TQString tipText( KCal::IncidenceFormatter::toolTipString( todo, true ) );
+      TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
       if ( !tipText.isEmpty() ) {
         TQToolTip::add( urlLabel, tipText );
       }
@@ -213,11 +212,11 @@ void TodoSummaryWidget::completeTodo( const TQString &uid )
 {
   KCal::Todo *todo = mCalendar->todo( uid );
   IncidenceChanger *changer = new IncidenceChanger( mCalendar, this );
-  if ( !todo->isReadOnly() && changer->beginChange( todo ) ) {
+  if ( !todo->isReadOnly() && changer->beginChange( todo, 0, TQString() ) ) {
     KCal::Todo *oldTodo = todo->clone();
     todo->setCompleted( TQDateTime::currentDateTime() );
-    changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED );
-    changer->endChange( todo );
+    changer->changeIncidence( oldTodo, todo, KOGlobals::COMPLETION_MODIFIED, this );
+    changer->endChange( todo, 0, TQString() );
     delete oldTodo;
     updateView();
   }
diff --git a/kontact/plugins/kpilot/kpilotplugin.desktop b/kontact/plugins/kpilot/kpilotplugin.desktop
index 7ad217fd9..68f8d9d29 100644
--- a/kontact/plugins/kpilot/kpilotplugin.desktop
+++ b/kontact/plugins/kpilot/kpilotplugin.desktop
@@ -19,26 +19,21 @@ Comment=Palm Tools Component (KPilot Plugin)
 Comment[bg]=Приставка за KPilot
 Comment[ca]=Component d'eines de la Palm (endollable del KPilot)
 Comment[da]=Komponent til palm-værktøjer (KPilot-plugin)
-Comment[de]=Palm-Komponente (KPilot-Modul)
+Comment[de]=Palm Werkzeuge (KPilot-Modul)
 Comment[el]=Συστατικό εργαλείων Palm (Πρόσθετο του KPilot)
-Comment[es]=Componente de herramientas de Palm (complemento KPilot)
 Comment[et]=Palmi tööriistade plugin (KPilot)
-Comment[fr]=Composant d'outils pour Palms (Module KPilot)
-Comment[is]=Palm verkfæraeining (KPilot íforrit)
 Comment[it]=Componente strumenti Palm (plugin KPilot)
 Comment[ja]=Palm ツールコンポーネント (KPilot プラグイン)
-Comment[km]=សមាសភាគ​ឧបករណ៍ Palm (កម្មវិធី​ជំនួយ KPilot​)
 Comment[nds]=Palmreekner-Warktüüchkomponent (KPilot-Moduul)
 Comment[nl]=Component met hulpmiddelen voor PalmOS(tm)-apparaten (KPilot-plugin)
 Comment[pl]=Składnik narzędzi Palma (wtyczka KPilot)
-Comment[ru]=Синхронизация с Palm (модуль KPilot)
 Comment[sr]=Компонента алата за Palm (прикључак KPilot-а)
 Comment[sr@Latn]=Komponenta alata za Palm (priključak KPilot-a)
 Comment[sv]=Palm Pilot-verktygskomponent (Kpilot-insticksprogram)
-Comment[tr]=Palm Araçları Bileşeni (KPilot Eklentisi)
 Comment[zh_CN]=Palm 工具组件(KPilot 插件)
 Comment[zh_TW]=Palm 工具組件（KPilot 外掛程式）
 Name=Palm
+Name[de]=KPilot-Einrichtung
 Name[nds]=Palmreekner
 Name[nl]=PalmOS(tm)-apparaat
 Name[sv]=Palm Pilot
diff --git a/kontact/plugins/newsticker/kcmkontactknt.desktop b/kontact/plugins/newsticker/kcmkontactknt.desktop
index d866e252a..3e57621c1 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.desktop
+++ b/kontact/plugins/newsticker/kcmkontactknt.desktop
@@ -36,7 +36,6 @@ Name[id]=Ticker Berita
 Name[is]=Fréttastrimill
 Name[it]=Ticker notizie
 Name[ja]=ニュースティッカー
-Name[ka]=სიახლეთა ტიკერი
 Name[kk]=Жаңалық таспасы
 Name[km]=កម្មវិធី​ទទួល​ព័ត៌មាន
 Name[lt]=News pranešėjas
@@ -88,7 +87,6 @@ Comment[hu]=A hírmegjelenítő áttekintőjének beállításai
 Comment[is]=Uppsetning á yfirliti yfir fréttastrimla
 Comment[it]=Impostazioni sommario ticker notizie
 Comment[ja]=ニュースティッカーの設定
-Comment[ka]=სიახლეთა ტიკერის დაიჯესტის კონფიგურაცია
 Comment[kk]=Жаңалық таспасының тұжырымынын баптау
 Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​កម្មវិធី​ទទួល​ព័ត៌មាន
 Comment[lt]=News Ticker santraukos nustatymai
@@ -100,7 +98,7 @@ Comment[nn]=Oppsett av nyhendetelegrafsamandrag
 Comment[pl]=Ustawienia podsumowania wiadomości
 Comment[pt]=Configuração do Sumário do Extractor de Notícias
 Comment[pt_BR]=Configuração de Resumo de Notícias
-Comment[ru]=Настройка сводки новостей
+Comment[ru]=Настройка дайджеста новостей
 Comment[sk]=Nastavenie súhrnu správ
 Comment[sl]=Nastavitve povzetka novic
 Comment[sr]=Подешавање сажетка приказивања вести
@@ -131,7 +129,6 @@ Keywords[hu]=hírmegjelenítő,konfigurálás,beállítások
 Keywords[is]=fréttastrimill, stillingar, stilla
 Keywords[it]=ticker notizie, configura, impostazioni
 Keywords[ja]=ニュースティッカー,設定,設定
-Keywords[ka]=სიახლეთა ტიკერი, კონფიგურაცია, პარამეტრები
 Keywords[km]=កម្មវិធី​ទទួល​ព័ត៌មាន,កំណត់​រចនាសម្ព័ន្ធ,ការ​កំណត់
 Keywords[lt]=news ticker, configure, settings, konfigūravimas, nustatymai, naujienų pranešėjas
 Keywords[ms]=Pengetik  berita, konfigur, seting
diff --git a/kontact/plugins/newsticker/newstickerplugin.desktop b/kontact/plugins/newsticker/newstickerplugin.desktop
index 18a34cda9..079f90079 100644
--- a/kontact/plugins/newsticker/newstickerplugin.desktop
+++ b/kontact/plugins/newsticker/newstickerplugin.desktop
@@ -20,21 +20,15 @@ Comment[ca]=Component de teletip de notícies
 Comment[da]=Nyhedstelegraf-komponent
 Comment[de]=Newsticker-Komponente
 Comment[el]=Συστατικό προβολέα ειδήσεων
-Comment[es]=Componente de teletipo de noticias
 Comment[et]=Uudistejälgija plugin
-Comment[fr]=Composant Newsticker
-Comment[is]=Fréttastrimilseining
 Comment[it]=Componente ticker notizie
 Comment[ja]=ニュースティッカーコンポーネント
-Comment[km]=សមាសភាគ Newsticker
 Comment[nds]=Narichtentelegraaf-Komponent
 Comment[nl]=Nieuwstickercomponent
 Comment[pl]=Składnik paska wiadomości
-Comment[ru]=Компонент новостей
 Comment[sr]=Компонента откуцавача вести
 Comment[sr@Latn]=Komponenta otkucavača vesti
 Comment[sv]=Nyhetsövervakningskomponent
-Comment[tr]=Haber İzleyici Bileşeni
 Comment[zh_CN]=新闻点点通组件
 Comment[zh_TW]=新聞顯示組件
 Name=News
@@ -48,7 +42,7 @@ Name[ca]=Notícies
 Name[cs]=Novinky
 Name[cy]=Newyddion
 Name[da]=Nyheder
-Name[de]=Usenet
+Name[de]=Newsticker
 Name[el]=Νέα
 Name[eo]=Novaĵoj
 Name[es]=Noticias
@@ -65,7 +59,6 @@ Name[hi]=समाचार
 Name[hu]=Hírek
 Name[is]=Fréttir
 Name[ja]=ニュース
-Name[ka]=სიახლეები
 Name[kk]=Жаңалықтар
 Name[km]=ព័ត៌មាន
 Name[lt]=Naujienos
@@ -93,7 +86,6 @@ Name[tg]=Ахборот
 Name[th]=ข่าว
 Name[tr]=Haberler
 Name[uk]=Новини
-Name[uz]=Yangiliklar
-Name[uz@cyrillic]=Янгиликлар
+Name[uz]=Янгиликлар
 Name[zh_CN]=新闻
 Name[zh_TW]=新聞
diff --git a/kontact/plugins/specialdates/kcmsdsummary.desktop b/kontact/plugins/specialdates/kcmsdsummary.desktop
index f294c3835..6835ce8fd 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.desktop
+++ b/kontact/plugins/specialdates/kcmsdsummary.desktop
@@ -16,22 +16,15 @@ Name[ca]=Resum de dates especials
 Name[da]=Oversigt over særlige datoer
 Name[de]=Übersicht über besondere Termine
 Name[el]=Επισκόπηση σημαντικών ημερομηνιών
-Name[es]=Resumen de fechas especiales
 Name[et]=Tähtpäevade ülevaade
-Name[fr]=Aperçu des dates importantes
-Name[is]=Yfirlit sérstakra daga
 Name[it]=Panoramica delle date speciali
 Name[ja]=特別な日の要約
-Name[km]=ទិដ្ឋភាព​កាលបរិច្ឆេទ​ពិសេស
 Name[nds]=Översicht besünner Daten
 Name[nl]=Overzicht van speciale data
 Name[pl]=Daty specjalne
-Name[pt_BR]=Resumo de Datas Especiais
-Name[ru]=Сводка особых дат
 Name[sr]=Преглед посебних датума
 Name[sr@Latn]=Pregled posebnih datuma
 Name[sv]=Översikt av speciella datum
-Name[tr]=Özel Tarihlere Genel Bakış
 Name[zh_CN]=特殊日期概览
 Name[zh_TW]=特殊日期概觀
 Comment=Special Dates Summary Setup
@@ -55,7 +48,6 @@ Comment[hu]=A fontos dátumok áttekintőjének beállításai
 Comment[is]=Yfirlitsuppsetning sérstakra daga
 Comment[it]=Impostazioni per le date speciali
 Comment[ja]=特別な日の要約設定
-Comment[ka]=განსაკუთრებულ თარიღთა დაიჯესტის კონფიგურაცია
 Comment[kk]=Ерекше күндер тұжырымының баптауы
 Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​ថ្ងៃ​ពិសេស
 Comment[lt]=Ypatingų datų santraukos sąranka
@@ -102,7 +94,6 @@ Keywords[hu]=születésnap,évforduló,szabadság,konfigurálás,beállítások
 Keywords[is]=afmæli, frídagar, stillingar, stilla
 Keywords[it]=compleanno, anniversario, vacanze, configura, impostazioni
 Keywords[ja]=誕生日,記念日,休日,設定,設定
-Keywords[ka]=დაბადების დღე,სახელობის დღე,დასვენების დღე,კონფიგურაცია,პარამეტრები
 Keywords[km]=ថ្ងៃ​ខួប​កំណើត,បុណ្យ​ខួប,វិស្សមកាល,កំណត់​រចនាសម្ព័ន្ធ,ការ​កំណត់
 Keywords[lt]=birthday, anniversary, holiday, configure, settings, konfigūruoti, nustatymai, gimtadieniai, išeiginės,sukaktys
 Keywords[mk]=birthday, anniversary, holiday, configure, settings, роденден, годишнина, конфигурирање, конфигурација, поставувања
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 44c671559..2967e889c 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -127,7 +127,6 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
     manager->setStandardResource( defaultResource );
   }
   mCalendar = KOrg::StdCalendar::self();
-  mCalendar->load();
 
   connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
            this, TQT_SLOT( updateView() ) );
@@ -220,6 +219,8 @@ void SDSummaryWidget::updateView()
   mLabels.clear();
   mLabels.setAutoDelete( false );
 
+  KIconLoader loader( "kdepim" );
+
   KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
   TQValueList<SDEntry> dates;
   TQLabel *label = 0;
@@ -391,9 +392,9 @@ void SDSummaryWidget::updateView()
       TQImage icon_img;
       TQString icon_name;
       KABC::Picture pic;
-      switch( (*addrIt).category ) {  // TODO: better icons
+      switch( (*addrIt).category ) {
       case CategoryBirthday:
-        icon_name = "cookie";
+        icon_name = "calendarbirthday";
         pic = (*addrIt).addressee.photo();
         if ( pic.isIntern() && !pic.data().isNull() ) {
           TQImage img = pic.data();
@@ -405,7 +406,7 @@ void SDSummaryWidget::updateView()
         }
         break;
       case CategoryAnniversary:
-        icon_name = "kdmconfig";
+        icon_name = "calendaranniversary";
         pic = (*addrIt).addressee.photo();
         if ( pic.isIntern() && !pic.data().isNull() ) {
           TQImage img = pic.data();
@@ -417,7 +418,7 @@ void SDSummaryWidget::updateView()
         }
         break;
       case CategoryHoliday:
-        icon_name = "kdmconfig"; break;
+        icon_name = "calendarholiday"; break;
       case CategoryOther:
         icon_name = "cookie"; break;
       }
@@ -438,8 +439,7 @@ void SDSummaryWidget::updateView()
 
       //Muck with the year -- change to the year 'daysTo' days away
       int year = currentDate.addDays( (*addrIt).daysTo ).year();
-      TQDate sD = TQDate::TQDate( year,
-                           (*addrIt).date.month(), (*addrIt).date.day() );
+      TQDate sD = TQDate( year, (*addrIt).date.month(), (*addrIt).date.day() );
 
       if ( (*addrIt).daysTo == 0 ) {
         datestr = i18n( "Today" );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 6ef29eff3..5c52c77cf 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.h
@@ -78,7 +78,7 @@ class SDSummaryWidget : public Kontact::Summary
     bool mShowHolidays;
     bool mShowSpecialsFromCal;
 
-    KHolidays::KHolidays *mHolidays;
+    KHolidays *mHolidays;
 };
 
 #endif
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 9f78de3f6..c8a816c2f 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -24,6 +24,7 @@
 
 #include <kaboutdata.h>
 #include <kgenericfactory.h>
+#include <kiconloader.h>
 #include <klocale.h>
 #include <kparts/componentfactory.h>
 
@@ -41,6 +42,7 @@ SpecialdatesPlugin::SpecialdatesPlugin( Kontact::Core *core, const char *name, c
     mAboutData( 0 )
 {
   setInstance( SpecialdatesPluginFactory::instance() );
+  instance()->iconLoader()->addAppDir( "kdepim" );
 }
 
 SpecialdatesPlugin::~SpecialdatesPlugin()
diff --git a/kontact/plugins/specialdates/specialdatesplugin.desktop b/kontact/plugins/specialdates/specialdatesplugin.desktop
index bceb13ada..cb6a691c0 100644
--- a/kontact/plugins/specialdates/specialdatesplugin.desktop
+++ b/kontact/plugins/specialdates/specialdatesplugin.desktop
@@ -29,7 +29,7 @@ Name[et]=Tähtpäevad
 Name[eu]=Data bereziak
 Name[fa]=تاریخهای ویژه
 Name[fi]=Erikoispäivät
-Name[fr]=Dates importantes
+Name[fr]=Dates particulières
 Name[fy]=Spesjale datums
 Name[ga]=Dátaí Speisialta
 Name[gl]=Datas Especiais
@@ -38,7 +38,6 @@ Name[hu]=Fontos dátumok
 Name[is]=Sérstakir dagar
 Name[it]=Date speciali
 Name[ja]=特別な日
-Name[ka]=განსაკუტრებული თარიღები
 Name[kk]=Ерекше күндер
 Name[km]=ថ្ងៃ​ពិសេស
 Name[lt]=Ypatingos datos
@@ -62,8 +61,7 @@ Name[ta]=விசேஷ தேதிகள்
 Name[th]=วันพิเศษ
 Name[tr]=Özel Tarihler
 Name[uk]=Особливі дати
-Name[uz]=Maxsus kunlar
-Name[uz@cyrillic]=Махсус кунлар
+Name[uz]=Махсус кунлар
 Name[zh_CN]=特殊日期
 Name[zh_TW]=特殊日期
 Comment=Special Dates Component
@@ -72,21 +70,14 @@ Comment[ca]=Component de dates especials
 Comment[da]=Komponent til særlige datoer
 Comment[de]=Komponente für Übersicht über besondere Termine
 Comment[el]=Συστατικό σημαντικών ημερομηνιών
-Comment[es]=Componente de fechas especiales
 Comment[et]=Tähtpäevade plugin
-Comment[fr]=Composant des dates importantes
-Comment[is]=Eining fyrir sérstaka daga
 Comment[it]=Componente per le date speciali
 Comment[ja]=特別な日コンポーネント
-Comment[km]=សមាសភាគ​កាលបរិច្ឆេទ​ពិសេស
 Comment[nds]=Komponent för besünner Daten
 Comment[nl]=Component voor overzicht van speciale data
 Comment[pl]=Składnik dat specjalnych
-Comment[pt_BR]=Componente de Datas Especiais
-Comment[ru]=Особые даты
 Comment[sr]=Компонента посебних датума
 Comment[sr@Latn]=Komponenta posebnih datuma
 Comment[sv]=Speciella datumkomponent
-Comment[tr]=Özel Tarihler Bileşeni
 Comment[zh_CN]=特殊日期组件
 Comment[zh_TW]=特殊日期組件
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index cf8154168..f21a2bb35 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -142,8 +142,10 @@ void KCMKontactSummary::load()
 
   mPluginList = KPluginInfo::fromServices( offers, &config, "Plugins" );
   KPluginInfo::List::Iterator it;
+  KConfig *conf = new KConfig("kontactrc");
+  KConfigGroup *cg = new KConfigGroup( conf, "Plugins" );
   for ( it = mPluginList.begin(); it != mPluginList.end(); ++it ) {
-    (*it)->load();
+      (*it)->load( cg );
 
     if ( !(*it)->isPluginEnabled() )
       continue;
diff --git a/kontact/plugins/summary/kcmkontactsummary.desktop b/kontact/plugins/summary/kcmkontactsummary.desktop
index 5442d5c0b..b4100a59f 100644
--- a/kontact/plugins/summary/kcmkontactsummary.desktop
+++ b/kontact/plugins/summary/kcmkontactsummary.desktop
@@ -13,23 +13,17 @@ X-KDE-CfgDlgHierarchy=KontactSummary
 Name=Summary View Items
 Name[bg]=Обобщение
 Name[ca]=Vista resum d'elements
-Name[da]=Elementer i opsummeringsvisning
-Name[de]=Elemente der Zusammenfassungsansicht
+Name[de]=Übersichtseinträge
 Name[el]=Αντικείμενα προβολής σύνοψης
-Name[es]=Elementos de la vista de sumario
 Name[et]=Kokkuvõttevaate elemendid
 Name[it]=Elementi vista sommario
 Name[ja]=要約ビューの項目
-Name[km]=ធាតុ​ទិដ្ឋភាព​សង្ខេប
 Name[nds]=Översicht-Indrääg
 Name[nl]=Overzichtsweergave-items
-Name[pl]=Elementy widoku podsumowania
 Name[sr]=Ставке приказа сажетка
 Name[sr@Latn]=Stavke prikaza sažetka
 Name[sv]=Objekt i översiktsvy
-Name[tr]=Özet Görünüm Ögeleri
 Name[zh_CN]=摘要视图项目
-Name[zh_TW]=摘要檢視項目
 Comment=General Configuration of Kontact's Summary View
 Comment[af]=Algemene opstelling van Kontact se opsomming aansig
 Comment[bg]=Настройка на обобщението
@@ -51,7 +45,6 @@ Comment[hu]=A Kontact áttekintő nézetének beállításai
 Comment[is]=Almennar stillingar fyrir Kontact yfirlitssýn
 Comment[it]=Configurazione generale della vista sommario di Kontact
 Comment[ja]=Kontact の要約表示の一般的な設定
-Comment[ka]=Kontact დაიჯესტის ხედის ზოგადი პარამეტრები
 Comment[kk]=Тұжырымдаманың жалпы параметрлері
 Comment[km]=ការ​កំណត់​រចនាសម្ព័ន្ធ​ទូទៅ​នៃ​ទិដ្ឋភាព​សង្ខេប​របស់ Kontact
 Comment[lt]=Kontact Santraukos vaizdo bendrasis konfigūravimas
@@ -65,7 +58,7 @@ Comment[nn]=Generelt oppsett av samandragsvisinga i Kontact
 Comment[pl]=Ogólna konfiguracja widoku podsumowania w Kontact
 Comment[pt]=Configuração Geral da Vista Sumária do Kontact
 Comment[pt_BR]=Configuração Geral da Visão de Resumo do Kontact
-Comment[ru]=Настройка сводок Kontact
+Comment[ru]=Общие настройки дайджеста Kontact
 Comment[sk]=Všeobecné nastavenie súhrnu Kontact
 Comment[sl]=Splošne nastavitve za prikaz povzetka v Kontract
 Comment[sr]=Опште подешавање Kontact-овог приказа сажетка
diff --git a/kontact/plugins/summary/summaryplugin.desktop b/kontact/plugins/summary/summaryplugin.desktop
index d2aa1c956..79f8119de 100644
--- a/kontact/plugins/summary/summaryplugin.desktop
+++ b/kontact/plugins/summary/summaryplugin.desktop
@@ -15,23 +15,17 @@ Comment=Summary View Component
 Comment[bg]=Обобщение
 Comment[ca]=Component de vista resum
 Comment[da]=Komponent for opsummeringsvisning
-Comment[de]=Zusammenfassungsansicht-Komponente
+Comment[de]=Übersichtskomponente
 Comment[el]=Συστατικό προβολής σύνοψης
-Comment[es]=Componente Vista de resumen
 Comment[et]=Kokkuvõttevaate plugin
-Comment[fr]=Composant de la vue résumée
-Comment[is]=Eining fyrir yfirlitssýn
 Comment[it]=Componente vista sommario
 Comment[ja]=要約ビューコンポーネント
-Comment[km]=សមាសភាគ​ទិដ្ឋភាព​សង្ខេប
 Comment[nds]=Översicht-Komponent
 Comment[nl]=Overzichtsweergaveitem
-Comment[pl]=Składnik widoku podsumowania
-Comment[ru]=Просмотр сводок
+Comment[pl]=Składnik podsumowania
 Comment[sr]=Компонента приказа сажетка
 Comment[sr@Latn]=Komponenta prikaza sažetka
 Comment[sv]=Översiktsvykomponent
-Comment[tr]=Özet Görünüm Bileşeni
 Comment[zh_CN]=摘要视图组件
 Comment[zh_TW]=摘要檢視組件
 Name=Summary
@@ -62,7 +56,6 @@ Name[hu]=Áttekintő
 Name[is]=Yfirlit
 Name[it]=Sommario
 Name[ja]=要約
-Name[ka]=დაიჯესტი
 Name[kk]=Тұжырым
 Name[km]=សង្ខេប
 Name[lt]=Santrauka
@@ -77,7 +70,7 @@ Name[pl]=Podsumowanie
 Name[pt]=Resumo
 Name[pt_BR]=Resumo
 Name[ro]=Sumar
-Name[ru]=Сводки
+Name[ru]=Дайджест
 Name[se]=Čoahkkáigeassu
 Name[sk]=Súhrn
 Name[sl]=Povzetek
@@ -89,8 +82,7 @@ Name[tg]=Дайджест
 Name[th]=หน้าสรุป
 Name[tr]=Özet
 Name[uk]=Зведення
-Name[uz]=Hisobot
-Name[uz@cyrillic]=Ҳисобот
+Name[uz]=Ҳисобот
 Name[zh_CN]=概览
 Name[zh_TW]=摘要
 #Always last
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 9f9073808..555d79544 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -39,8 +39,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
 {
   setInstance( SummaryViewFactory::instance() );
 
-  mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, this,
-                                   TQT_SLOT( doSync() ), actionCollection(),
+  mSyncAction = new KSelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 
+                                   0, actionCollection(),
                                    "kontact_summary_sync" );
   connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
   connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) );
@@ -68,9 +68,12 @@ void SummaryView::fillSyncActionSubEntries()
 
 void SummaryView::syncAccount( const TQString& account )
 {
-  const TQString acc = account == i18n("All") ? TQString() : account;
-  DCOPRef ref( "kmail", "KMailIface" );
-  ref.send( "checkAccount", acc );
+  if ( account == i18n("All") ) {
+    doSync();
+  } else {
+    DCOPRef ref( "kmail", "KMailIface" );
+    ref.send( "checkAccount", account );
+  }
   fillSyncActionSubEntries();
 }
 
diff --git a/kontact/plugins/test/kptestplugin.desktop b/kontact/plugins/test/kptestplugin.desktop
index 17a3e52e9..75e0988e4 100644
--- a/kontact/plugins/test/kptestplugin.desktop
+++ b/kontact/plugins/test/kptestplugin.desktop
@@ -35,7 +35,6 @@ Comment[hu]=Kontact tesztmodul
 Comment[is]=Kontact prufu íforrit
 Comment[it]=Plugin test Kontact
 Comment[ja]=Kontact テストプラグイン
-Comment[ka]=Kontact სატესტო მოდული
 Comment[kk]=Сынақ модулі
 Comment[km]=កម្មវិធី​ជំនួយ​ការ​សាកល្បង​ក្នុង Kontact
 Comment[lt]=Kontact bandymo priedas
@@ -60,8 +59,7 @@ Comment[ta]=பரிசோதனை சொருகுப்பொருளை
 Comment[tg]=Модули матнии Kontact
 Comment[tr]=Kontact Test Eklentisi
 Comment[uk]=Тестовий втулок Kontact
-Comment[uz]=Kontact uchun sinash plagini
-Comment[uz@cyrillic]=Kontact учун синаш плагини
+Comment[uz]=Kontact учун синаш плагини
 Comment[zh_CN]=Kontact Test 插件
 Comment[zh_TW]=Kontact 測試外掛程式
 Name=TestPlugin
@@ -83,7 +81,6 @@ Name[hu]=Tesztmodul
 Name[is]=Prufu íforrit
 Name[it]=Plugin Test
 Name[ja]=テストプラグイン
-Name[ka]=სატესტო მოდული
 Name[kk]=Сынақ модулі
 Name[km]=កម្មវិធី​ជំនួយ​ការ​សាកល្បង
 Name[mk]=Приклучок за тест
diff --git a/kontact/plugins/weather/weatherplugin.desktop b/kontact/plugins/weather/weatherplugin.desktop
index 68c1924e3..80d9be8e4 100644
--- a/kontact/plugins/weather/weatherplugin.desktop
+++ b/kontact/plugins/weather/weatherplugin.desktop
@@ -21,21 +21,15 @@ Comment[ca]=Component del temps del Kontact
 Comment[da]=Vejrkomponent til Kontact
 Comment[de]=Wetter-Komponente für Kontact
 Comment[el]=Συστατικό καιρού του Kontact
-Comment[es]=Extensión de meteorología para Kontact
 Comment[et]=Kontacti ilmaplugin
-Comment[fr]=Composant météo pour Kontact
-Comment[is]=Kontact veðurfréttaeining
 Comment[it]=Componente meteorologico di Kontact
 Comment[ja]=Kontact 気象情報コンポーネント
-Comment[km]=សមាសភាគ​អាកាសធាតុ Kontact
 Comment[nds]=Kontact-Wederkomponent
 Comment[nl]=Kontact Weercomponent
 Comment[pl]=Składnik Kontaktu wiadomości o pogodzie
-Comment[ru]=Компонент информации о погоде для Kontact
 Comment[sr]=Компонента времена за Kontact
 Comment[sr@Latn]=Komponenta vremena za Kontact
 Comment[sv]=Kontacts väderkomponent
-Comment[tr]=Kontact Hava Durumu Bileşeni
 Comment[zh_CN]=Kontact 天气插件
 Comment[zh_TW]=Kontact 天氣組件
 Name=Weather Service
@@ -64,7 +58,6 @@ Name[hu]=Időjárás
 Name[is]=Veðurþjónusta
 Name[it]=Servizio meteorologico
 Name[ja]=気象サービス
-Name[ka]=ამინდის მომსახურება
 Name[kk]=Ауа райы қызметі
 Name[km]=សេវា​អាកាសធាតុ
 Name[lt]=Orų tarnyba
@@ -86,7 +79,6 @@ Name[sv]=Väderleksprognos
 Name[th]=รายงานอากาศ
 Name[tr]=Hava Durumu Servisi
 Name[uk]=Служба погоди
-Name[uz]=Ob-havo xizmati
-Name[uz@cyrillic]=Об-ҳаво хизмати
+Name[uz]=Об-ҳаво хизмати
 Name[zh_CN]=天气服务
 Name[zh_TW]=天氣服務