diff --git a/ChangeLog b/ChangeLog
index 1f4925b..b876f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1009,7 +1009,7 @@
 2007-04-03  Danny Kukawka  <danny.kukawka@web.de>
 
 	* src/hardware.[cpp,h]: Add new helper functions/SLOTS to 
-	forward the events for Power, Sleep and s2disk buttons and the 
+	forward the events for Power, Suspend and s2disk buttons and the 
 	lidclose event. Changed current code to emit the Q_SIGNALS not 
 	directly but to call a QTimer:singleShot() with the new SLOTS 
 	instead. This should make the eventhandling from QT3 D-Bus 
diff --git a/ChangeLog.package b/ChangeLog.package
index df49b16..deeeb04 100644
--- a/ChangeLog.package
+++ b/ChangeLog.package
@@ -215,7 +215,7 @@ Wed Feb 14 18:26:34 CET 2007 - dkukawka@suse.de
          reached as e.g. Suspend to disk, Shutdown or change the
          display brightness
        - configure actions for button events (Power/Lid/Suspend/
-         Sleep buttons)
+         Suspend buttons)
        - define the default AC and battery schemes
     - show the power consumtion of the battery in the detailed info
       dialog
diff --git a/doc/de/index.docbook b/doc/de/index.docbook
index 02ce1ad..443efe4 100644
--- a/doc/de/index.docbook
+++ b/doc/de/index.docbook
@@ -185,7 +185,7 @@ Entries which require special treatment are marked with comments starting with '
    <para>
 	Sie können das System jederzeit mit Rechtsklick auf das TDEPowersave
 	Symbol und das Auswählen von <guimenu>Hibernate</guimenu>,
-	<guimenu>Sleep</guimenu>, oder <guimenu>Stand-by</guimenu>
+	<guimenu>Suspend</guimenu>, oder <guimenu>Stand-by</guimenu>
 	(wenn dies von Ihrem Gerät unterstützt wird) suspendieren bzw. in 
 	den Stand-by Zustand versetzen.
    </para>
@@ -200,7 +200,7 @@ Entries which require special treatment are marked with comments starting with '
     </listitem> 
     <listitem>
       <para>
-		Sleep sichert die Daten in den Hauptspeicher. Dadurch wird das 
+		Suspend sichert die Daten in den Hauptspeicher. Dadurch wird das 
 		Aufwecken des Computers schneller als bei Hibernate.
       </para>
     </listitem>
diff --git a/doc/doxy/changelog.dox b/doc/doxy/changelog.dox
index 2813a67..d1c2cf6 100644
--- a/doc/doxy/changelog.dox
+++ b/doc/doxy/changelog.dox
@@ -10,7 +10,7 @@
 *	        policy for each scheme)
 *	      - general settings (define battery warning levels and actions if a level reached as e.g. 
 *	        Suspend to disk/Shutdown or change the display brightness, configure actions for button
-		events (Power/Lid/Suspend/Sleep buttons), define the default AC and battery schemes)
+		events (Power/Lid/Suspend/Suspend buttons), define the default AC and battery schemes)
 *	    - show the power consumtion of the battery in the detailed info dialog
 *	    - umount external media before suspend (need a patch of the KDE media manager) to avoid data
 *	      loss and remount on resume
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index d3bf938..e8303f4 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -176,7 +176,7 @@ Entries which require special treatment are marked with comments starting with '
    <para>
     You can suspend the system at any time by right-clicking the
     TDEPowersave icon and selecting <guimenu>Hibernate</guimenu>,
-    <guimenu>Sleep</guimenu>, or 
+    <guimenu>Suspend</guimenu>, or 
     <guimenu>Standby</guimenu> (if standby is supported by the
     computer).
    </para>
@@ -190,7 +190,7 @@ Entries which require special treatment are marked with comments starting with '
     </listitem> 
     <listitem>
       <para>
-        Sleep saves the data to RAM, making data retrieval faster when 
+        Suspend saves the data to RAM, making data retrieval faster when 
         the computer is brought out of suspend mode.
       </para>
     </listitem>
diff --git a/po/ar.po b/po/ar.po
index 27a6670..a142986 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -377,7 +377,7 @@ msgstr "التعليق إلى القرص"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "التعليق إلى الرام"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -773,7 +773,7 @@ msgid "Report ..."
 msgstr "بلغ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "التعليق إلى الرام غير مدعوم على جهازك."
 
 #: dummy.cpp:99
@@ -1022,11 +1022,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "التعليق إلى القرص معطل بواسطة المدير."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "التعليق إلى الرام فشل."
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "التعليق إلى الرام معطل بواسطة المدير."
 
 #: tdepowersave.cpp:815
@@ -1375,7 +1375,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "زر التعليق إلى القرص:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "زر السبات:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/bg.po b/po/bg.po
index de231e5..c321497 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -392,7 +392,7 @@ msgstr "Спиране върху диска"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Спиране върху паметта"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -806,7 +806,7 @@ msgid "Report ..."
 msgstr "Докладване на &грешка"
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr ""
 
 #: dummy.cpp:99
@@ -1062,11 +1062,11 @@ msgstr "Спирането върху диска е забранено от ад
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Спиране върху паметта"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Спирането върху паметта е забранено от администратора."
 
 #: tdepowersave.cpp:815
@@ -1424,7 +1424,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Спиране върху диска"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
diff --git a/po/cs.po b/po/cs.po
index 46e9887..44ffde2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -390,7 +390,7 @@ msgstr "Uspání na disk"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Uspání do RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -795,7 +795,7 @@ msgid "Report ..."
 msgstr "Nahlásit chybu..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Uspání do RAM není vaším počítačem podporováno."
 
 #: dummy.cpp:99
