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
---
 kpilot/conduits/memofileconduit/memofile-conduit.desktop | 2 --
 1 file changed, 2 deletions(-)

(limited to 'kpilot/conduits/memofileconduit')

diff --git a/kpilot/conduits/memofileconduit/memofile-conduit.desktop b/kpilot/conduits/memofileconduit/memofile-conduit.desktop
index c453821f..cb288d23 100644
--- a/kpilot/conduits/memofileconduit/memofile-conduit.desktop
+++ b/kpilot/conduits/memofileconduit/memofile-conduit.desktop
@@ -22,7 +22,6 @@ Name[hu]=Memófájl
 Name[is]=Minnismiðaskrá
 Name[it]=File appunti
 Name[ja]=メモファイル
-Name[ka]=ჩანიშვნა
 Name[kk]=Жазба файлы
 Name[km]=ឯកសារ​អនុស្សរណៈ
 Name[lt]=Memo byla
@@ -65,7 +64,6 @@ Comment[hu]=Ezzel a csatolóval egy kézi számítógép memóit lehet szinkroni
 Comment[is]=Þessi rás samstillir minnismiða lófatölvunnar þinnar við staðbundna möppu.
 Comment[it]=Questo condotto sincronizza gli appunti del tuo palmare con una cartella locale.
 Comment[ja]=このコンジットはハンドヘルドのメモをローカルのディレクトリと同期させます。
-Comment[ka]=ეს არხი თქვენი პორტატიული მოწყობილობის ლოკალურ დირექტორიასთან სინქრონიზაციას ახდენს .
 Comment[kk]=Қалта құрылғыдағы жазбаларды қапшықтағы файлымен қадамдастыру арнасы.
 Comment[km]=បំពង់​នេះ​អាច​ឲ្យ​អនុស្សរណៈ​ឧបករណ៍​យួរ​ដៃ​របស់​អ្នក ធ្វើ​សមកាលកម្ម​ជាមួយ​នឹង​ថត​មូលដ្ឋាន ។​
 Comment[lt]=Šis kanalas sinchronizuoja Jūsų užrašus su vietiniu aplanku.
-- 
cgit v1.2.3