* 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

3 files changed, 9 insertions, 22 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]=种子