@@ -1044,11 +1044,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Uspání na disk zakázáno administrátorem."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Uspání do RAM selhalo"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Uspání do RAM zakázáno administrátorem."
 
 #: tdepowersave.cpp:815
@@ -1394,7 +1394,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Klávesa uspání na disk:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Tlačítko uspání:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/da.po b/po/da.po
index d67fada..75739a8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -389,7 +389,7 @@ msgstr "Suspendér til disk"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Suspendér til RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -791,7 +791,7 @@ msgid "Report ..."
 msgstr "Rapportér..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Suspendér til RAM er ikke understøttet på din maskine."
 
 #: dummy.cpp:99
@@ -1039,11 +1039,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Suspendér til disk er deaktiveret af administrator."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Suspendér til RAM fejlede"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Suspendér til RAM er deaktiveret af administrator."
 
 #: tdepowersave.cpp:815
@@ -1393,7 +1393,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Suspendér til disk-knap:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Sove-knap:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/de.po b/po/de.po
index de6a180..9d2aaf5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -397,8 +397,8 @@ msgstr "Hibernate"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
-msgstr "Sleep"
+msgid "Suspend"
+msgstr "Suspend"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
 msgid "CPU Powersave policy"
@@ -812,8 +812,8 @@ msgid "Report ..."
 msgstr "Berichten ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
-msgstr "Sleep wird von diesem Computer nicht unterstützt"
+msgid "Suspend is not supported on your machine."
+msgstr "Suspend wird von diesem Computer nicht unterstützt"
 
 #: dummy.cpp:99
 msgid "Additionally, please mail the output of %1 to %2 . Thanks!"
@@ -1068,12 +1068,12 @@ msgid "Hibernation disabled by administrator."
 msgstr "Hibernate durch Administrator deaktiviert"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
-msgstr "Sleep fehlgeschlagen"
+msgid "Suspend failed"
+msgstr "Suspend fehlgeschlagen"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
-msgstr "Sleep durch Administrator deaktiviert."
+msgid "Suspend disabled by administrator."
+msgstr "Suspend durch Administrator deaktiviert."
 
 #: tdepowersave.cpp:815
 msgid "Standby failed"
@@ -1434,7 +1434,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Hibernate Taste:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Schlafmodus Taste:"
 
 #: configure_Dialog.cpp:903
@@ -1535,7 +1535,7 @@ msgstr "Allgemeine Einstellungen"
 #~ "If you know that it should work, you might override this detection with "
 #~ "setting SUSPEND2RAM_FORCE=\"yes\" in /etc/powersave/sleep."
 #~ msgstr ""
-#~ "Wenn sie wissen das ihr Geräte Sleep trotzdem unterstützt, dann "
+#~ "Wenn sie wissen das ihr Geräte Suspend trotzdem unterstützt, dann "
 #~ "können Sie die automatische Erkennung in /etc/powersave/sleep mit "
 #~ "SUSPEND2RAM_FORCE=\"yes\" abschalten"
 
diff --git a/po/el.po b/po/el.po
index 05c590d..7b45177 100644
--- a/po/el.po
+++ b/po/el.po
@@ -417,8 +417,8 @@ msgstr "Hibernate"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
-msgstr "Sleep"
+msgid "Suspend"
+msgstr "Suspend"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
 #, fuzzy
@@ -837,7 +837,7 @@ msgid "Report ..."
 msgstr "Αναφορά ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Ανάκληση στη RAM δεν υποστηρίζεται από το μηχάνημα σας."
 
 #: dummy.cpp:99
@@ -1095,13 +1095,13 @@ msgstr ""
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
-msgstr "Sleep"
+msgid "Suspend failed"
+msgstr "Suspend"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr ""
-"Η λειτουργία Sleep είναι απενεργοποιημένη από τον διαχειριστή."
+"Η λειτουργία Suspend είναι απενεργοποιημένη από τον διαχειριστή."
 
 #: tdepowersave.cpp:815
 #, fuzzy
@@ -1460,7 +1460,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Hibernate"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
@@ -1593,7 +1593,7 @@ msgstr "Γενικές Ρυθμίσεις"
 #~ "The powersave daemon must be running in the background for a suspend to "
 #~ "RAM."
 #~ msgstr ""
-#~ "Η λειτουργία 'Sleep' απαιτεί τον powersave δαίμονα να εκτελείται "
+#~ "Η λειτουργία 'Suspend' απαιτεί τον powersave δαίμονα να εκτελείται "
 #~ "στο παρασκήνιο."
 
 #~ msgid "The powersave daemon must be running in the background for standby."
diff --git a/po/es.po b/po/es.po
index 15cfca1..730b50e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -407,7 +407,7 @@ msgstr "Suspender en disco"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Suspender en RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -831,7 +831,7 @@ msgid "Report ..."
 msgstr "Informe..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Su equipo no admite la suspensión a RAM."
 
 #: dummy.cpp:99
@@ -1085,11 +1085,11 @@ msgstr "Modo suspend to disk desactivado por el administrador."
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Suspender en RAM"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Modo de suspensión en RAM inhabilitado por el administrador."
 
 #: tdepowersave.cpp:815
@@ -1454,7 +1454,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Suspender en disco"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
diff --git a/po/fi.po b/po/fi.po
index dc3b0e4..22d8951 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -390,7 +390,7 @@ msgstr "Lepotila levylle"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Lepotila keskusmuistiin"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -795,7 +795,7 @@ msgid "Report ..."
 msgstr "Ilmoita ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Tietokoneesi ei tue lepotila muistiin toimintoa."
 
 #: dummy.cpp:99
