From kde-commits  Fri Oct 31 23:49:17 2008
From: Albert Astals Cid <tsdgeos () terra ! es>
Date: Fri, 31 Oct 2008 23:49:17 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/kwin
Message-Id: <1225496957.799800.19780.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122549696710634

SVN commit 878357 by aacid:

we are showing the shortcut to the user so use QKeySequence::NativeText to get it translated


 M  +1 -1      composite.cpp  


--- trunk/KDE/kdebase/workspace/kwin/composite.cpp #878356:878357
@@ -486,7 +486,7 @@
         QTimer::singleShot( 0, this, SLOT( suspendCompositing()));
         QString shortcut = i18n( "Empty" );
         if( KAction* action = qobject_cast<KAction*>( keys->action("Suspend Compositing")))
-            shortcut = action->globalShortcut().primary().toString();
+            shortcut = action->globalShortcut().primary().toString(QKeySequence::NativeText);
         QString message = i18n( "Compositing was too slow and has been suspended.\n"
             "If this was only a temporary problem, you can resume using the '%1' shortcut.\n"
             "You can also disable functionality checks in advanced compositing settings.", shortcut );