From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 1 Sep 2010 00:37:02 +0000
Subject: * 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
---
 kontact/plugins/newsticker/kcmkontactknt.desktop    |  5 +----
 kontact/plugins/newsticker/newstickerplugin.desktop | 12 ++----------
 2 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'kontact/plugins/newsticker')

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]=新聞
-- 
cgit v1.2.1