@@ -1045,11 +1045,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Ylläpitäjä on ottanut \"lepotilan levylle\" pois käytöstä."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Lepotila keskusmuistiin epäonnistui"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Ylläpitäjä on ottanut \"lepotilan keskusmuistiin\" pois käytöstä."
 
 #: tdepowersave.cpp:815
@@ -1404,7 +1404,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Lepotila levylle -painike:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Nukahda -painike:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/fr.po b/po/fr.po
index 6b3556e..4a26184 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -407,7 +407,7 @@ msgstr "Mise en veille sur disque"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Mise en veille sur RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -829,7 +829,7 @@ msgid "Report ..."
 msgstr "Rapport..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "La mise en veille sur RAM n'est pas prise en charge par votre machine."
 
 #: dummy.cpp:99
@@ -1083,11 +1083,11 @@ msgstr "Mise en veille sur disque désactivée par l'administrateur."
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Mise en veille sur RAM"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Mise en veille sur RAM désactivée par l'administrateur."
 
 #: tdepowersave.cpp:815
@@ -1450,7 +1450,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Mise en veille sur disque"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
diff --git a/po/hi.po b/po/hi.po
index a4c44b1..d201d8f 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -365,7 +365,7 @@ msgstr "डिस्क पर स्थगित"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "रैम पर स्थगित"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -747,7 +747,7 @@ msgid "Report ..."
 msgstr "रिपोर्ट..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "रैम पर स्थगित आपकी मशीन पर समर्थित नहीं है।"
 
 #: dummy.cpp:99
@@ -1005,11 +1005,11 @@ msgstr "प्रशासक द्वारा डिस्क पर स्
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "रैम पर स्थगित"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "प्रशासक द्वारा रैम पर स्थगित अक्षम किया गया।"
 
 #: tdepowersave.cpp:815
@@ -1355,7 +1355,7 @@ msgstr "डिस्क पर स्थगित"
 
 #: configure_Dialog.cpp:902
 #, fuzzy
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "&स्लीप बटन"
 
 #: configure_Dialog.cpp:903
diff --git a/po/hu.po b/po/hu.po
index 24d9fcc..24ced19 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -393,7 +393,7 @@ msgstr "Felfüggesztés lemezre"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Felfüggesztés memóriába"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -804,7 +804,7 @@ msgid "Report ..."
 msgstr "Jelentés ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Ez a gép nem támogatja a memóriába felfüggesztést."
 
 #: dummy.cpp:99
@@ -1060,11 +1060,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "A felfüggesztést lemezre letiltotta a rendszergazda."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "A felfüggesztés memóriába sikertelen"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "A memóriába felfüggesztést letiltotta a rendszergazda."
 
 #: tdepowersave.cpp:815
@@ -1421,7 +1421,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Felfüggesztés lemezre gomb:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Alvás gomb:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/it.po b/po/it.po
index 4986ca1..9fa3e31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -397,7 +397,7 @@ msgstr "Iberna"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Modalità sleep"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -809,8 +809,8 @@ msgid "Report ..."
 msgstr "Rapporto..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
-msgstr "La modalità Sleep non è supportata dal computer in uso."
+msgid "Suspend is not supported on your machine."
+msgstr "La modalità Suspend non è supportata dal computer in uso."
 
 #: dummy.cpp:99
 msgid "Additionally, please mail the output of %1 to %2 . Thanks!"
@@ -1062,11 +1062,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Ibernazione disabilitata dall'amministratore."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Modalità sleep fallita"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Modalità sleep disabilitata dall'amministratore."
 
 #: tdepowersave.cpp:815
@@ -1426,7 +1426,7 @@ msgstr "Pulsante sospensione su disco:"
 
 # TLABEL modules/printconf/printconf_ask_device.ycp:134
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Pulsante sleep"
 
 #: configure_Dialog.cpp:903
diff --git a/po/ja.po b/po/ja.po
index a6d6727..7e204a9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -403,7 +403,7 @@ msgstr "ディスクにサスペンド"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "サスペンド(RAM)"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -817,7 +817,7 @@ msgid "Report ..."
 msgstr "レポート"
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "お使いのマシンではRAMの一時停止はサポートされていません。"
 
 #: dummy.cpp:99
@@ -1071,11 +1071,11 @@ msgstr "ディスクへのサスペンドは管理者によって抑制されて
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "サスペンド(RAM)"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "RAMへのサスペンドは管理者によって抑制されています。"
 
 #: tdepowersave.cpp:815
@@ -1431,7 +1431,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "ディスクにサスペンド"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
diff --git a/po/km.po b/po/km.po
index fa8419d..04f8ad3 100644
--- a/po/km.po
+++ b/po/km.po
@@ -378,7 +378,7 @@ msgstr "ផ្អាក​ទៅ​ថាស"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "ផ្អាក​ទៅ​សតិ"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -772,7 +772,7 @@ msgid "Report ..."
 msgstr "រាយការណ៍..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "ការ​ផ្អាក​ទៅ​សតិ មិន​ត្រូវ​បាន​គាំទ្រ​ឡើយ​លើ​ម៉ាស៊ីន​របស់​អ្នក ។"
 
 #: dummy.cpp:99
@@ -1019,11 +1019,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "ការ​ផ្អាក​ទៅ​ថាស​ត្រូវ​បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង ។"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "ការ​ផ្អាក​ទៅ​សតិ​បាន​បរាជ័យ"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "ការ​ផ្អាក​ទៅ​សតិ ត្រូវ​បាន​បិទ​ដោយ​អ្នក​គ្រប់គ្រង ។"
 
 #: tdepowersave.cpp:815
@@ -1367,7 +1367,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "ប៊ូតុង​ផ្អាក​ទៅ​ថាស ៖"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "ប៊ូតុង​ដេក ៖"
 
 #: configure_Dialog.cpp:903
