Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-25 15:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix translations on Keyboard Shortcuts Widget

Browse Source 
* Fixes #10335
This commit is contained in:
Jonathan White 2024-08-10 18:27:35 -04:00
parent 0941ff41b6
commit 7498fe24dc
2 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
share/translations/keepassxc_en.ts
View File

@ -8978,6 +8978,26 @@ This option is deprecated, use --set-key-file instead.</source>
<source>Only PBKDF and Argon2 are supported, cannot decrypt json file</source> <source>Only PBKDF and Argon2 are supported, cannot decrypt json file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Reset Shortcuts</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Double click an action to change its shortcut</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut Conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut %1 conflicts with &apos;%2&apos;. Overwrite shortcut?</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Cannot generate valid passphrases because the wordlist is too short</source> <source>Cannot generate valid passphrases because the wordlist is too short</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -9856,29 +9876,6 @@ This option is deprecated, use --set-key-file instead.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>ShortcutSettingsWidget</name>
<message>
<source>Double click an action to change its shortcut</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut Conflict</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Filter...</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Shortcut %1 conflicts with &apos;%2&apos;. Overwrite shortcut?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset Shortcuts</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>TagModel</name> <name>TagModel</name>
<message> <message>

12
src/gui/ShortcutSettingsPage.cpp
View File

@ -23,7 +23,6 @@
#include "gui/MessageBox.h" #include "gui/MessageBox.h"
#include "gui/widgets/ShortcutWidget.h" #include "gui/widgets/ShortcutWidget.h"
#include <QAbstractButton>
#include <QDebug> #include <QDebug>
#include <QDialog> #include <QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -81,7 +80,6 @@ private:
} }
} }
private:
bool m_restoreDefault = false; bool m_restoreDefault = false;
ShortcutWidget* const m_keySeqEdit; ShortcutWidget* const m_keySeqEdit;
QDialogButtonBox* const m_btnBox; QDialogButtonBox* const m_btnBox;
@ -94,7 +92,7 @@ public:
: QWidget(parent) : QWidget(parent)
, m_tableView(new QTableView(this)) , m_tableView(new QTableView(this))
, m_filterLineEdit(new QLineEdit(this)) , m_filterLineEdit(new QLineEdit(this))
, m_resetShortcutsButton(new QPushButton(tr("Reset Shortcuts"), this)) , m_resetShortcutsButton(new QPushButton(QObject::tr("Reset Shortcuts"), this))
{ {
auto h = new QHBoxLayout(); auto h = new QHBoxLayout();
h->addWidget(m_filterLineEdit); h->addWidget(m_filterLineEdit);
@ -102,7 +100,7 @@ public:
h->setStretch(0, 1); h->setStretch(0, 1);
auto l = new QVBoxLayout(this); auto l = new QVBoxLayout(this);
l->addWidget(new QLabel(tr("Double click an action to change its shortcut"))); l->addWidget(new QLabel(QObject::tr("Double click an action to change its shortcut")));
l->addLayout(h); l->addLayout(h);
l->addWidget(m_tableView); l->addWidget(m_tableView);
@ -113,7 +111,7 @@ public:
m_proxy.setFilterCaseSensitivity(Qt::CaseInsensitive); m_proxy.setFilterCaseSensitivity(Qt::CaseInsensitive);
m_proxy.setSourceModel(&m_model); m_proxy.setSourceModel(&m_model);
m_filterLineEdit->setPlaceholderText(tr("Filter...")); m_filterLineEdit->setPlaceholderText(QObject::tr("Filter..."));
connect(m_filterLineEdit, &QLineEdit::textChanged, &m_proxy, &QSortFilterProxyModel::setFilterFixedString); connect(m_filterLineEdit, &QLineEdit::textChanged, &m_proxy, &QSortFilterProxyModel::setFilterFixedString);
connect(m_resetShortcutsButton, &QPushButton::clicked, this, [this]() { connect(m_resetShortcutsButton, &QPushButton::clicked, this, [this]() {
@ -227,8 +225,8 @@ private:
auto ans = MessageBox::question( auto ans = MessageBox::question(
this, this,
tr("Shortcut Conflict"), QObject::tr("Shortcut Conflict"),
tr("Shortcut %1 conflicts with '%2'. Overwrite shortcut?").arg(conflictSeq, conflictName), QObject::tr("Shortcut %1 conflicts with '%2'. Overwrite shortcut?").arg(conflictSeq, conflictName),
MessageBox::Overwrite | MessageBox::Discard, MessageBox::Overwrite | MessageBox::Discard,
MessageBox::Discard); MessageBox::Discard);
if (ans == MessageBox::Discard) { if (ans == MessageBox::Discard) {