=== modified file 'mixxx/src/skin/legacyskinparser.cpp'
--- mixxx/src/skin/legacyskinparser.cpp	2011-11-01 01:28:17 +0000
+++ mixxx/src/skin/legacyskinparser.cpp	2011-12-05 19:18:25 +0000
@@ -838,7 +838,8 @@
     QByteArray qba(channelStr.toAscii());
     char *safe = new char[qba.size() + 1]; // +1 for \0
     int i = 0;
-    while (safe[i] = qba[i]) ++i;
+    // Copy string
+    while ((safe[i] = qba[i])) ++i;
     s_channelStrs.append(safe);
     return safe;
 }
@@ -997,8 +998,13 @@
             // Add keyboard shortcut info to tooltip string
             QString tooltip = pWidget->toolTip();
             QString shortcut = m_pKeyboard->getKeyboardConfig()->getValueString(configKey);
-            if (!shortcut.isEmpty() && !tooltip.contains(shortcut, Qt::CaseInsensitive)) {
-                tooltip.append(QString("\nShortcut: %1").arg(shortcut));
+            if (!shortcut.isEmpty()) {
+                // translate shortcut to native text
+                shortcut = QKeySequence(shortcut, QKeySequence::PortableText).toString(QKeySequence::NativeText);
+                tooltip += "\n";
+                tooltip += tr("Shortcut");
+                tooltip += ": ";
+                tooltip += shortcut;
                 pWidget->setToolTip(tooltip);
             }
         }