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>

3 files changed, 41 insertions, 41 deletions

diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 78cb174..ff9ce91 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -89,9 +89,9 @@ 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.standby && (suspend.standby_allowed || suspend.standby_allowed == -1))
 		actions.append("Standby");
 
@@ -240,9 +240,9 @@ 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] == "Standby") 
 		tB_scheme->setItemIconSet( 2 ,SmallIcon("stand_by", TQIconSet::Automatic));
@@ -1780,11 +1780,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("CPUFREQ_POWERSAVE")) {
 		if (hwinfo->supportCPUFreq())
 			ret = i18n("CPU Powersave policy");
@@ -1818,11 +1818,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("CPU Powersave policy") || 
 		   description.startsWith(i18n("CPU Powersave policy"))) {
diff --git a/src/eventsrc b/src/eventsrc
index 88ccc0b..b1e10ce 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -219,9 +219,9 @@ default_presentation=0
 
 [suspend2disk_event]
 Name=SuspendToDiskEvent
-Comment=Suspend to Disk is started
+Comment=Hibernate is started
 Comment[cs]=Uspávání na disk
-Comment[de]='Suspend to Disk' wurde gestartet
+Comment[de]='Hibernate' 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
@@ -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
@@ -270,9 +270,9 @@ default_presentation=0
 
 [resume_from_suspend2disk_event]
 Name=ResumeFromSuspendToDiskEvent
-Comment=Resumed from Suspend to Disk
+Comment=Resumed from Hibernate
 Comment[cs]=Probouzení z uspání na disk
-Comment[de]=Wiederaufnahme nach 'Suspend to Disk'
+Comment[de]=Wiederaufnahme nach 'Hibernate'
 Comment[es]=Reanudación desde suspensión en disco
 Comment[fr]=Reprise après la mise en veille sur disque
 Comment[it]=Ripristinato da Sospendi su disco
@@ -287,9 +287,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/kpowersave.cpp b/src/kpowersave.cpp
index b372245..c711e57 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -182,11 +182,11 @@ void kpowersave::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()));
 	STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic),
 							   i18n("Standby"), this, TQT_SLOT(do_standby()));
@@ -715,7 +715,7 @@ bool kpowersave::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);
@@ -723,7 +723,7 @@ bool kpowersave::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);
@@ -731,7 +731,7 @@ bool kpowersave::do_suspend2disk(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide suspend2disk via HAL" << endl;
+		kdWarning() << "This machine does not provide hibernation state" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -771,7 +771,7 @@ bool kpowersave::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);
@@ -779,7 +779,7 @@ bool kpowersave::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);
@@ -787,7 +787,7 @@ bool kpowersave::do_suspend2ram(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide suspend2ram via HAL" << endl;
+		kdWarning() << "This machine does not provide Sleep state via HAL" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -863,9 +863,9 @@ void kpowersave::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 == "Standby") {
 				countdown->setPixmap("standby");
@@ -913,9 +913,9 @@ bool kpowersave::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 == "Standby") {
 				return do_standby();
@@ -2202,17 +2202,17 @@ void kpowersave::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 STANDBY:
 				KNotifyClient::event( this->winId(), "standby_event",
 						      i18n("System is going into %1 now.").
-						      arg(i18n("Standby")));
+						      arg(i18n("standby")));
 				break;
 			default:
 				break;
@@ -2262,17 +2262,17 @@ void kpowersave::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 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;
@@ -2380,10 +2380,10 @@ TQString kpowersave::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 STANDBY:
 			return i18n("Standby");