Renamed Sleep to Suspend, following discussion on a more consistent

naming convention for shutdown actions.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 384a9c9..0cdf498 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -95,7 +95,7 @@ ConfigureDialog::ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Set
 		actions.append("Standby");
 	}
 	if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
-		actions.append("Sleep");
+		actions.append("Suspend");
 	}
 	if ( suspend.suspend2disk && (suspend.suspend2disk_allowed || suspend.suspend2disk_allowed == -1)) {
 		actions.append("Hibernate");
@@ -252,7 +252,7 @@ void ConfigureDialog::setIcons(){
 	if(actions[0] == "Hibernate") {
 		tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", TQIconSet::Automatic));
 	}
-	else if(actions[0] == "Sleep") {
+	else if(actions[0] == "Suspend") {
 		tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", TQIconSet::Automatic));
 	}
 	else if(actions[0] == "Freeze") {
@@ -745,7 +745,7 @@ void ConfigureDialog::setGeneralSettings() {
 	// buttons tab:
 	TQStringList _actions = tdeconfig->readListEntry("buttonsAllowedActions", TQString());
 	fillActionComboBox(cB_PowerButton, _actions, tdeconfig->readEntry("ActionOnPowerButton", TQString()));
-	fillActionComboBox(cB_SleepButton, _actions, tdeconfig->readEntry("ActionOnSleepButton", TQString()));
+	fillActionComboBox(cB_SuspendButton, _actions, tdeconfig->readEntry("ActionOnSuspendButton", TQString()));
 	fillActionComboBox(cB_S2DiskButton, _actions, tdeconfig->readEntry("ActionOnS2DiskButton", TQString()));
 	// avoid logout dialog for lidclose - this make no sense
 	_actions.remove("LOGOUT_DIALOG");
@@ -882,7 +882,7 @@ void ConfigureDialog::saveGeneralSettings() {
 	// button tab
 	tdeconfig->writeEntry("ActionOnPowerButton", mapDescriptionToAction(cB_PowerButton->currentText()));
 	tdeconfig->writeEntry("ActionOnLidClose", mapDescriptionToAction(cB_LidcloseButton->currentText()));
-	tdeconfig->writeEntry("ActionOnSleepButton", mapDescriptionToAction(cB_SleepButton->currentText()));
+	tdeconfig->writeEntry("ActionOnSuspendButton", mapDescriptionToAction(cB_SuspendButton->currentText()));
 	tdeconfig->writeEntry("ActionOnS2DiskButton", mapDescriptionToAction(cB_S2DiskButton->currentText()));
 
 	// schemes tab
@@ -1807,8 +1807,8 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) {
 		if (actions.contains("Hybrid Suspend"))
 			ret = i18n("Hybrid Suspend");
 	} else if (action.startsWith("SUSPEND2RAM")) {
-		if (actions.contains("Sleep"))
-			ret = i18n("Sleep");
+		if (actions.contains("Suspend"))
+			ret = i18n("Suspend");
 	} else if (action.startsWith("FREEZE")) {
 		if (actions.contains("Freeze"))
 			ret = i18n("Freeze");
@@ -1851,8 +1851,8 @@ TQString ConfigureDialog::mapDescriptionToAction( TQString description ) {
 	} else if (description.startsWith("Hybrid Suspend") ||
 		   description.startsWith(i18n("Hybrid Suspend"))) {
 		ret = "SUSPEND_HYBRID";
-	} else if (description.startsWith("Sleep") ||
-		   description.startsWith(i18n("Sleep"))) {
+	} else if (description.startsWith("Suspend") ||
+		   description.startsWith(i18n("Suspend"))) {
 		ret = "SUSPEND2RAM";
 	} else if (description.startsWith("Freeze") ||
 		   description.startsWith(i18n("Freeze"))) {