Renamed "Suspend to disk" to "Hibernate" and "Suspend to RAM" to "Sleep", to align to main logout menu.

This refers to bug 2602.

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

5 files changed, 50 insertions, 50 deletions

diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 3eed13b..e3567a5 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -89,10 +89,10 @@ ConfigureDialog::ConfigureDialog( TDEConfig *_config, HardwareInfo *_hwinfo, Set
 	// get the correct available suspend types
 	SuspendStates suspend = hwinfo->getSuspendSupport();
 	if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
-		actions.append("Suspend to RAM");
+		actions.append("Sleep");
 	}
 	if ( suspend.suspend2disk && (suspend.suspend2disk_allowed || suspend.suspend2disk_allowed == -1)) {
-		actions.append("Suspend to Disk");
+		actions.append("Hibernate");
 	}
 	if ( suspend.freeze && (suspend.freeze_allowed || suspend.freeze_allowed == -1)) {
 		actions.append("Freeze");
@@ -246,10 +246,10 @@ void ConfigureDialog::setIcons(){
 	tB_scheme->setItemIconSet( 0 ,SmallIcon("tdescreensaver", TQIconSet::Automatic));
 	tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic));
 
-	if(actions[0] == "Suspend to Disk") {
+	if(actions[0] == "Hibernate") {
 		tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_disk", TQIconSet::Automatic));
 	}
-	else if(actions[0] == "Suspend to RAM") {
+	else if(actions[0] == "Sleep") {
 		tB_scheme->setItemIconSet( 2 ,SmallIcon("suspend_to_ram", TQIconSet::Automatic));
 	}
 	else if(actions[0] == "Freeze") {
@@ -1798,11 +1798,11 @@ TQString ConfigureDialog::mapActionToDescription( TQString action ) {
 	} else if (action.startsWith("LOGOUT_DIALOG")) {
 		ret = i18n("Logout Dialog");
 	} else if (action.startsWith("SUSPEND2DISK")) {
-		if (actions.contains("Suspend to Disk"))
-			ret = i18n("Suspend to Disk");
+		if (actions.contains("Hibernate"))
+			ret = i18n("Hibernate");
 	} else if (action.startsWith("SUSPEND2RAM")) {
-		if (actions.contains("Suspend to RAM"))
-			ret = i18n("Suspend to RAM");
+		if (actions.contains("Sleep"))
+			ret = i18n("Sleep");
 	} else if (action.startsWith("FREEZE")) {
 		if (actions.contains("Freeze"))
 			ret = i18n("Freeze");
@@ -1839,11 +1839,11 @@ TQString ConfigureDialog::mapDescriptionToAction( TQString description ) {
 	} else if (description.startsWith("Logout Dialog") ||
 		   description.startsWith(i18n("Logout Dialog"))) {
 		ret = "LOGOUT_DIALOG";
-	} else if (description.startsWith("Suspend to Disk") ||
-		   description.startsWith(i18n("Suspend to Disk"))) {
+	} else if (description.startsWith("Hibernate") ||
+		   description.startsWith(i18n("Hibernate"))) {
 		ret = "SUSPEND2DISK";
-	} else if (description.startsWith("Suspend to RAM") ||
-		   description.startsWith(i18n("Suspend to RAM"))) {
+	} else if (description.startsWith("Sleep") ||
+		   description.startsWith(i18n("Sleep"))) {
 		ret = "SUSPEND2RAM";
 	} else if (description.startsWith("Freeze") ||
 		   description.startsWith(i18n("Freeze"))) {
diff --git a/src/dummy.cpp b/src/dummy.cpp
index b1381e5..6768fea 100644
--- a/src/dummy.cpp
+++ b/src/dummy.cpp
@@ -95,7 +95,7 @@ class dummy {
 		dummy = i18n("Scheme switched to %1. \n Deactivate following devices: %2").arg("").arg("");
 		dummy = i18n("Scheme switched to %1. \n Activate following devices: %2").arg("").arg("");
 		dummy = i18n("Report ...");
-		dummy = i18n("Suspend to RAM is not supported on your machine.");
+		dummy = i18n("Sleep mode is not supported on your machine.");
 		dummy = i18n("Additionally, please mail the output of %1 to %2 . Thanks!").arg("").arg("");
 		dummy = i18n("Power consumption");
 
diff --git a/src/eventsrc b/src/eventsrc
index f379275..03387ba 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -219,12 +219,12 @@ default_presentation=0
 
 [suspend2disk_event]
 Name=SuspendToDiskEvent
-Comment=Suspend to Disk is started
+Comment=Hibernation is started
 Comment[cs]=Uspávání na disk
 Comment[de]='Suspend to Disk' wurde gestartet
 Comment[es]=Se ha iniciado la suspensión en disco
 Comment[fr]=La mise en veille sur disque a été lancée
-Comment[it]=Sospendi su disco avviata
+Comment[it]=Ibernazione avviata
 Comment[ja]=サスペンド(ディスク)を開始しました
 Comment[pl]=Rozpoczęto Usypianie na Dysk
 Comment[pt]=Iniciou-se a Suspensão para o Disco
@@ -236,12 +236,12 @@ default_presentation=0
 
 [suspend2ram_event]
 Name=SuspendToRamEvent
-Comment=Suspend to RAM is started
+Comment=Sleep mode is started
 Comment[cs]=Uspávání do RAM
-Comment[de]='Suspend to RAM' wurde gestartet
+Comment[de]='Sleep mode' wurde gestartet
 Comment[es]=Se ha iniciado la suspensión en RAM
 Comment[fr]=La mise en veille sur RAM a été lancée
-Comment[it]=Sospensione su RAM avviata
+Comment[it]=Modalità sleep avviata
 Comment[ja]=サスペンド(RAM)を開始しました
 Comment[pl]=Rozpoczęto Usypianie do pamięci RAM
 Comment[pt]=Iniciou-se a Suspensão para a Memória
@@ -293,9 +293,9 @@ default_presentation=0
 
 [resume_from_suspend2ram_event]
 Name=ResumeFromSuspendToRamEvent
-Comment=Resumed from Suspend to RAM 
+Comment=Resumed from Sleep mode 
 Comment[cs]=Probouzení z uspání do RAM
-Comment[de]=Wiederaufnahme nach 'Suspend to RAM'
+Comment[de]=Wiederaufnahme nach 'Sleep mode'
 Comment[es]=Reanudación desde suspensión en RAM
 Comment[fr]=Reprise après la mise en veille sur RAM
 Comment[it]=Ripristinato da Sospendi su RAM
diff --git a/src/hardware.cpp b/src/hardware.cpp
index 92d2b36..7b1c215 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -794,9 +794,9 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 					}
 				} else {
 					if ( !suspend_states.suspend2disk )
-						kdDebug() << "The machine does not support suspend to disk." << endl;
+						kdDebug() << "The machine does not support hibernation." << endl;
 					else
-						kdWarning() << "Policy forbid user to trigger suspend to disk" << endl;
+						kdWarning() << "Policy forbid user to trigger hibernation" << endl;
 
 					return false;
 				}
@@ -813,9 +813,9 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 					}
 				} else {
 					if ( !suspend_states.suspend2ram )
-						kdDebug() << "The machine does not support suspend to ram." << endl;
+						kdDebug() << "The machine does not support Sleep mode." << endl;
 					else
-						kdWarning() << "Policy forbid user to trigger suspend to ram" << endl;
+						kdWarning() << "Policy forbid user to trigger Sleep mode" << endl;
 
 					return false;
 				}
diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp
index 793d38c..b9f6f1d 100644
--- a/src/tdepowersave.cpp
+++ b/src/tdepowersave.cpp
@@ -188,11 +188,11 @@ void tdepowersave::initMenu() {
 	SLEEP_SEPARATOR_MENU_ID = this->contextMenu()->insertSeparator();
 	SUSPEND2DISK_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk",
 								TQIconSet::Automatic),
-								i18n("Suspend to Disk"), this,
+								i18n("Hibernate"), this,
 								TQT_SLOT(do_suspend2disk()));
 	SUSPEND2RAM_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram",
 							       TQIconSet::Automatic),