diff --git a/po/lt.po b/po/lt.po
index 559a47f..808b39e 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -382,7 +382,7 @@ msgstr "Sustabdyti į diską"
 #: tdepowersave.cpp:2101
 #: tdepowersave.cpp:2161
 #: tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Sustabdyti į RAM"
 
 #: configuredialog.cpp:1790
@@ -782,7 +782,7 @@ msgid "Report ..."
 msgstr "Pranešti ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Sustabdymas į RAM nepalaikomas jūsų sistemoje."
 
 #: dummy.cpp:99
@@ -1046,11 +1046,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Administratorius uždraudė sustabdymą į diską."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Nepavyko sustabdyti į RAM"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Administratorius uždraudė sustabdymą į RAM."
 
 #: tdepowersave.cpp:815
@@ -1401,7 +1401,7 @@ msgstr "Sustabdyti į diską mygtukas:"
 
 #: configure_Dialog.cpp:902
 #, fuzzy
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Vidurinysis pelės klavišas:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/nb.po b/po/nb.po
index ae46af9..939cf30 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -388,7 +388,7 @@ msgstr "Diskdvale"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "RAM-dvale"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -790,7 +790,7 @@ msgid "Report ..."
 msgstr "Rapport ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "RAM-dvale støttes ikke på denne maskinen."
 
 #: dummy.cpp:99
@@ -1039,11 +1039,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Diskdvale deaktivert av administrator."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "RAM-dvale mislyktes"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "RAM-dvale deaktivert av administrator."
 
 #: tdepowersave.cpp:815
@@ -1393,7 +1393,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Diskdvale-knapp:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Ventemodus-knapp:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/nl.po b/po/nl.po
index acd085f..d98a986 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -401,7 +401,7 @@ msgstr "Slaapstand naar schijf"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Slaapstand naar RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -807,7 +807,7 @@ msgid "Report ..."
 msgstr "Rapporteren..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Slaapstand naar RAM wordt niet door uw computer ondersteund."
 
 #: dummy.cpp:99
@@ -1059,11 +1059,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Slaapstand naar schijf door beheerder uitgeschakeld."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Slaapstand naar RAM is mislukt"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Slaapstand 'bewaar in geheugen' door beheerder uitgeschakeld."
 
 #: tdepowersave.cpp:815
@@ -1419,7 +1419,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Slaapstand-naar-schijf-knop:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Slaapknop:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/pa.po b/po/pa.po
index 680d428..9f58550 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -384,7 +384,7 @@ msgstr "ਡਿਸਕ ਉੱਤੇ ਸਸਪੈਂਡ"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "RAM ਉੱਤੇ ਸਸਪੈਂਡ"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -779,7 +779,7 @@ msgid "Report ..."
 msgstr "ਰਿਪੋਰਟ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "ਤੁਹਾਡੀ ਮਸ਼ੀਨ RAM ਉੱਤੇ ਸਸਪੈਂਡ ਵਾਸਤੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
 
 #: dummy.cpp:99
@@ -1026,11 +1026,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "ਪਰਸ਼ਾਸ਼ਕ ਨੇ ਡਿਸਕ ਲਈ ਸਸਪੈਂਡ ਨੂੰ ਆਯੋਗ ਕੀਤਾ ਹੈ।"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "ਰੈਮ ਵਿੱਚ ਸਸਪੈਂਡ ਫੇਲ੍ਹ ਹੋਇਆ"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "ਪਰਸ਼ਾਸ਼ਕ ਨੇ ਰੈਮ (RAM) ਲਈ ਸਸਪੈਂਡ ਆਯੋਗ ਕੀਤਾ ਹੈ।"
 
 #: tdepowersave.cpp:815
@@ -1374,7 +1374,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "ਡਿਸਕ-ਉੱਤੇ-ਸਸਪੈਂਡ ਬਟਨ:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "ਸਲੀਪ ਬਟਨ:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/pl.po b/po/pl.po
index bdd514d..0e9c680 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -387,7 +387,7 @@ msgstr "Hibernuj"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Wstrzymaj"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -790,7 +790,7 @@ msgid "Report ..."
 msgstr "Raport..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Przejście w stan wstrzymania nie jest możliwe na tym komputerze."
 
 #: dummy.cpp:99
@@ -1040,11 +1040,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Hibernacja wyłączona przez administratora."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Próba wstrzymania zakończona niepowodzeniem"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Wstrzymywanie komputera wyłączone przez administratora."
 
 #: tdepowersave.cpp:815
@@ -1396,7 +1396,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Przycisk hibernacji:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Przycisk wstrzymania:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/pt.po b/po/pt.po
index 04ad858..26336f2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -383,7 +383,7 @@ msgstr "Suspender para Disco"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Suspender para RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -790,7 +790,7 @@ msgid "Report ..."
 msgstr "Relatório ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Suspender para RAM não é suportado nesta máquina."
 
 #: dummy.cpp:99
@@ -1044,11 +1044,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Suspensão para disco desactivada pelo administrador."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Falhou a suspenção para a RAM"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Suspensão para RAM desactivada pelo administrador."
 
 #: tdepowersave.cpp:815
@@ -1407,7 +1407,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Botão de Suspender-para-disco:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Botão de adormecer:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/pt_BR.po b/po/pt_BR.po
index da2e5bb..afb0848 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -389,7 +389,7 @@ msgstr "Suspender para Disco"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Suspender para RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -807,7 +807,7 @@ msgid "Report ..."
 msgstr "Relatório..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Suspender para RAM não suportado nesta máquina."
 
 #: dummy.cpp:99
