Fix references of K Menu -> TDE Menu.

6 files changed, 27 insertions, 27 deletions

diff --git a/khotkeys/README b/khotkeys/README
index b087105cb..933ebc210 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -63,7 +63,7 @@
  
  CONFIGURATION :
  
-  The configuration module is started using K-Menu/Settings/System/KHotKeys .
+  The configuration module is started using TDE Menu/Settings/System/KHotKeys .
  If you have used the 1.x version ( you have, haven't you ? ), it will look
  familiar. On the left, there's a list of all actions, they may be put
  in groups. On the right, there are several tabs with details for
@@ -93,8 +93,8 @@
  or suggest better names ).
   - Command/URL tab settings - enter the command or URL to execute ( no,
     the 'Browse' doesn't do anything useful yet ).
-  - K-Menu entry tab settings - just like the Command/URL tab, only enter
-    a .desktop file from the K-Menu to execute (e.g. 'System/konsole.desktop')
+  - TDE Menu entry tab settings - just like the Command/URL tab, only enter
+    a .desktop file from the TDE Menu to execute (e.g. 'System/konsole.desktop')
   - DCOP call tab settings - enter the application, object, DCOP method and
     arguments (e.g. 'kdesktop', 'KBackgroundIface',
     'setWallpaper(QString,int)' and '"/some/pic.jpg" 1')
diff --git a/khotkeys/TODO b/khotkeys/TODO
index 7db646b66..5192cc6c0 100644
--- a/khotkeys/TODO
+++ b/khotkeys/TODO
@@ -77,6 +77,6 @@ odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to
 skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno
 kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?!
 at dokaze zvetsovat vsechna 'File Open Dialog' okna
-pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi moc nezvlada )
+pamatovat si menuentries i s polohou v TDE Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi moc nezvlada )
 neudelat to prirazeni klavesy k menuentry nejak jednodussi ? nebo zkratka doporucovat kmenuedit ?
 i18n("","") pro veci jako "New"
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 95aa7db89..33dc80543 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -44,7 +44,7 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P )
     {
     TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work
     popup->insertItem( i18n( "Command/URL..." ), TYPE_COMMAND_URL_ACTION );
-    popup->insertItem( i18n( "K-Menu Entry..." ), TYPE_MENUENTRY_ACTION );
+    popup->insertItem( i18n( "TDE Menu Entry..." ), TYPE_MENUENTRY_ACTION );
     popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION );
     popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION );
     popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION );
diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp
index dcc4301b5..1190780dc 100644
--- a/khotkeys/kcontrol/general_tab.cpp
+++ b/khotkeys/kcontrol/general_tab.cpp
@@ -50,7 +50,7 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P )
               break;
             case Tab_widget::TYPE_MENUENTRY_SHORTCUT:
                 action_type_combo->insertItem(
-                    i18n( "K-Menu Entry (simple)" ), i );
+                    i18n( "TDE Menu Entry (simple)" ), i );
               break;
             case Tab_widget::TYPE_DCOP_SHORTCUT:
                 action_type_combo->insertItem(
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index efab89d8b..3880fc093 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <[email protected]>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 // BEWARE ! unbelievably messy code
@@ -52,7 +52,7 @@ void khotkeys_cleanup()
     owner = NULL;
     }
 
-Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal2( 
+Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal2(
     const Action_data_group* data_P, const TQString& entry_P )
     {
     if( !data_P->enabled( false ))
@@ -80,7 +80,7 @@ Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal2(
         }
     return NULL;
     }
-    
+
 Action_data_group* khotkeys_get_menu_root( Action_data_group* data_P )
     {
     for( Action_data_group::Iterator it = data_P->first_child();
@@ -90,7 +90,7 @@ Action_data_group* khotkeys_get_menu_root( Action_data_group* data_P )
             {
             if( group->system_group() == Action_data_group::SYSTEM_MENUENTRIES )
                 return group;
-            }    
+            }
     return new Action_data_group( data_P, i18n( MENU_EDITOR_ENTRIES_GROUP_NAME ),
         i18n( "These entries were created using Menu Editor." ), new Condition_list( "", NULL ), // CHECKME tenhle condition list
         Action_data_group::SYSTEM_MENUENTRIES, true );
@@ -140,7 +140,7 @@ TQStringList khotkeys_get_all_shortcuts( )
     settings.read_settings( true );
 
     khotkeys_get_all_shortcuts_internal(settings.actions, result);
-    
+
     return result;
     }
 
@@ -158,7 +158,7 @@ KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P,
         if( Menuentry_shortcut_action_data* entry
             = dynamic_cast< Menuentry_shortcut_action_data* >( *it ))
             {
-               if (entry->trigger() && 
+               if (entry->trigger() &&
                    entry->trigger()->shortcut().toString() == shortcut_P)
                {
                   if (entry->action())
@@ -185,7 +185,7 @@ KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P )
     return khotkeys_find_menu_entry_internal(settings.actions, shortcut_P);
     }
 
-        
+
 void khotkeys_send_reread_config()
     {
     TQByteArray data;
@@ -218,8 +218,8 @@ TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P )
     TQString shortcut = khotkeys_get_menu_shortcut( entry );
     delete settings.actions;
     return shortcut;
-    }    
-    
+    }
+
 bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P )
     {
     Settings settings;
@@ -233,8 +233,8 @@ bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P )
         }
     Action_data_group* parent = entry->parent();
     TQString new_name = new_P;
-    if( entry->name().startsWith( i18n( "K Menu - " )))
-        new_name = i18n( "K Menu - " ) + new_P;
+    if( entry->name().startsWith( i18n( "TDE Menu - " )))
+        new_name = i18n( "TDE Menu - " ) + new_P;
     Menuentry_shortcut_action_data* new_entry = new Menuentry_shortcut_action_data( parent,
         new_name, entry->comment(), entry->enabled( true ));
     new_entry->set_trigger( entry->trigger()->copy( new_entry ));
@@ -273,7 +273,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
     bool new_entry = ( entry == NULL );
     if( new_entry )
         {
-        entry = new Menuentry_shortcut_action_data( NULL, i18n( "K Menu - " ) + entry_P,
+        entry = new Menuentry_shortcut_action_data( NULL, i18n( "TDE Menu - " ) + entry_P,
             "" );
         entry->set_action( new Menuentry_action( entry, entry_P ));
         }
@@ -293,7 +293,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
         entry->set_trigger( new Shortcut_trigger( entry, KShortcut( shortcut )));
     if( shortcut.isEmpty())
         {
-        delete entry;            
+        delete entry;
         if( !new_entry ) // remove from config file
             {
             settings.write_settings();
@@ -321,12 +321,12 @@ void khotkeys_init()
     {
     KHotKeys::khotkeys_init();
     }
-    
+
 void khotkeys_cleanup()
     {
     KHotKeys::khotkeys_cleanup();
     }
-    
+
 TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P )
     {
     return KHotKeys::khotkeys_get_menu_entry_shortcut( entry_P );
@@ -341,7 +341,7 @@ void khotkeys_menu_entry_deleted( const TQString& entry_P )
     {
     KHotKeys::khotkeys_menu_entry_deleted( entry_P );
     }
-    
+
 TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
     const TQString& shortcut_P )
     {
diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h
index ce85c98b4..56a870797 100644
--- a/khotkeys/kcontrol/menuedit.h
+++ b/khotkeys/kcontrol/menuedit.h
@@ -1,11 +1,11 @@
 /****************************************************************************
 
  KHotKeys
- 
+
  Copyright (C) 1999-2001 Lubos Lunak <[email protected]>
 
  Distributed under the terms of the GNU General Public License version 2.
- 
+
 ****************************************************************************/
 
 #ifndef _MENUEDIT_H_
@@ -31,10 +31,10 @@ KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P );
 // changes assigned shortcut to menu entry a updates config file
 KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
     const TQString& shortcut_P );
-// menu entry was moved in K Menu
+// menu entry was moved in TDE Menu
 KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P );
 // menu entry was removed
-KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );    
+KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P );
 // List of all hotkeys in use
 KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( );
 // Find menu entry that uses shortcut