From: Elvis Angelaccio Date: Wed, 9 Aug 2017 21:15:30 +0000 (+0200) Subject: Drop duplicate i18n strings X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d74f62208caf110a501ccc2243ba05eef4df4ae7 Drop duplicate i18n strings This comment (introduced in commit 39f89141b06c) 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 --- diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp index 7e8a353f0..c471b2df6 100644 --- a/src/dolphinremoveaction.cpp +++ b/src/dolphinremoveaction.cpp @@ -42,18 +42,14 @@ void DolphinRemoveAction::slotRemoveActionTriggered() void DolphinRemoveAction::update() { 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) { m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0; - setText(i18nc("@action:inmenu", "&Delete")); } else { m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash)) : 0; - setText(i18nc("@action:inmenu", "&Move to Trash")); } if (m_action) { + setText(m_action->text()); setIcon(m_action->icon()); m_collection->setDefaultShortcuts(this, m_action->shortcuts()); setEnabled(m_action->isEnabled());