* 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

1 files changed, 3 insertions, 7 deletions

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]=种子