CVS commit by tokoe: 

Use 'Configure Calendar...' and 'Configure Address Book' instead of 'Configure KOrganizer' and 'Configure KAddressBook', most KDE newbies won't know what KORganizer is...

BUGS:97236


  M +0 -13     kaddressbook/kaddressbook_part.cpp   1.47
  M +0 -14     kaddressbook/kaddressbook_part.h   1.17
  M +1 -1      korganizer/actionmanager.cpp   1.133
  M +0 -12     korganizer/korganizer_part.cpp   1.71
  M +0 -12     korganizer/korganizer_part.h   1.33


--- kdepim/kaddressbook/kaddressbook_part.cpp  #1.46:1.47
@@ -61,6 +61,4 @@ KAddressbookPart::KAddressbookPart( QWid
   setWidget( canvas );
 
-  mExtension = new KAddressbookBrowserExtension( this );
-
   QVBoxLayout *topLayout = new QVBoxLayout( canvas );
 
@@ -158,14 +156,3 @@ void KAddressbookPart::guiActivateEvent(
 }
 
-KAddressbookBrowserExtension::KAddressbookBrowserExtension( KAddressbookPart *parent )
-  : KParts::BrowserExtension( parent, "KAddressbookBrowserExtension" )
-{
-}
-
-KAddressbookBrowserExtension::~KAddressbookBrowserExtension()
-{
-}
-
-using namespace KParts;
-
 #include "kaddressbook_part.moc"

--- kdepim/kaddressbook/kaddressbook_part.h  #1.16:1.17
@@ -24,5 +24,4 @@
 #define KADDRESSBOOK_PART_H
 
-#include <kparts/browserextension.h>
 #include <kparts/event.h>
 #include <kparts/factory.h>
@@ -32,5 +31,4 @@
 
 class KAboutData;
-class KAddressbookBrowserExtension;
 class KInstance;
 
@@ -65,16 +63,4 @@ class KAddressbookPart: public KParts::R
   private:
     KABCore *mCore;
-    KAddressbookBrowserExtension *mExtension;
-};
-
-class KAddressbookBrowserExtension : public KParts::BrowserExtension
-{
-  Q_OBJECT
-
-  friend class KAddressbookPart;
-
-  public:
-    KAddressbookBrowserExtension( KAddressbookPart *parent );
-    virtual ~KAddressbookBrowserExtension();
 };
 

--- kdepim/korganizer/actionmanager.cpp  #1.132:1.133
@@ -524,5 +524,5 @@ void ActionManager::initActions()
 
   if ( mIsPart ) {
-    new KAction( i18n("&Configure KOrganizer..."),
+    new KAction( i18n("&Configure Calendar..."),
                  "configure", 0, mCalendarView,
                  SLOT( edit_options() ), mACollection,

--- kdepim/korganizer/korganizer_part.cpp  #1.70:1.71
@@ -101,5 +101,4 @@ KOrganizerPart::KOrganizerPart( QWidget 
   }
 
-  mBrowserExtension = new KOrganizerBrowserExtension( this );
   mStatusBarExtension = new KParts::StatusBarExtension( this );
 
@@ -243,14 +242,3 @@ void KOrganizerPart::setTitle()
 }
 
-KOrganizerBrowserExtension::KOrganizerBrowserExtension(KOrganizerPart *parent) :
-  KParts::BrowserExtension(parent, "KOrganizerBrowserExtension")
-{
-}
-
-KOrganizerBrowserExtension::~KOrganizerBrowserExtension()
-{
-}
-
-using namespace KParts;
-
 #include "korganizer_part.moc"

--- kdepim/korganizer/korganizer_part.h  #1.32:1.33
@@ -27,5 +27,4 @@
 
 #include <kurl.h>
-#include <kparts/browserextension.h>
 #include <kparts/part.h>
 
@@ -35,5 +34,4 @@
 class KInstance;
 class KAboutData;
-class KOrganizerBrowserExtension;
 class KProcess;
 
@@ -98,5 +96,4 @@ class KOrganizerPart: public KParts::Rea
     CalendarView *mView;
     ActionManager *mActionManager;
-    KOrganizerBrowserExtension *mBrowserExtension;
     KParts::StatusBarExtension *mStatusBarExtension;
     QWidget *mTopLevelWidget;
@@ -106,12 +103,3 @@ class KOrganizerPart: public KParts::Rea
 };
 
-class KOrganizerBrowserExtension : public KParts::BrowserExtension
-{
-    Q_OBJECT
-    friend class KOrganizerPart;
-  public:
-    KOrganizerBrowserExtension( KOrganizerPart *parent );
-    virtual ~KOrganizerBrowserExtension();
-};
-
 #endif