* 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, 5 deletions

diff --git a/kontact/interfaces/kontactplugin.desktop b/kontact/interfaces/kontactplugin.desktop
index 28803bc6d..11787765a 100644
--- a/kontact/interfaces/kontactplugin.desktop
+++ b/kontact/interfaces/kontactplugin.desktop
@@ -28,7 +28,6 @@ Name[hu]=Kontact-bővítőmodul
 Name[is]=Kontact íforrit
 Name[it]=Plugin Kontact
 Name[ja]=Kontact プラグイン
-Name[ka]=Kontact მოდული
 Name[kk]=Kontact модулі
 Name[km]=កម្មវិធី​ជំនួយ Kontact
 Name[lt]=Kontact priedas
@@ -52,8 +51,7 @@ Name[ta]=சொருகுப்பொருளை தொடர்புக்�
 Name[tg]=Модули Kontact
 Name[tr]=Kontact Eklentisi
 Name[uk]=Втулок Kontact
-Name[uz]=Kontact uchun plagin
-Name[uz@cyrillic]=Kontact учун плагин
+Name[uz]=Kontact учун плагин
 Name[zh_CN]=Kontact 插件
 Name[zh_TW]=Kontack 外掛程式
 
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index e94c0315e..13f14c580 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -125,7 +125,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     virtual bool createDCOPInterface( const TQString& /*serviceType*/ ) { return false; }
 
     /**
-      Reimplement this method and return wether a standalone application is still running
+      Reimplement this method and return whether a standalone application is still running
       This is only required if your part is also available as standalone application.
     */
     virtual bool isRunningStandalone() { return false; }
@@ -174,7 +174,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
     virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
 
     /**
-      Returns wether the plugin provides a part that should be shown in the sidebar.
+      Returns whether the plugin provides a part that should be shown in the sidebar.
     */
     virtual bool showInSideBar() const;
 
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 34de01807..5dd9e72d0 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -188,6 +188,8 @@ static KCmdLineOptions options[] =
     { "module <module>",   I18N_NOOP( "Start with a specific Kontact module" ), 0 },
     { "iconify",   I18N_NOOP( "Start in iconified (minimized) mode" ), 0 },
     { "list", I18N_NOOP( "List all possible modules and exit" ), 0 },
+    { "listprofiles", I18N_NOOP( "List all possible profiles and exit" ), 0 },
+    { "profile <profile>", I18N_NOOP( "Start with a specific Kontact profile" ), 0 },
     KCmdLineLastOption
 };