@@ -1060,11 +1060,11 @@ msgstr "Suspensão para disco desabilitada pelo administrador."
 
 #: tdepowersave.cpp:759
 #, fuzzy
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Suspender para RAM"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Suspensão para RAM desabilitada pelo administrador."
 
 #: tdepowersave.cpp:815
@@ -1423,7 +1423,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Suspender para Disco"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr ""
 
 #: configure_Dialog.cpp:903
diff --git a/po/ru.po b/po/ru.po
index 60ce06f..315e413 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -389,7 +389,7 @@ msgstr "Спящий режим с сохранением состояния н
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Спящий режим с сохранением состояния в памяти"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -797,7 +797,7 @@ msgid "Report ..."
 msgstr "Отчёт ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr ""
 "Спящий режим с сохранением состояния в памяти не поддерживается на вашей "
 "машине."
@@ -1051,11 +1051,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Спящий режим с сохранением на диск отключен администратором."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Сбой перехода в спящий режим с сохранением в памяти"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Спящий режим с сохранением в памяти отключен администратором."
 
 #: tdepowersave.cpp:815
@@ -1410,7 +1410,7 @@ msgstr "Кнопка спящего режима с сохранением на
 
 #  combo box
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Кнопка спящего режима:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 1479023..2a42b75 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -389,7 +389,7 @@ msgstr "Zaustavitev s shranjevanjem na disk"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Zaustavitev s shranjevanjem v spomin"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -795,7 +795,7 @@ msgid "Report ..."
 msgstr "Poročilo ..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Računalnik ne podpira zaustavitve s shranjevanjem v spomin."
 
 #: dummy.cpp:99
@@ -1050,11 +1050,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Administrator je onemogočil zaustavitev s shranjevanjem na disk"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Zaustavitev s shranjevanjem v spomin je spodletela"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Administrator je onemogočil zaustavitev s shranjevanjem v spomin."
 
 #: tdepowersave.cpp:815
@@ -1406,7 +1406,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Gumb za zaustavitev:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Gumb za pripravljenost:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/sv.po b/po/sv.po
index 383a0a6..b10caa1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -391,7 +391,7 @@ msgstr "spara till disk"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Spara till RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -797,7 +797,7 @@ msgid "Report ..."
 msgstr "Rapportera..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Spara till RAM stöds inte på din maskin."
 
 #: dummy.cpp:99
@@ -1050,11 +1050,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Spara till disk inaktiverat av administratör."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Spara till RAM misslyckades"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Spara till RAM inaktiverat av administratören."
 
 #: tdepowersave.cpp:815
@@ -1401,7 +1401,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Spara till disk-knapp:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Sova-knapp:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/tr.po b/po/tr.po
index 34c9d93..e086c60 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -384,7 +384,7 @@ msgstr "Diski kullanarak askıya al"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "RAM kullanarak askıya al"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -791,7 +791,7 @@ msgid "Report ..."
 msgstr "Raporla..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Belleğe askıya alma bu bilgisayarda desteklenmiyor."
 
 #: dummy.cpp:99
@@ -1044,11 +1044,11 @@ msgstr ""
 "kapatılmış."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "RAM kullanarak askıya alma başarısız"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr ""
 "RAM kullanarak askıya alma özelliği sistem yöneticisi tarafından kapatılmış."
 
@@ -1398,7 +1398,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Diski kullanarak askıya al Düğmesi:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Uyku düğmesi:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/uk.po b/po/uk.po
index b606366..18cc113 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -384,7 +384,7 @@ msgstr "Сон зі збереженням на диск"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "Сон із збереженням у RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -790,7 +790,7 @@ msgid "Report ..."
 msgstr "Звіт..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "Режим сну зі збереженням в RAM цим комп'ютером не підтримується."
 
 #: dummy.cpp:99
@@ -1040,11 +1040,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "Режим сну із збереженням на диск заблоковано адміністратором."
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "Сон із збереженням у RAM зазнав невдачі"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "Режим сну із збереженням в RAM заблоковано адміністратором."
 
 #: tdepowersave.cpp:815
@@ -1393,7 +1393,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "Кнопка сну із збереженням на диск:"
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "Кнопка сну:"
 
 #: configure_Dialog.cpp:903
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 06effa6..cabb52f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -374,7 +374,7 @@ msgstr "挂起到磁盘"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
+msgid "Suspend"
 msgstr "挂起到 RAM"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
@@ -770,7 +770,7 @@ msgid "Report ..."
 msgstr "报告..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
+msgid "Suspend is not supported on your machine."
 msgstr "您的机器不支持挂起到 RAM。"
 
 #: dummy.cpp:99
@@ -1016,11 +1016,11 @@ msgid "Hibernation disabled by administrator."
 msgstr "管理员禁用了挂起到磁盘。"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
+msgid "Suspend failed"
 msgstr "挂起到 RAM 失败"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
+msgid "Suspend disabled by administrator."
 msgstr "管理员禁用了挂起到 RAM。"
 
 #: tdepowersave.cpp:815
@@ -1367,7 +1367,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "挂起到磁盘按钮："
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "休眠按钮："
 
 #: configure_Dialog.cpp:903
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6afb97b..605f04e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -372,8 +372,8 @@ msgstr "休眠 (Hibernate)"
 
 #: configuredialog.cpp:1787 configuredialog.cpp:1825 tdepowersave.cpp:186
 #: tdepowersave.cpp:2101 tdepowersave.cpp:2161 tdepowersave.cpp:2250
-msgid "Sleep"
-msgstr "暫停 (Sleep)"
+msgid "Suspend"
+msgstr "暫停 (Suspend)"
 
 #: configuredialog.cpp:1790 configuredialog.cpp:1828
 msgid "CPU Powersave policy"
@@ -765,8 +765,8 @@ msgid "Report ..."
 msgstr "報告..."
 
 #: dummy.cpp:98
