Renamed Sleep to Suspend, following discussion on a more consistent naming convention for shutdown actions.

Signed-off-by: Michele Calgaro <[email protected]>

2 files changed, 7 insertions, 7 deletions

diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index fb13a9067..de97b592b 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -3872,7 +3872,7 @@ void KMenu::insertSuspendOption( int &nId, int &index )
     if ( suspend_ram && !disableSuspend ) {
         m_exitView->leftView()->insertItem(
             "suspend2ram",
-            i18n( "Sleep" ),
+            i18n( "Suspend" ),
             i18n( "Suspend to RAM" ),
             "kicker:/suspend_ram", nId++, index++ );
     }
diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp
index 66ba78ea0..052ba59f0 100644
--- a/ksmserver/shutdowndlg.cpp
+++ b/ksmserver/shutdowndlg.cpp
@@ -911,7 +911,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 			{
 				// Suspend
 				FlatButton* btnSuspend = new FlatButton( frame );
-				btnSuspend->setTextLabel( i18n("&Sleep"), false );
+				btnSuspend->setTextLabel( i18n("&Suspend"), false );
 				btnSuspend->setPixmap( DesktopIcon( "suspend") );
 				TQToolTip::add(btnSuspend, i18n("<qt><p>Put the computer in suspend-to-memory mode."
 				" The system is stopped and its state saved to memory.</p><p> This allows more powersaving than 'Freeze'"
@@ -946,8 +946,8 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				btnHybridSuspend->setPixmap( DesktopIcon( "hibernate") );
 				TQToolTip::add(btnHybridSuspend, i18n("<qt><p>Put the computer in both suspend-to-memory and"
 				" suspend-to-disk mode. The system is stopped and its state saved to memory and to disk.</p>"
-				"<p>This offers the best of both 'Sleep' and 'Hibernate' modes combined together. The system is"
-				" de facto in 'Sleep' mode but if power is lost, work can still be resumed as if the system"
+				"<p>This offers the best of both 'Suspend' and 'Hibernate' modes combined together. The system is"
+				" de facto in 'Suspend' mode but if power is lost, work can still be resumed as if the system"
 				" had been hibernated, preventing any data loss.</p><p>This correspond to ACPI S3+S4 mode.</p>"
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
 				int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
@@ -1094,7 +1094,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 
 			if (canSuspend && !disableSuspend)
 			{
-				KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Sleep"), "suspend"), frame );
+				KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend"), "suspend"), frame );
 				TQToolTip::add(btnSuspend, i18n("<qt><p>Put the computer in suspend-to-memory mode."
 				" The system is stopped and its state saved to memory.</p><p> This allows more powersaving than 'Freeze'"
 				" but requires longer time to reactivate the system.</p><p>This correspond to ACPI S3 mode.</p>"
@@ -1120,8 +1120,8 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
 				KPushButton* btnHybridSuspend = new KPushButton( KGuiItem( i18n("H&ybrid Suspend"), "hibernate"), frame );
 				TQToolTip::add(btnHybridSuspend, i18n("<qt><p>Put the computer in both suspend-to-memory and"
 				" suspend-to-disk mode. The system is stopped and its state saved to memory and to disk.</p>"
-				"<p>This offers the best of both 'Sleep' and 'Hibernate' modes combined together. The system is"
-				" de facto in 'Sleep' mode but if power is lost, work can still be resumed as if the system"
+				"<p>This offers the best of both 'Suspend' and 'Hibernate' modes combined together. The system is"
+				" de facto in 'Suspend' mode but if power is lost, work can still be resumed as if the system"
 				" had been hibernated, preventing any data loss.</p><p>This correspond to ACPI S3+S4 mode.</p>"
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
 				btnHybridSuspend->setFont( btnFont );