From kde-commits  Wed Sep 02 20:07:48 2009
From: Artur Duque de Souza <asouza () kde ! org>
Date: Wed, 02 Sep 2009 20:07:48 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/kickoff
Message-Id: <1251922068.895435.8411.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=125192207906468

SVN commit 1019087 by asouza:

Changing labels to more friendly ones, like Sleep and Hibernate.

BUG:203416


 M  +4 -4      core/leavemodel.cpp  
 M  +2 -2      simpleapplet/simpleapplet.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/leavemodel.cpp #1019086:1019087
@@ -73,13 +73,13 @@
         item->setIcon(KIcon("system-suspend"));
         item->setData(i18n("Pause without logging out"), Kickoff::SubTitleRole);
     } else if (basename == "suspenddisk") {
-        item->setText(i18n("Suspend to Disk"));
+        item->setText(i18n("Hibernate"));
         item->setIcon(KIcon("system-suspend-hibernate"));
-        item->setData(i18n("Pause without logging out"), Kickoff::SubTitleRole);
+        item->setData(i18n("Suspend to disk"), Kickoff::SubTitleRole);
     } else if (basename == "suspendram") {
-        item->setText(i18n("Suspend to RAM"));
+        item->setText(i18n("Sleep"));
         item->setIcon(KIcon("system-suspend"));
-        item->setData(i18n("Pause without logging out"), Kickoff::SubTitleRole);
+        item->setData(i18n("Suspend to RAM"), Kickoff::SubTitleRole);
     } else {
         item->setText(basename);
         item->setData(url, Kickoff::SubTitleRole);
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/simpleapplet/simpleapplet.cpp #1019086:1019087
@@ -183,8 +183,8 @@
             case SaveSession:              return i18n("Save Session");
             case LockScreen:               return i18n("Lock Screen");
             case Standby:                  return i18nc("Puts the system on standby", "Standby");
-            case SuspendDisk:              return i18n("Suspend to Disk");
-            case SuspendRAM:               return i18n("Suspend to RAM");
+            case SuspendDisk:              return i18n("Hibernate");
+            case SuspendRAM:               return i18n("Sleep");
             case Restart:                  return i18nc("Restart Computer", "Restart");
             case Shutdown:                 return i18n("Shutdown");
             case Logout:                   return i18n("Logout");