-msgid "Sleep is not supported on your machine."
-msgstr "您的機器不支援暫停 (Sleep) 功能。"
+msgid "Suspend is not supported on your machine."
+msgstr "您的機器不支援暫停 (Suspend) 功能。"
 
 #: dummy.cpp:99
 msgid "Additionally, please mail the output of %1 to %2 . Thanks!"
@@ -1013,12 +1013,12 @@ msgid "Hibernation disabled by administrator."
 msgstr "管理員己停用休眠 (Hibernate) 功能"
 
 #: tdepowersave.cpp:759
-msgid "Sleep failed"
-msgstr "無法暫停 (Sleep)"
+msgid "Suspend failed"
+msgstr "無法暫停 (Suspend)"
 
 #: tdepowersave.cpp:767
-msgid "Sleep disabled by administrator."
-msgstr "管理員已停用暫停 (Sleep) 功能。"
+msgid "Suspend disabled by administrator."
+msgstr "管理員已停用暫停 (Suspend) 功能。"
 
 #: tdepowersave.cpp:815
 msgid "Standby failed"
@@ -1363,7 +1363,7 @@ msgid "Suspend-to-disk Button:"
 msgstr "休眠 (Hibernate) 按鈕："
 
 #: configure_Dialog.cpp:902
-msgid "Sleep button:"
+msgid "Suspend button:"
 msgstr "睡眠按鈕"
 
 #: configure_Dialog.cpp:903
diff --git a/src/config/tdepowersaverc_default b/src/config/tdepowersaverc_default
index df291b0..a2e701a 100644
--- a/src/config/tdepowersaverc_default
+++ b/src/config/tdepowersaverc_default
@@ -5,7 +5,7 @@ ActionOnLidClose=
 ActionOnLidCloseValue=
 ActionOnPowerButton=SHUTDOWN
 ActionOnPowerButtonValue=
-ActionOnSleepButton=SUSPEND2RAM
+ActionOnSuspendButton=SUSPEND2RAM
 ActionOnS2DiskButton=SUSPEND2DISK
 buttonsAllowedActions=LOGOUT_DIALOG,FREEZE,SUSPEND2RAM,SUSPEND2DISK,SUSPEND_HYBRID,SHUTDOWN
 AutoSuspendCountdown=true
diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui
index 956721a..9083bb4 100644
--- a/src/configure_Dialog.ui
+++ b/src/configure_Dialog.ui
@@ -1524,10 +1524,10 @@
                                         <cstring>textLabel3_4_3</cstring>
                                     </property>
                                     <property name="text">
-                                        <string>Sleep button:</string>
+                                        <string>Suspend button:</string>
                                     </property>
                                     <property name="buddy" stdset="0">
-                                        <cstring>cB_SleepButton</cstring>
+                                        <cstring>cB_SuspendButton</cstring>
                                     </property>
                                 </widget>
                                 <widget class="TQLabel" row="2" column="0">
@@ -1622,7 +1622,7 @@
                                 </spacer>
                                 <widget class="TQComboBox" row="3" column="2">
                                     <property name="name">
-                                        <cstring>cB_SleepButton</cstring>
+                                        <cstring>cB_SuspendButton</cstring>
                                     </property>
                                     <property name="minimumSize">
                                         <size>
@@ -2315,7 +2315,7 @@
         <slot>general_valueChanged()</slot>
     </connection>
     <connection>
-        <sender>cB_SleepButton</sender>
+        <sender>cB_SuspendButton</sender>
         <signal>activated(int)</signal>
         <receiver>configure_Dialog</receiver>
         <slot>general_valueChanged()</slot>
@@ -2556,7 +2556,7 @@
     <tabstop>sB_batCritAction_value</tabstop>
     <tabstop>cB_PowerButton</tabstop>
     <tabstop>cB_LidcloseButton</tabstop>
-    <tabstop>cB_SleepButton</tabstop>
+    <tabstop>cB_SuspendButton</tabstop>
     <tabstop>cB_S2DiskButton</tabstop>
     <tabstop>cB_acScheme</tabstop>
     <tabstop>cB_batteryScheme</tabstop>
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"))) {
diff --git a/src/dummy.cpp b/src/dummy.cpp
index 6768fea..4243c94 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("Sleep mode is not supported on your machine.");
+		dummy = i18n("Suspend 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 7bb8f47..a30337e 100644
--- a/src/eventsrc
+++ b/src/eventsrc
@@ -242,9 +242,9 @@ default_presentation=0
 
 [suspend2ram_event]
 Name=SuspendToRamEvent
-Comment=Sleep mode is started
+Comment=Suspend mode is started
 Comment[cs]=Uspávání do RAM
-Comment[de]='Sleep mode' wurde gestartet
+Comment[de]='Suspend 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]=Modalità sleep avviata
@@ -305,9 +305,9 @@ default_presentation=0
 
 [resume_from_suspend2ram_event]
 Name=ResumeFromSuspendToRamEvent
-Comment=Resumed from Sleep mode 
+Comment=Resumed from Suspend mode 
 Comment[cs]=Probouzení z uspání do RAM
-Comment[de]=Wiederaufnahme nach 'Sleep mode'
+Comment[de]=Wiederaufnahme nach 'Suspend 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 54d5027..f4efedd 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -200,9 +200,9 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed
 		if (((edevice->eventType() == TDEEventDeviceType::ACPIPowerButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput))
 			&& (keycode == KEY_POWER)) {
 			TQTimer::singleShot(50, this, TQT_SLOT(emitPowerButtonPressed()));
-		} else if (((edevice->eventType() == TDEEventDeviceType::ACPISleepButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput))
+		} else if (((edevice->eventType() == TDEEventDeviceType::ACPISuspendButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput))
 			&& (keycode == KEY_SLEEP)) {
-			TQTimer::singleShot(50, this, TQT_SLOT(emitSleepButtonPressed()));
+			TQTimer::singleShot(50, this, TQT_SLOT(emitSuspendButtonPressed()));
 		} else if (((edevice->eventType() == TDEEventDeviceType::ACPISuspendButton) || (edevice->eventType() == TDEEventDeviceType::ACPIOtherInput))
 			&& (keycode == KEY_SUSPEND)) {
 			TQTimer::singleShot(50, this, TQT_SLOT(emitS2diskButtonPressed()));
@@ -268,7 +268,7 @@ bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) {
 					*type = LID;
 				} else if (edevice->eventType() == TDEEventDeviceType::ACPIPowerButton) {
 					*type = BUTTON_POWER;
-				} else if (edevice->eventType() == TDEEventDeviceType::ACPISleepButton) {
+				} else if (edevice->eventType() == TDEEventDeviceType::ACPISuspendButton) {
 					*type = BUTTON_SLEEP;
 				} else {
 					ret = false;
@@ -842,9 +842,9 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 					}
 				} else {
 					if ( !suspend_states.suspend2ram )
-						kdDebug() << "The machine does not support Sleep mode." << endl;
+						kdDebug() << "The machine does not support Suspend mode." << endl;
 					else
-						kdWarning() << "Policy forbid user to trigger Sleep mode" << endl;
+						kdWarning() << "Policy forbid user to trigger Suspend mode" << endl;
 
 					return false;
 				}
