summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/kmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kontact/plugins/kmail
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* 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
Diffstat (limited to 'kontact/plugins/kmail')
-rw-r--r--kontact/plugins/kmail/Makefile.am2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.desktop21
-rw-r--r--kontact/plugins/kmail/kmailplugin.desktop17
3 files changed, 6 insertions, 34 deletions
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]=電子郵件