|
 |
4101233 |
From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001
|
|
|
4101233 |
From: Albert Astals Cid <aacid@kde.org>
|
|
|
4101233 |
Date: Sat, 8 Aug 2009 14:40:25 +0200
|
|
|
4101233 |
Subject: [PATCH 17/18] Add context to tr calls in QShortcut
|
|
|
4101233 |
|
|
|
4101233 |
Some languages have special rules for using "+" to concatenate strings and
|
|
|
4101233 |
for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding
|
|
|
4101233 |
context to these strings helps creating a more correct translation
|
|
|
4101233 |
---
|
|
|
4101233 |
src/gui/kernel/qkeysequence.cpp | 20 ++++++++++----------
|
|
|
4101233 |
1 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
4101233 |
|
|
|
4101233 |
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
|
|
|
4101233 |
index 894f663..c17f253 100644
|
|
|
4101233 |
--- a/src/gui/kernel/qkeysequence.cpp
|
|
|
4101233 |
+++ b/src/gui/kernel/qkeysequence.cpp
|
|
|
4101233 |
@@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
|
|
|
4101233 |
|
|
|
4101233 |
QList<QModifKeyName> modifs;
|
|
|
4101233 |
if (nativeText) {
|
|
|
4101233 |
- modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
- << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
- << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
- << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+')));
|
|
|
4101233 |
+ modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
+ << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
+ << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+')))
|
|
|
4101233 |
+ << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+')));
|
|
|
4101233 |
}
|
|
|
4101233 |
modifs += *gmodifs; // Test non-translated ones last
|
|
|
4101233 |
|
|
|
4101233 |
@@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key)
|
|
|
4101233 |
static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format)
|
|
|
4101233 |
{
|
|
|
4101233 |
if (!str.isEmpty())
|
|
|
4101233 |
- str += (format == QKeySequence::NativeText) ? QShortcut::tr("+")
|
|
|
4101233 |
+ str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts")
|
|
|
4101233 |
: QString::fromLatin1("+");
|
|
|
4101233 |
str += theKey;
|
|
|
4101233 |
}
|
|
|
4101233 |
@@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
|
|
|
4101233 |
{
|
|
|
4101233 |
// On other systems the order is Meta, Control, Alt, Shift
|
|
|
4101233 |
if ((key & Qt::META) == Qt::META)
|
|
|
4101233 |
- s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta");
|
|
|
4101233 |
+ s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta");
|
|
|
4101233 |
if ((key & Qt::CTRL) == Qt::CTRL)
|
|
|
4101233 |
- addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format);
|
|
|
4101233 |
+ addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format);
|
|
|
4101233 |
if ((key & Qt::ALT) == Qt::ALT)
|
|
|
4101233 |
- addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format);
|
|
|
4101233 |
+ addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format);
|
|
|
4101233 |
if ((key & Qt::SHIFT) == Qt::SHIFT)
|
|
|
4101233 |
- addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format);
|
|
|
4101233 |
+ addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format);
|
|
|
4101233 |
}
|
|
|
4101233 |
|
|
|
4101233 |
|
|
|
4101233 |
@@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
|
|
|
4101233 |
p += QChar((key-0x10000)%400+0xdc00);
|
|
|
4101233 |
}
|
|
|
4101233 |
} else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
|
|
|
4101233 |
- p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
|
|
|
4101233 |
+ p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1)
|
|
|
4101233 |
: QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1);
|
|
|
4101233 |
} else if (key) {
|
|
|
4101233 |
int i=0;
|
|
|
4101233 |
--
|
|
|
4101233 |
1.6.2.5
|
|
|
4101233 |
|