]>
Commit | Line | Data |
---|---|---|
378d39c4 SS |
1 | From 9eb3560cfd5cd0bc9c7bf79f2c27657ee07b8f95 Mon Sep 17 00:00:00 2001 |
2 | From: Albert Astals Cid <aacid@kde.org> | |
3 | Date: Sat, 8 Aug 2009 14:40:25 +0200 | |
4 | Subject: [PATCH 12/13] Add context to tr calls in QShortcut | |
5 | ||
6 | Some languages have special rules for using "+" to concatenate strings and | |
7 | for example it needs to be Ctrl + Shift instead of Ctrl+Shift, adding | |
8 | context to these strings helps creating a more correct translation | |
9 | --- | |
10 | src/gui/kernel/qkeysequence.cpp | 20 ++++++++++---------- | |
11 | 1 files changed, 10 insertions(+), 10 deletions(-) | |
12 | ||
13 | diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp | |
14 | index 894f663..c17f253 100644 | |
15 | --- a/src/gui/kernel/qkeysequence.cpp | |
16 | +++ b/src/gui/kernel/qkeysequence.cpp | |
17 | @@ -991,10 +991,10 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence | |
18 | ||
19 | QList<QModifKeyName> modifs; | |
20 | if (nativeText) { | |
21 | - modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl").toLower().append(QLatin1Char('+'))) | |
22 | - << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift").toLower().append(QLatin1Char('+'))) | |
23 | - << QModifKeyName(Qt::ALT, QShortcut::tr("Alt").toLower().append(QLatin1Char('+'))) | |
24 | - << QModifKeyName(Qt::META, QShortcut::tr("Meta").toLower().append(QLatin1Char('+'))); | |
25 | + modifs << QModifKeyName(Qt::CTRL, QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts").toLower().append(QLatin1Char('+'))) | |
26 | + << QModifKeyName(Qt::SHIFT, QShortcut::tr("Shift", "Shift key, used for shortcuts").toLower().append(QLatin1Char('+'))) | |
27 | + << QModifKeyName(Qt::ALT, QShortcut::tr("Alt", "Alt key, used for shortcuts").toLower().append(QLatin1Char('+'))) | |
28 | + << QModifKeyName(Qt::META, QShortcut::tr("Meta", "Meta key, used for shortcuts").toLower().append(QLatin1Char('+'))); | |
29 | } | |
30 | modifs += *gmodifs; // Test non-translated ones last | |
31 | ||
32 | @@ -1086,7 +1086,7 @@ QString QKeySequence::encodeString(int key) | |
33 | static inline void addKey(QString &str, const QString &theKey, QKeySequence::SequenceFormat format) | |
34 | { | |
35 | if (!str.isEmpty()) | |
36 | - str += (format == QKeySequence::NativeText) ? QShortcut::tr("+") | |
37 | + str += (format == QKeySequence::NativeText) ? QShortcut::tr("+", "Symbol used to concatenate keys in shortcuts") | |
38 | : QString::fromLatin1("+"); | |
39 | str += theKey; | |
40 | } | |
41 | @@ -1111,13 +1111,13 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat | |
42 | { | |
43 | // On other systems the order is Meta, Control, Alt, Shift | |
44 | if ((key & Qt::META) == Qt::META) | |
45 | - s = nativeText ? QShortcut::tr("Meta") : QString::fromLatin1("Meta"); | |
46 | + s = nativeText ? QShortcut::tr("Meta", "Meta key, used for shortcuts") : QString::fromLatin1("Meta"); | |
47 | if ((key & Qt::CTRL) == Qt::CTRL) | |
48 | - addKey(s, nativeText ? QShortcut::tr("Ctrl") : QString::fromLatin1("Ctrl"), format); | |
49 | + addKey(s, nativeText ? QShortcut::tr("Ctrl", "Ctrl key, used for shortcuts") : QString::fromLatin1("Ctrl"), format); | |
50 | if ((key & Qt::ALT) == Qt::ALT) | |
51 | - addKey(s, nativeText ? QShortcut::tr("Alt") : QString::fromLatin1("Alt"), format); | |
52 | + addKey(s, nativeText ? QShortcut::tr("Alt", "Alt key, used for shortcuts") : QString::fromLatin1("Alt"), format); | |
53 | if ((key & Qt::SHIFT) == Qt::SHIFT) | |
54 | - addKey(s, nativeText ? QShortcut::tr("Shift") : QString::fromLatin1("Shift"), format); | |
55 | + addKey(s, nativeText ? QShortcut::tr("Shift", "Shift key, used for shortcuts") : QString::fromLatin1("Shift"), format); | |
56 | } | |
57 | ||
58 | ||
59 | @@ -1132,7 +1132,7 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat | |
60 | p += QChar((key-0x10000)%400+0xdc00); | |
61 | } | |
62 | } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) { | |
63 | - p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1) | |
64 | + p = nativeText ? QShortcut::tr("F%1", "Fx key, used for shortcuts").arg(key - Qt::Key_F1 + 1) | |
65 | : QString::fromLatin1("F%1").arg(key - Qt::Key_F1 + 1); | |
66 | } else if (key) { | |
67 | int i=0; | |
68 | -- | |
69 | 1.6.5.1 | |
70 |