* 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

5 files changed, 5 insertions, 6 deletions

diff --git a/kfile-plugins/ics/kfile_ics.desktop b/kfile-plugins/ics/kfile_ics.desktop
index 2a530ce2..ce3f2188 100644
--- a/kfile-plugins/ics/kfile_ics.desktop
+++ b/kfile-plugins/ics/kfile_ics.desktop
@@ -24,7 +24,6 @@ Name[hu]=ICS-jellemzők
 Name[is]=ICS upplýsingar
 Name[it]=Informazioni ICS
 Name[ja]=ICS 情報
-Name[ka]=ICS ინფორმაცია
 Name[kk]=ICS ақпараты
 Name[km]=ព័ត៌មាន ICS
 Name[lt]=ICS informacija
diff --git a/kfile-plugins/palm-databases/kfile_palm.desktop b/kfile-plugins/palm-databases/kfile_palm.desktop
index 9d1fe121..66ccbfe9 100644
--- a/kfile-plugins/palm-databases/kfile_palm.desktop
+++ b/kfile-plugins/palm-databases/kfile_palm.desktop
@@ -26,7 +26,6 @@ Name[hu]=PalmOS adatbázis-jellemzők
 Name[is]=PalmOS gagnagrunnsupplýsingar
 Name[it]=Informazioni database PalmOs
 Name[ja]=PalmOS データベース 情報
-Name[ka]=PalmOS-ს მონაცემთა ბაზის ინფორმაცია
 Name[kk]=PalmOS деректер қорының мәліметі
 Name[km]=ព័ត៌មាន​មូលដ្ឋាន​ទិន្នន័យ PalmOS
 Name[lt]=PalmOS duomenų bazės info
diff --git a/kfile-plugins/rfc822/kfile_rfc822.desktop b/kfile-plugins/rfc822/kfile_rfc822.desktop
index 1428c96f..b6928cfd 100644
--- a/kfile-plugins/rfc822/kfile_rfc822.desktop
+++ b/kfile-plugins/rfc822/kfile_rfc822.desktop
@@ -27,7 +27,6 @@ Name[hu]=E-mail-jellemzők
 Name[is]=Tölvupóst upplýsingar
 Name[it]=Informazioni di posta elettronica
 Name[ja]=Eメール 情報
-Name[ka]=ელფოსტის ინფორმაცია
 Name[kk]=Эл.пошта мәліметі
 Name[km]=ព័ត៌មាន​អ៊ីមែល
 Name[lt]=E. pašto info
diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/kfile-plugins/vcf/kfile_vcf.cpp
index 76b3383c..5dcfc2c1 100644
--- a/kfile-plugins/vcf/kfile_vcf.cpp
+++ b/kfile-plugins/vcf/kfile_vcf.cpp
@@ -68,8 +68,11 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     file.close();
 
     KABC::VCardConverter converter;
-    KABC::Addressee addr = converter.parseVCard(contents);
-
+#if defined(KABC_VCARD_ENCODING_FIX)
+    KABC::Addressee addr = converter.parseVCardRaw( contents.utf8() );
+#else
+    KABC::Addressee addr = converter.parseVCard( contents );
+#endif
     KFileMetaInfoGroup group = appendGroup(info, "Technical");
 
     // prepare the text
diff --git a/kfile-plugins/vcf/kfile_vcf.desktop b/kfile-plugins/vcf/kfile_vcf.desktop
index ced0dfc3..4d1c5b4b 100644
--- a/kfile-plugins/vcf/kfile_vcf.desktop
+++ b/kfile-plugins/vcf/kfile_vcf.desktop
@@ -26,7 +26,6 @@ Name[hu]=VCard-jellemzők
 Name[is]=vCard upplýsingar
 Name[it]=Informazioni vCard
 Name[ja]=vCard 情報
-Name[ka]=vCard ინფორმაცია
 Name[kk]=vCard мәліметі
 Name[km]=ព័ត៌មាន vCard
 Name[lt]=vCard informacija