* 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

3 files changed, 5 insertions, 10 deletions

diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 4702eb2d2..d4a5e8547 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -386,12 +386,14 @@ void KNotesPart::editNote( TQIconViewItem *item )
 
 void KNotesPart::renameNote()
 {
+  mOldName = mNotesView->currentItem()->text();
   mNotesView->currentItem()->rename();
 }
 
 void KNotesPart::renamedNote( TQIconViewItem* )
 {
-  mManager->save();
+  if ( mOldName != mNotesView->currentItem()->text() )
+    mManager->save();
 }
 
 void KNotesPart::slotOnCurrentChanged( TQIconViewItem* )
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index de41f9aae..764bb4849 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -96,6 +96,7 @@ class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
 
     KNotesResourceManager *mManager;
     TQDict<KNotesIconViewItem> mNoteList;
+  TQString mOldName;
 };
 
 #endif
diff --git a/kontact/plugins/knotes/knotesplugin.desktop b/kontact/plugins/knotes/knotesplugin.desktop
index e7fe8fc0c..71068d94f 100644
--- a/kontact/plugins/knotes/knotesplugin.desktop
+++ b/kontact/plugins/knotes/knotesplugin.desktop
@@ -19,21 +19,15 @@ Comment[ca]=Component de notes (endollable del KNotes)
 Comment[da]=Notatkomponent (KNotes-plugin)
 Comment[de]=Notizen-Komponente (KNotes-Modul)
 Comment[el]=Συσταικό σημειώσεων (Πρόσθετο του KNotes)
-Comment[es]=Componente de notas (complemento de KNotes)
 Comment[et]=Märkmete plugin (KNotes)
-Comment[fr]=Composant de notes (Module KNotes)
-Comment[is]=Minnismiðaeining (KNotes íforrit)
 Comment[it]=Componente note (plugin KNotes)
 Comment[ja]=メモコンポーネント (KNotes プラグイン)
-Comment[km]=សមាសភាគ​ចំណាំ (កម្មវិធី​ជំនួយ KNotes​)
 Comment[nds]=Notizen-Komponent (KNotes-Moduul)
 Comment[nl]=Notitiecomponent (KNotes-plugin)
 Comment[pl]=Składnik notatek (wtyczka KNotes)
-Comment[ru]=Заметки (модуль KNotes)
 Comment[sr]=Компонента белешки (прикључак KNotes-а)
 Comment[sr@Latn]=Komponenta beleški (priključak KNotes-a)
 Comment[sv]=Anteckningskomponent (Knotes-insticksprogram)
-Comment[tr]=Notlar Bileşeni (KNotes Eklentisi)
 Comment[zh_CN]=便笺组件(KNotes 插件)
 Comment[zh_TW]=便條組件（KNotes 外掛程式）
 Name=Notes
@@ -63,7 +57,6 @@ Name[hu]=Feljegyzések
 Name[is]=Minnismiðar
 Name[it]=Note
 Name[ja]=メモ
-Name[ka]=ჩანიშვნები
 Name[kk]=Жазбалар
 Name[km]=ចំណាំ
 Name[lt]=Užrašai
@@ -89,7 +82,6 @@ Name[tg]=Ахборот
 Name[th]=บันทึกช่วยจำ
 Name[tr]=Notlar
 Name[uk]=Примітки
-Name[uz]=Yozma xotira
-Name[uz@cyrillic]=Ёзма хотира
+Name[uz]=Ёзма хотира
 Name[zh_CN]=便笺
 Name[zh_TW]=備忘錄