kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop duplicate i18n strings

Browse source 
This comment (introduced in commit 39f89141b0) no longer seems to
apply, so drop the duplicate translations and just use the default
strings from kconfigwidgets.

Differential Revision: https://phabricator.kde.org/D6779
This commit is contained in:
Elvis Angelaccio 2017-08-09 23:15:30 +02:00
parent 5481709016
commit d74f62208c
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dolphinremoveaction.cpp
View file

@ -42,18 +42,14 @@ void DolphinRemoveAction::slotRemoveActionTriggered()
void DolphinRemoveAction::update() void DolphinRemoveAction::update()
{ {
Q_ASSERT(m_collection); Q_ASSERT(m_collection);
// Using setText(action->text()) does not apply the &-shortcut.
// This is only done until the original action has been shown at least once. To
// bypass this issue, the text and &-shortcut is applied manually.
if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) { if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) {
m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0; m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0;
setText(i18nc("@action:inmenu", "&Delete"));
} else { } else {
m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash)) : 0; m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash)) : 0;
setText(i18nc("@action:inmenu", "&Move to Trash"));
} }
if (m_action) { if (m_action) {
setText(m_action->text());
setIcon(m_action->icon()); setIcon(m_action->icon());
m_collection->setDefaultShortcuts(this, m_action->shortcuts()); m_collection->setDefaultShortcuts(this, m_action->shortcuts());
setEnabled(m_action->isEnabled()); setEnabled(m_action->isEnabled());