summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qkeysequence.cpp
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-27 19:32:08 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-27 19:32:08 (GMT)
commite0a2a4d343902e96e51df1fabeaaf543f4cd2a47 (patch)
tree4cb1ab83e9881a403e2857882fb0d6383118a393 /src/gui/kernel/qkeysequence.cpp
parentf6f9777408691a945c49ef8ec5037d8401c747eb (diff)
parenta17339e943f21bb6c6e16884f716dd9ab8f94938 (diff)
downloadQt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.zip
Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.gz
Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
-rw-r--r--src/gui/kernel/qkeysequence.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index ec3df98..d9a0952 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -390,6 +390,9 @@ static const struct {
int key;
const char* name;
} keyname[] = {
+ //: This and all following "incomprehensible" strings in QShortcut context
+ //: are key names. Please use the localized names appearing on actual
+ //: keyboards or whatever is commonly used.
{ Qt::Key_Space, QT_TRANSLATE_NOOP("QShortcut", "Space") },
{ Qt::Key_Escape, QT_TRANSLATE_NOOP("QShortcut", "Esc") },
{ Qt::Key_Tab, QT_TRANSLATE_NOOP("QShortcut", "Tab") },