* 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

15 files changed, 3 insertions, 18 deletions

diff --git a/kaddressbook/editors/cryptosettings.desktop b/kaddressbook/editors/cryptosettings.desktop
index 90ea108b..4baaa54a 100644
--- a/kaddressbook/editors/cryptosettings.desktop
+++ b/kaddressbook/editors/cryptosettings.desktop
@@ -24,7 +24,6 @@ Name[hu]=Titkosítási beállítások
 Name[is]=Stillingar dulritunar
 Name[it]=Preferenze crittografia
 Name[ja]=暗号の設定
-Name[ka]=დაშიფრვის პარამეტრები
 Name[kk]=Шифрлау параметрлері
 Name[km]=ចំណង់​ចំណូល​ចិត្ត Crypto
 Name[ko]=암호화 설정
diff --git a/kaddressbook/editors/imaddresseditor.desktop b/kaddressbook/editors/imaddresseditor.desktop
index 64dc7442..bb6b341c 100644
--- a/kaddressbook/editors/imaddresseditor.desktop
+++ b/kaddressbook/editors/imaddresseditor.desktop
@@ -21,7 +21,6 @@ Name[hu]=Azonnali üzenetküldés (IM)
 Name[is]=Skilaboðaforrit
 Name[it]=Messaggistica istantanea
 Name[ja]=インスタントメッセージ
-Name[ka]=მყისიერი შეტყობინებები
 Name[kk]=Лезде хабарласу
 Name[km]=ផ្ញើ​សារ​បន្ទាន់
 Name[ko]=인스턴트 페시징
@@ -45,8 +44,7 @@ Name[ta]=உடனடி செய்தி பரிமாற்றம்
 Name[tg]=Хизматгоҳи мубодилаи иттилоот
 Name[tr]=Hızlı Mesajlaşma
 Name[uk]=Миттєвий зв'язок
-Name[uz]=Xabar almashish
-Name[uz@cyrillic]=Хабар алмашиш
+Name[uz]=Хабар алмашиш
 Name[zh_CN]=即时通讯
 Name[zh_TW]=即時通訊
 Comment=Instant Messaging Address Editor
@@ -72,7 +70,6 @@ Comment[hu]=IM-címszerkesztő
 Comment[is]=Vistfangaritill fyrir skilaboðaforrit
 Comment[it]=Editor degli indirizzi per messaggi istantanei
 Comment[ja]=インスタントメッセージのアドレスを編集