@@ -1097,9 +1097,9 @@ void HardwareInfo::emitPowerButtonPressed() {
 }
 
 /*!
- * Function to emit the signal for the Sleep button.
+ * Function to emit the signal for the Suspend button.
  */
-void HardwareInfo::emitSleepButtonPressed() {
+void HardwareInfo::emitSuspendButtonPressed() {
 	if (sessionIsActive) {
 		emit sleepButtonPressed();
 	} else {
diff --git a/src/hardware.h b/src/hardware.h
index d6120b6..701df3e 100644
--- a/src/hardware.h
+++ b/src/hardware.h
@@ -347,7 +347,7 @@ private slots:
 	//! to emit signal for power button
 	void emitPowerButtonPressed();
 	//! to emit signal for sleep button
-	void emitSleepButtonPressed();
+	void emitSuspendButtonPressed();
 	//! to emit signal for s2disk button
 	void emitS2diskButtonPressed();
 	//! to emit signal for session state
diff --git a/src/settings.cpp b/src/settings.cpp
index d7b549a..1d167e6 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -296,7 +296,7 @@ bool Settings::load_general_settings(){
 			powerButtonActionValue =  tdeconfig->readNumEntry("ActionOnPowerButtonValue", -1);
 		}
 
-		sleepButtonAction = mapActionToType(tdeconfig->readEntry("ActionOnSleepButton",""));
+		sleepButtonAction = mapActionToType(tdeconfig->readEntry("ActionOnSuspendButton",""));
 		if ((sleepButtonAction != GO_SUSPEND2RAM) && (sleepButtonAction != GO_SUSPEND2DISK) && 
 		    (sleepButtonAction != GO_FREEZE) && (sleepButtonAction != GO_SUSPEND_HYBRID)) {
 			sleepButtonAction = NONE;
diff --git a/src/tdepowersave.cpp b/src/tdepowersave.cpp
index e6d6e53..58d8dfb 100644
--- a/src/tdepowersave.cpp
+++ b/src/tdepowersave.cpp
@@ -107,7 +107,7 @@ tdepowersave::tdepowersave( bool force_acpi_check, bool trace_func ) : KSystemTr
 	// connect to events
 	connect(hwinfo, TQT_SIGNAL(lidclosetStatus(bool)), this, TQT_SLOT(handleLidEvent(bool)));
 	connect(hwinfo, TQT_SIGNAL(powerButtonPressed()), this, TQT_SLOT (handlePowerButtonEvent()));
-	connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSleepButtonEvent()));
+	connect(hwinfo, TQT_SIGNAL(sleepButtonPressed()), this, TQT_SLOT (handleSuspendButtonEvent()));
 	connect(hwinfo, TQT_SIGNAL(s2diskButtonPressed()), this, TQT_SLOT (handleS2DiskButtonEvent()));
 	connect(hwinfo, TQT_SIGNAL(batteryWARNState(int,int)), this, TQT_SLOT(notifyBatteryStatusChange (int,int)));
 	connect(hwinfo, TQT_SIGNAL(desktopSessionIsActive(bool)), this, TQT_SLOT (handleSessionState(bool)));
@@ -119,8 +119,8 @@ tdepowersave::tdepowersave( bool force_acpi_check, bool trace_func ) : KSystemTr
 	m_globalAccel = new TDEGlobalAccel( TQT_TQOBJECT(this) );
 	m_globalAccel->insert( "Power button", i18n( "Execute configured power button action"), TQString(),
 			TDEShortcut(TQString("XF86PowerOff")), TDEShortcut(TQString("XF86PowerOff")), TQT_TQOBJECT(this), TQT_SLOT( handlePowerButtonEvent() ) );
-	m_globalAccel->insert( "Sleep button", i18n( "Sleep configured power button action"), TQString(),
-			TDEShortcut(TQString("XF86Sleep")), TDEShortcut(TQString("XF86Sleep")), TQT_TQOBJECT(this), TQT_SLOT( handleSleepButtonEvent() ) );
+	m_globalAccel->insert( "Suspend button", i18n( "Suspend configured power button action"), TQString(),
+			TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), TQT_TQOBJECT(this), TQT_SLOT( handleSuspendButtonEvent() ) );
 	m_globalAccel->insert( "Hibernate button", i18n( "Hibernate configured power button action"), TQString(),
 			TDEShortcut(TQString("XF86Suspend")), TDEShortcut(TQString("XF86Suspend")), TQT_TQOBJECT(this), TQT_SLOT( handleS2DiskButtonEvent() ) );
 	m_globalAccel->readSettings();
@@ -191,7 +191,7 @@ void tdepowersave::initMenu() {
 	STANDBY_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("stand_by", TQIconSet::Automatic),
 							   i18n("Standby"), this, TQT_SLOT(do_standby()));
 	SUSPEND2RAM_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_ram",
-							       TQIconSet::Automatic), i18n("Sleep"), this, TQT_SLOT(do_suspend2ram()));
+							       TQIconSet::Automatic), i18n("Suspend"), this, TQT_SLOT(do_suspend2ram()));
 	SUSPEND2DISK_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk",
 								TQIconSet::Automatic), i18n("Hibernate"), this, TQT_SLOT(do_suspend2disk()));
 	SUSPEND_HYBRID_MENU_ID = this->contextMenu()->insertItem( SmallIconSet("suspend_to_disk",
@@ -833,7 +833,7 @@ bool tdepowersave::do_suspend2ram(){
 				kdDebugFuncOut(trace);
 				return true;
 			} else {
-				KPassivePopup::message( i18n("WARNING"),i18n("Sleep mode failed"),
+				KPassivePopup::message( i18n("WARNING"),i18n("Suspend mode failed"),
 							SmallIcon("messagebox_warning", 20), this,
 							i18n("Warning").ascii(), 15000);
 				kdDebugFuncOut(trace);
@@ -841,7 +841,7 @@ bool tdepowersave::do_suspend2ram(){
 			}
 		} else {
 			KPassivePopup::message( i18n("WARNING"),
-						i18n("Sleep mode disabled by administrator."),
+						i18n("Suspend mode disabled by administrator."),
 						SmallIcon("messagebox_warning", 20), this,
 						i18n("Warning").ascii(), 15000);
 			this->contextMenu()->setItemEnabled(SUSPEND2RAM_MENU_ID, false);
@@ -849,7 +849,7 @@ bool tdepowersave::do_suspend2ram(){
 			return false;
 		}
 	} else {
-		kdWarning() << "This machine does not provide Sleep state" << endl;
+		kdWarning() << "This machine does not provide Suspend state" << endl;
 		kdDebugFuncOut(trace);
 		return false;
 	}
@@ -986,7 +986,7 @@ void tdepowersave::do_autosuspendWarn() {
 			allowed = true;
 		}
 	}
-	else if (settings->autoInactiveAction == "Sleep") {
+	else if (settings->autoInactiveAction == "Suspend") {
 		if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
 			allowed = true;
 		}
@@ -1014,7 +1014,7 @@ void tdepowersave::do_autosuspendWarn() {
 					countdown->setPixmap("suspend2disk");
 				} else if(settings->autoInactiveAction == "Hybrid Suspend") {
 					countdown->setPixmap("suspend2disk");
-				} else if (settings->autoInactiveAction == "Sleep") {
+				} else if (settings->autoInactiveAction == "Suspend") {
 					countdown->setPixmap("suspend2ram");
 				} else if (settings->autoInactiveAction == "Freeze") {
 					countdown->setPixmap("suspend2ram");
@@ -1069,7 +1069,7 @@ bool tdepowersave::do_autosuspend(bool cancel) {
 				return do_suspend2disk();
 			} else if(settings->autoInactiveAction == "Hybrid Suspend") {
 				return do_suspend_hybrid();
-			} else if (settings->autoInactiveAction == "Sleep") {
+			} else if (settings->autoInactiveAction == "Suspend") {
 				return do_suspend2ram();
 			} else if (settings->autoInactiveAction == "Freeze") {
 				return do_freeze();
@@ -1301,7 +1301,7 @@ void tdepowersave::handlePowerButtonEvent( ) {
 /*!
  * Handle the event for the suspend2ram/sleep button and call the related action.
  */
-void tdepowersave::handleSleepButtonEvent() {
+void tdepowersave::handleSuspendButtonEvent() {
 	kdDebugFuncIn(trace);
 
 	// Only go to suspend on button event if we already resumed successful.
@@ -1985,7 +1985,7 @@ void tdepowersave::setAutoSuspend( bool resumed ){
 			allowed = true;
 		}
 	}
-	else if (settings->autoInactiveAction == "Sleep") {
+	else if (settings->autoInactiveAction == "Suspend") {
 		if( suspend.suspend2ram && (suspend.suspend2ram_allowed || suspend.suspend2ram_allowed == -1)) {
 			allowed = true;
 		}
@@ -2560,7 +2560,7 @@ TQString tdepowersave::getSuspendString (int type) {
 			return i18n("Hybrid Suspend");
 			break;
 		case SUSPEND2RAM:
-			return i18n("Sleep");
+			return i18n("Suspend");
 			break;
 		case FREEZE:
 			return i18n("Freeze");
diff --git a/src/tdepowersave.h b/src/tdepowersave.h
index 908e33c..cb0bd0b 100644
--- a/src/tdepowersave.h
+++ b/src/tdepowersave.h
@@ -385,7 +385,7 @@ private slots:
 	//! handle event for press power button and call action
 	void handlePowerButtonEvent();
 	//!  handle event for press s2ram/sleep button and call action
-	void handleSleepButtonEvent();
+	void handleSuspendButtonEvent();
 	//!  handle event for press s2disk button and call action
 	void handleS2DiskButtonEvent();