kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: use expresion 'keyboard shortcut' to avoid incorrect translation

Browse Source
This commit is contained in:
wmayer
2022-06-09 13:15:41 +02:00
parent 97806748a0
commit 3057abfae9
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/Action.cpp
View File

@@ -927,7 +927,7 @@ void RecentMacrosAction::setFiles(const QStringList& files)
auto check = Application::Instance->commandManager().checkAcceleratorForConflicts(qPrintable(accel_tmp));
if (check) {
recentFiles[index]->setShortcut(QKeySequence());
auto msg = QStringLiteral("Recent macros : shortcut %1 disabled because conflicting with %2")
auto msg = QStringLiteral("Recent macros : keyboard shortcut %1 disabled because conflicting with %2")
.arg(accel_tmp).arg(QLatin1String(check->getName()));
Base::Console().Warning("%s\n", qPrintable(msg));
}
@@ -936,7 +936,7 @@ void RecentMacrosAction::setFiles(const QStringList& files)
recentFiles[index]->setShortcut(accel);
}
}
recentFiles[index]->setStatusTip(tr("Run macro %1 (Shift+click to edit) shortcut: %2").arg(files[index]).arg(accel));
recentFiles[index]->setStatusTip(tr("Run macro %1 (Shift+click to edit) keyboard shortcut: %2").arg(files[index]).arg(accel));
recentFiles[index]->setVisible(true);
}

8
src/Gui/DlgKeyboardImp.cpp
View File

@@ -370,16 +370,16 @@ void DlgCustomKeyboardImp::on_editShortcut_textChanged(const QString& sc)
ui->assignedTreeWidget->resizeColumnToContents(0);
if (countAmbiguous > 1) {
QMessageBox::warning(this, tr("Multiple defined shortcut"),
tr("The shortcut '%1' is defined more than once. This could result in unexpected behaviour.").arg(sc) );
QMessageBox::warning(this, tr("Multiple defined keyboard shortcut"),
tr("The keyboard shortcut '%1' is defined more than once. This could result in unexpected behaviour.").arg(sc) );
ui->editShortcut->setFocus();
ui->buttonAssign->setEnabled(false);
}
else if (countAmbiguous == 1 && ambiguousCommand != QLatin1String(name)) {
QMessageBox box(this);
box.setIcon(QMessageBox::Warning);
box.setWindowTitle(tr("Already defined shortcut"));
box.setText(tr("The shortcut '%1' is already assigned to '%2'.").arg(sc, ambiguousMenu));
box.setWindowTitle(tr("Already defined keyboard shortcut"));
box.setText(tr("The keyboard shortcut '%1' is already assigned to '%2'.").arg(sc, ambiguousMenu));
box.setInformativeText(tr("Do you want to override it?"));
box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
box.setDefaultButton(QMessageBox::No);

2
src/Gui/DlgSettingsMacro.ui
View File

@@ -282,7 +282,7 @@
<item row="1" column="0">
<widget class="QLabel" name="recentMacroListShortcutCountLabel">
<property name="text">
<string>Shortcut count</string>
<string>Keyboard shortcut count</string>
</property>
</widget>
</item>

BIN
src/Gui/Language/FreeCAD_de.qm
View File

Binary file not shown.

12
src/Gui/Language/FreeCAD_de.ts
View File

@@ -1390,22 +1390,22 @@ Wenn dies nicht ausgewählt ist, muss die Eigenschaft eindeutig benannt sein und
</message>
<message>
<location filename="../DlgKeyboardImp.cpp" line="373"/>
<source>Multiple defined shortcut</source>
<source>Multiple defined keyboard shortcut</source>
<translation>Mehrfach belegte Tastenkombination</translation>
</message>
<message>
<location filename="../DlgKeyboardImp.cpp" line="374"/>
<source>The shortcut '%1' is defined more than once. This could result in unexpected behaviour.</source>
<source>The keyboard shortcut '%1' is defined more than once. This could result in unexpected behaviour.</source>
<translation>Die Tastenkombination '%1' ist mehr als einmal definiert. Dies kann zu unerwartetem Verhalten führen.</translation>
</message>
<message>
<location filename="../DlgKeyboardImp.cpp" line="381"/>
<source>Already defined shortcut</source>
<source>Already defined keyboard shortcut</source>
<translation>Bereits belegte Tastenkombination</translation>
</message>
<message>
<location filename="../DlgKeyboardImp.cpp" line="382"/>
<source>The shortcut '%1' is already assigned to '%2'.</source>
<source>The keyboard shortcut '%1' is already assigned to '%2'.</source>
<translation>Die Tastenkombination '%1' ist bereits '%2' zugewiesen.</translation>
</message>
<message>
@@ -4656,7 +4656,7 @@ Sie können auch das Formular verwenden: John Doe &lt;john@doe.com&gt;</translat
</message>
<message>
<location filename="../DlgSettingsMacro.ui" line="285"/>
<source>Shortcut count</source>
<source>Keyboard shortcut count</source>
<translation>Anzahl der Tastenkürzel</translation>
</message>
<message>
@@ -7533,7 +7533,7 @@ Wollen Sie sie beenden, ohne Ihre Daten zu speichern?</translation>
</message>
<message>
<location filename="../Action.cpp" line="939"/>
<source>Run macro %1 (Shift+click to edit) shortcut: %2</source>
<source>Run macro %1 (Shift+click to edit) keyboard shortcut: %2</source>
<translation>Makro %1 ausführen (Umschalt+Klick zum Bearbeiten) Tastenkürzel: %2</translation>
</message>
<message>