-Comment[ka]=მყისიერი შეტყობინებების წიგნაკის რედაქტორი
 Comment[kk]=Лезде хабарласу адрестер өңдегіші
 Comment[km]=កម្មវិធី​និពន្ធ​អាសយដ្ឋាន​ដើម្បី​ផ្ញើ​សារ​បន្ទាន់
 Comment[ko]=인스턴트 메시징 주소 편집기
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 0da0feb0..ad84505c 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -362,6 +362,8 @@ void IMEditorWidget::slotAdd()
 
 void IMEditorWidget::slotEdit()
 {
+  if( mReadOnly )
+    return;
   TQListViewItemIterator it( mWidget->lvAddresses, TQListViewItemIterator::Selected );
 
   // Just edit the first one selected.
diff --git a/kaddressbook/editors/kaddressbookimprotocol.desktop b/kaddressbook/editors/kaddressbookimprotocol.desktop
index 80a6f89a..ad4eda6c 100644
--- a/kaddressbook/editors/kaddressbookimprotocol.desktop
+++ b/kaddressbook/editors/kaddressbookimprotocol.desktop
@@ -25,7 +25,6 @@ Name[hu]=KAddressbook azonnali üzenetküldési protokoll
 Name[is]=KAddressbook skilaboðaforritið
 Name[it]=KAddressbook protocollo messaggistica istantanea
 Name[ja]=KAddressbook インスタントメッセージプロトコル
-Name[ka]=KDE ოქმი მყისიერი შეტყობინებებისათვისწიგნაკითვის
 Name[kk]=KAddressbook лезде хабарласу протоколы
 Name[km]=ពិធីការ​ផ្ញើសារ​បន្ទាន់​របស់ KAddressbook
 Name[ko]=KAddressbook 인스턴트 메시징 프로토콜
diff --git a/kaddressbook/editors/protocols/aimprotocol.desktop b/kaddressbook/editors/protocols/aimprotocol.desktop
index e17be1f6..a29098d8 100644
--- a/kaddressbook/editors/protocols/aimprotocol.desktop
+++ b/kaddressbook/editors/protocols/aimprotocol.desktop
@@ -29,7 +29,6 @@ Comment[hu]=AIM protokoll
 Comment[is]=AIM samskiptamátinn
 Comment[it]=Protocollo AIM
 Comment[ja]=AIM プロトコル
-Comment[ka]=AIM ოქმი
 Comment[kk]=AIM протоколы
 Comment[km]=ពិធីការ AIM
 Comment[ko]=AIM 프로토콜
diff --git a/kaddressbook/editors/protocols/gaduprotocol.desktop b/kaddressbook/editors/protocols/gaduprotocol.desktop
index 96ee6e9e..9ccea3c5 100644
--- a/kaddressbook/editors/protocols/gaduprotocol.desktop
+++ b/kaddressbook/editors/protocols/gaduprotocol.desktop
@@ -30,7 +30,6 @@ Comment[hu]=Gadu-Gadu protokoll
 Comment[is]=Gadu-Gadu samskiptamátinn
 Comment[it]=Protocollo Gadu-Gadu
 Comment[ja]=Gadu-Gadu プロトコル
-Comment[ka]=Gadu-Gadu ოქმი
 Comment[kk]=Gadu-Gadu протоколы
 Comment[km]=ពិធីការ Gadu-Gadu
 Comment[lt]=Gadu-Gadu protokolas
diff --git a/kaddressbook/editors/protocols/groupwiseprotocol.desktop b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
index 0ee40fd2..0fc2cce0 100644
--- a/kaddressbook/editors/protocols/groupwiseprotocol.desktop
+++ b/kaddressbook/editors/protocols/groupwiseprotocol.desktop
@@ -18,7 +18,6 @@ Comment[fy]=Novell GroupWise-messenger
 Comment[he]=מסנג'ר של Novell GroupWise
 Comment[is]=Novell GroupWise Samskiptatólið
 Comment[ja]=Novell GroupWise メッセンジャー
-Comment[ka]= Novell GroupWise მყისიერი შეტყობინებების მაცნე
 Comment[kk]=Novell GroupWise хабарласу
 Comment[km]=កម្មវិធី​ផ្ញើ​សារ​របស់​ណូវែល - GroupWise
 Comment[lt]=Novell GroupWise momentinių žinučių klientas
diff --git a/kaddressbook/editors/protocols/icqprotocol.desktop b/kaddressbook/editors/protocols/icqprotocol.desktop
index e071238e..be9fff52 100644
--- a/kaddressbook/editors/protocols/icqprotocol.desktop
+++ b/kaddressbook/editors/protocols/icqprotocol.desktop
@@ -29,7 +29,6 @@ Comment[hu]=ICQ protokoll
 Comment[is]=ICQ samskiptamátinn
 Comment[it]=Protocollo ICQ
 Comment[ja]=ICQ プロトコル
-Comment[ka]=ICQ ოქმი
 Comment[kk]=ICQ протоколы
 Comment[km]=ពិធីការ ICQ
 Comment[lt]=ICQ protokolas
diff --git a/kaddressbook/editors/protocols/ircprotocol.desktop b/kaddressbook/editors/protocols/ircprotocol.desktop
index 78f19447..40f73a36 100644
--- a/kaddressbook/editors/protocols/ircprotocol.desktop
+++ b/kaddressbook/editors/protocols/ircprotocol.desktop
@@ -9,7 +9,6 @@ Comment[fa]=گپ بازپخش اینترنت
 Comment[hu]=IRC (Internet Relay Chat)
 Comment[is]=Internet spjall
 Comment[ja]=インターネットリレーチャット
-Comment[ka]=IRC
 Comment[kk]=Internet Relay Chat хабарласу
 Comment[km]=ជជែក​កំសាន្ត​តាមអ៊ីនធឺណិត
 Comment[lt]=Estafetinis Interneto pokalbis
diff --git a/kaddressbook/editors/protocols/jabberprotocol.desktop b/kaddressbook/editors/protocols/jabberprotocol.desktop
index 94b7271b..b34f8809 100644
--- a/kaddressbook/editors/protocols/jabberprotocol.desktop
+++ b/kaddressbook/editors/protocols/jabberprotocol.desktop
@@ -30,7 +30,6 @@ Comment[hu]=Jabber protokoll
 Comment[is]=Jabber samskiptamátinn
 Comment[it]=Protocollo Jabber
 Comment[ja]=Jabber プロトコル
-Comment[ka]=Jabber ოქმი
 Comment[kk]=Jabber протоколы
 Comment[km]=ពិធីការ Jabber
 Comment[lt]=Jabber protokolas
diff --git a/kaddressbook/editors/protocols/meanwhileprotocol.desktop b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
index 7442cd04..23e9fe3d 100644
--- a/kaddressbook/editors/protocols/meanwhileprotocol.desktop
+++ b/kaddressbook/editors/protocols/meanwhileprotocol.desktop
@@ -29,7 +29,6 @@ Comment[hu]=Meanwhile protokoll
 Comment[is]=Meanwhile samskiptamátinn
 Comment[it]=Protocollo Meanwhile
 Comment[ja]=Meanwhile プロトコル
-Comment[ka]=Meanwhile ოქმი
 Comment[kk]=Meanwhile протоколы
 Comment[km]=ពិធីការ Meanwhile
 Comment[lt]=Meanwhile protokolas
diff --git a/kaddressbook/editors/protocols/msnprotocol.desktop b/kaddressbook/editors/protocols/msnprotocol.desktop
index 58504fd7..1256278a 100644
--- a/kaddressbook/editors/protocols/msnprotocol.desktop
+++ b/kaddressbook/editors/protocols/msnprotocol.desktop
@@ -12,7 +12,6 @@ Comment[fa]=پیام‌رسان MSN
 Comment[fr]=Messagerie MSN
 Comment[is]=MSN spjallforritið
 Comment[ja]=MSN メッセンジャー
-Comment[ka]=MSN შიკრიკი
 Comment[km]=កម្មវិធី​ផ្ញើ​សារ MSN
 Comment[nds]=MSN-Kortnarichtenmaker
 Comment[ne]=एमएसएन म्यासेन्जर
@@ -25,7 +24,6 @@ Name[cy]=Negesydd MSN
 Name[eo]=MSN Mesaĝilo
 Name[fa]=پیام‌رسان MSN
 Name[ja]=MSN メッセンジャー
-Name[ka]=MSN შიკრიკი
 Name[km]=កម្មវិធី​ផ្ញើសារ MSN
 Name[nds]=MSN-Kortnarichtenmaker
 Name[ne]=एमएसएन म्यासेन्जर
diff --git a/kaddressbook/editors/protocols/skypeprotocol.desktop b/kaddressbook/editors/protocols/skypeprotocol.desktop
index 60ac3406..a5c67fc4 100644
--- a/kaddressbook/editors/protocols/skypeprotocol.desktop
+++ b/kaddressbook/editors/protocols/skypeprotocol.desktop
@@ -24,7 +24,6 @@ Comment[hu]=Skype internetes telefon
 Comment[is]=Skype Internet sími
 Comment[it]=Telefonia internet Skype
 Comment[ja]=Skype インターネット電話
-Comment[ka]=Skype ინტერნეტ ტელეფონი
 Comment[kk]=Skype Интернет телефониясы
 Comment[km]=ទូរស័ព្ទ​តាម​អ៊ីនធឺណិត​ដោយ​ប្រើ Skype
 Comment[lt]=Skype Interneto telefonija
diff --git a/kaddressbook/editors/protocols/smsprotocol.desktop b/kaddressbook/editors/protocols/smsprotocol.desktop
index 30b50a1e..38710e83 100644
--- a/kaddressbook/editors/protocols/smsprotocol.desktop
+++ b/kaddressbook/editors/protocols/smsprotocol.desktop
@@ -29,7 +29,6 @@ Comment[hu]=SMS protokoll
 Comment[is]=SMS samskiptamátinn
 Comment[it]=Protocollo SMS
 Comment[ja]=SMS プロトコル
-Comment[ka]= SMS ოქმი
 Comment[kk]=SMS протоколы
 Comment[km]=ពិធីការ​សេវា​សារ​ខ្លីៗ
 Comment[lt]=SMS protokolas
diff --git a/kaddressbook/editors/protocols/yahooprotocol.desktop b/kaddressbook/editors/protocols/yahooprotocol.desktop
index c3055472..8064f772 100644
--- a/kaddressbook/editors/protocols/yahooprotocol.desktop
+++ b/kaddressbook/editors/protocols/yahooprotocol.desktop
@@ -30,7 +30,6 @@ Comment[hu]=Yahoo protokoll
 Comment[is]=Yahoo samskiptamátinn
 Comment[it]=Protocollo Yahoo
 Comment[ja]=Yahoo プロトコル
-Comment[ka]=Yahoo ოქმი
 Comment[kk]=Yahoo протоколы
 Comment[km]=ពិធីការ​យ៉ាហ៊ូ
 Comment[lt]=Yahoo protokolas