merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

1 files changed, 5 insertions, 5 deletions

diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 7cd00bd..3d8b456 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -83,4 +83,4 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
 
-        m_busyblink = new QCheckBox ( tr( "Enable blinking busy indicator" ), this );
-        lay-> addMultiCellWidget ( m_busyblink, 6, 6, 0, 1 );
+        m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this );
+        lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 );
 
@@ -96,3 +96,3 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
                 QWhatsThis::add ( m_bigbusy, tr( "Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar." ));
-        QWhatsThis::add ( m_busyblink, tr( "Activate this, if you want a blinking busy indicator for starting applications in the Launcher." ));
+        QWhatsThis::add ( m_busyani, tr( "Activate this, if you want an animatedbusy indicator for starting applications in the Launcher." ));
 }
@@ -122,3 +122,3 @@ void TabsSettings::init ( )
         cfg. setGroup ( "GUI" );
-        m_busyblink-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "blink" );
+        m_busyani-> setChecked ( cfg. readEntry ( "BusyType" ). lower ( ) == "animated" );
                 m_bigbusy->setChecked(  cfg. readBoolEntry ( "BigBusy" )  );
@@ -266,3 +266,3 @@ void TabsSettings::accept ( )
         cfg. setGroup ( "GUI" );
-        QString busytype = QString ( m_busyblink-> isChecked ( ) ? "blink" : "" );
+        QString busytype = QString ( m_busyani-> isChecked ( ) ? "Animated" : "" );
         cfg. writeEntry ( "BusyType", busytype );