Browse Source

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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 4 months ago
parent
commit
2228191a50
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 7 additions and 7 deletions
  1. 1
    1
      kicker/kicker/ui/k_new_mnu.cpp
  2. 6
    6
      ksmserver/shutdowndlg.cpp

+ 1
- 1
kicker/kicker/ui/k_new_mnu.cpp View File

@@ -3872,7 +3872,7 @@ void KMenu::insertSuspendOption( int &nId, int &index )
3872 3872
     if ( suspend_ram && !disableSuspend ) {
3873 3873
         m_exitView->leftView()->insertItem(
3874 3874
             "suspend2ram",
3875
-            i18n( "Sleep" ),
3875
+            i18n( "Suspend" ),
3876 3876
             i18n( "Suspend to RAM" ),
3877 3877
             "kicker:/suspend_ram", nId++, index++ );
3878 3878
     }

+ 6
- 6
ksmserver/shutdowndlg.cpp View File

@@ -911,7 +911,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
911 911
 			{
912 912
 				// Suspend
913 913
 				FlatButton* btnSuspend = new FlatButton( frame );
914
-				btnSuspend->setTextLabel( i18n("&Sleep"), false );
914
+				btnSuspend->setTextLabel( i18n("&Suspend"), false );
915 915
 				btnSuspend->setPixmap( DesktopIcon( "suspend") );
916 916
 				TQToolTip::add(btnSuspend, i18n("<qt><p>Put the computer in suspend-to-memory mode."
917 917
 				" 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,
946 946
 				btnHybridSuspend->setPixmap( DesktopIcon( "hibernate") );
947 947
 				TQToolTip::add(btnHybridSuspend, i18n("<qt><p>Put the computer in both suspend-to-memory and"
948 948
 				" suspend-to-disk mode. The system is stopped and its state saved to memory and to disk.</p>"
949
-				"<p>This offers the best of both 'Sleep' and 'Hibernate' modes combined together. The system is"
950
-				" de facto in 'Sleep' mode but if power is lost, work can still be resumed as if the system"
949
+				"<p>This offers the best of both 'Suspend' and 'Hibernate' modes combined together. The system is"
950
+				" de facto in 'Suspend' mode but if power is lost, work can still be resumed as if the system"
951 951
 				" had been hibernated, preventing any data loss.</p><p>This correspond to ACPI S3+S4 mode.</p>"
952 952
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
953 953
 				int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 );    // i == 1
@@ -1094,7 +1094,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
1094 1094
 
1095 1095
 			if (canSuspend && !disableSuspend)
1096 1096
 			{
1097
-				KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Sleep"), "suspend"), frame );
1097
+				KPushButton* btnSuspend = new KPushButton( KGuiItem( i18n("&Suspend"), "suspend"), frame );
1098 1098
 				TQToolTip::add(btnSuspend, i18n("<qt><p>Put the computer in suspend-to-memory mode."
1099 1099
 				" The system is stopped and its state saved to memory.</p><p> This allows more powersaving than 'Freeze'"
1100 1100
 				" 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,
1120 1120
 				KPushButton* btnHybridSuspend = new KPushButton( KGuiItem( i18n("H&ybrid Suspend"), "hibernate"), frame );
1121 1121
 				TQToolTip::add(btnHybridSuspend, i18n("<qt><p>Put the computer in both suspend-to-memory and"
1122 1122
 				" suspend-to-disk mode. The system is stopped and its state saved to memory and to disk.</p>"
1123
-				"<p>This offers the best of both 'Sleep' and 'Hibernate' modes combined together. The system is"
1124
-				" de facto in 'Sleep' mode but if power is lost, work can still be resumed as if the system"
1123
+				"<p>This offers the best of both 'Suspend' and 'Hibernate' modes combined together. The system is"
1124
+				" de facto in 'Suspend' mode but if power is lost, work can still be resumed as if the system"
1125 1125
 				" had been hibernated, preventing any data loss.</p><p>This correspond to ACPI S3+S4 mode.</p>"
1126 1126
 				"<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>"));
1127 1127
 				btnHybridSuspend->setFont( btnFont );

Loading…
Cancel
Save