-							       i18n("Suspend to RAM"), this,
+							       i18n("Sleep"), this,
 							       TQT_SLOT(do_suspend2ram()));
 	FREEZE_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram", TQIconSet::Automatic),
 							   i18n("Freeze"), this, TQT_SLOT(do_freeze()));
@@ -723,7 +723,7 @@ bool tdepowersave::do_suspend2disk(){
 				kdDebugFuncOut(trace);
 				return true;
 			} else {
-				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to disk failed"),
+				KPassivePopup::message( i18n("WARNING"),i18n("Hibernation failed"),
 							SmallIcon("messagebox_warning", 20), this,
 							i18n("Warning").ascii(), 15000);
 				kdDebugFuncOut(trace);
@@ -731,7 +731,7 @@ bool tdepowersave::do_suspend2disk(){
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),
-						i18n("Suspend to disk disabled by administrator."),
+						i18n("Hibernation disabled by administrator."),
 						SmallIcon("messagebox_warning", 20),
 						this, i18n("Warning").ascii(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2DISK_MENU_ID, false);
@@ -739,7 +739,7 @@ bool tdepowersave::do_suspend2disk(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide suspend to disk state" << endl;
+		kdWarning() << "This machine does not provide hibernation state" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -779,7 +779,7 @@ bool tdepowersave::do_suspend2ram(){
 				kdDebugFuncOut(trace);
 				return true;
 			} else {
-				KPassivePopup::message( i18n("WARNING"),i18n("Suspend to RAM failed"),
+				KPassivePopup::message( i18n("WARNING"),i18n("Sleep mode failed"),
 							SmallIcon("messagebox_warning", 20), this,
 							i18n("Warning").ascii(), 15000);
 				kdDebugFuncOut(trace);
@@ -787,7 +787,7 @@ bool tdepowersave::do_suspend2ram(){
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),
-						i18n("Suspend to RAM disabled by administrator."),
+						i18n("Sleep mode disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
 						i18n("Warning").ascii(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
@@ -795,7 +795,7 @@ bool tdepowersave::do_suspend2ram(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide suspend to ram state" << endl;
+		kdWarning() << "This machine does not provide Sleep state" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -922,12 +922,12 @@ void tdepowersave::do_autosuspendWarn() {
 	// Verify that the desired suspend action is allowed before displaying the dialog
 	SuspendStates suspend = hwinfo->getSuspendSupport();
 	bool allowed = false;
-	if(settings->autoInactiveAction == "Suspend to Disk") {
+	if(settings->autoInactiveAction == "Hibernate") {
 		if ( suspend.suspend2disk && (suspend.suspend2disk_allowed || suspend.suspend2disk_allowed == -1)) {
 			allowed = true;
 		}
 	}
-	else if (settings->autoInactiveAction == "Suspend to RAM") {
+	else if (settings->autoInactiveAction == "Sleep") {
 		if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
 			allowed = true;
 		}
@@ -951,9 +951,9 @@ void tdepowersave::do_autosuspendWarn() {
 
 				countdown = new countDownDialog(settings->autoSuspendCountdownTimeout);
 
-				if(settings->autoInactiveAction == "Suspend to Disk") {
+				if(settings->autoInactiveAction == "Hibernate") {
 					countdown->setPixmap("suspend2disk");
-				} else if (settings->autoInactiveAction == "Suspend to RAM") {
+				} else if (settings->autoInactiveAction == "Sleep") {
 					countdown->setPixmap("suspend2ram");
 				} else if (settings->autoInactiveAction == "Freeze") {
 					countdown->setPixmap("suspend2ram");
@@ -1006,9 +1006,9 @@ bool tdepowersave::do_autosuspend(bool chancel) {
 		}
 
 		if(settings->autoSuspend && !contextMenu()->isItemChecked(AUTOSUSPEND_MENU_ID)) {
-			if(settings->autoInactiveAction == "Suspend to Disk") {
+			if(settings->autoInactiveAction == "Hibernate") {
 				return do_suspend2disk();
-			} else if (settings->autoInactiveAction == "Suspend to RAM") {
+			} else if (settings->autoInactiveAction == "Sleep") {
 				return do_suspend2ram();
 			} else if (settings->autoInactiveAction == "Freeze") {
 				return do_freeze();
@@ -1902,12 +1902,12 @@ void tdepowersave::setAutoSuspend( bool resumed ){
 	// Verify that the desired suspend action is allowed before enabling autosuspend
 	SuspendStates suspend = hwinfo->getSuspendSupport();
 	bool allowed = false;
-	if(settings->autoInactiveAction == "Suspend to Disk") {
+	if(settings->autoInactiveAction == "Hibernate") {
 		if ( suspend.suspend2disk && (suspend.suspend2disk_allowed || suspend.suspend2disk_allowed == -1)) {
 			allowed = true;
 		}
 	}
-	else if (settings->autoInactiveAction == "Suspend to RAM") {
+	else if (settings->autoInactiveAction == "Sleep") {
 		if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
 			allowed = true;
 		}
@@ -2267,22 +2267,22 @@ void tdepowersave::notifySuspend( int suspendType ) {
 			case SUSPEND2DISK:
 				KNotifyClient::event( this->winId(), "suspend2disk_event",
 						      i18n("System is going into %1 now.").
-						      arg(i18n("Suspend to Disk")));
+						      arg(i18n("hibernation")));
 				break;
 			case SUSPEND2RAM:
 				KNotifyClient::event( this->winId(), "suspend2ram_event",
 						      i18n("System is going into %1 now.").
-						      arg(i18n("Suspend to RAM")));
+						      arg(i18n("sleep")));
 				break;
 			case FREEZE:
 				KNotifyClient::event( this->winId(), "freeze_event",
 						      i18n("System is going into %1 now.").
-						      arg(i18n("Freeze")));
+						      arg(i18n("freeze")));
 				break;
 			case STANDBY:
 				KNotifyClient::event( this->winId(), "standby_event",
 						      i18n("System is going into %1 now.").
-						      arg(i18n("Standby")));
+						      arg(i18n("standby")));
 				break;
 			default:
 				break;
@@ -2332,22 +2332,22 @@ void tdepowersave::handleResumeSignal() {
 			case SUSPEND2DISK:
 				KNotifyClient::event( this->winId(), "resume_from_suspend2disk_event",
 						      i18n("System is resumed from %1.").arg(
-						      i18n("Suspend to Disk")));
+						      i18n("hibernation")));
 				break;
 			case SUSPEND2RAM:
 				KNotifyClient::event( this->winId(), "resume_from_suspend2ram_event",
 					      	      i18n("System is resumed from %1.").arg(
-						      i18n("Suspend to RAM")));
+						      i18n("sleep")));
 				break;
 			case FREEZE:
 				KNotifyClient::event( this->winId(), "resume_from_freeze_event",
 						      i18n("System is resumed from %1.").arg(
-						      i18n("Freeze")));
+						      i18n("freeze")));
 				break;
 			case STANDBY:
 				KNotifyClient::event( this->winId(), "resume_from_standby_event",
 						      i18n("System is resumed from %1.").arg(
-						      i18n("Standby")));
+						      i18n("standby")));
 				break;
 			default:
 				kdError() << "called suspend type unknown" << endl;
@@ -2459,10 +2459,10 @@ TQString tdepowersave::getSuspendString (int type) {
 
 	switch (type) {
 		case SUSPEND2DISK:
-			return i18n("Suspend to Disk");
+			return i18n("Hibernate");
 			break;
 		case SUSPEND2RAM:
-			return i18n("Suspend to RAM");
+			return i18n("Sleep");
 			break;
 		case FREEZE:
 			return i18n("Freeze");