diff --git a/Modules/samba/main.cpp b/Modules/samba/main.cpp --- a/Modules/samba/main.cpp +++ b/Modules/samba/main.cpp @@ -49,22 +49,19 @@ Q_ASSERT(this->layout()); setLayout(layout); - addTableView(i18n("&Exports"), new KSambaShareModel(this)); + addTableView(i18nc("@title/group", "Exported Shares"), new KSambaShareModel(this)); - auto importsView = addTableView(i18n("&Imports"), new SmbMountModel(this)); + auto importsView = addTableView(i18nc("@title/group", "Mounted Shares"), new SmbMountModel(this)); importsView->horizontalHeader()->setSectionResizeMode(static_cast(SmbMountModel::ColumnRole::Accessible), QHeaderView::ResizeToContents); setButtons(Help); } QTableView *SambaContainer::addTableView(const QString &localizedLabel, QAbstractListModel *model) { - QString text = localizedLabel; auto title = new KTitleWidget(this); - // hackily remove ampersand to not break i18n too much in 5.18 - // TODO: replace i18n'd string to one without quick access marker - title->setText(text.remove("&")); + title->setText(localizedLabel); title->setLevel(2); layout()->addWidget(title); diff --git a/Modules/samba/smbmountmodel.cpp b/Modules/samba/smbmountmodel.cpp --- a/Modules/samba/smbmountmodel.cpp +++ b/Modules/samba/smbmountmodel.cpp @@ -46,9 +46,9 @@ Q_ASSERT(section (ColumnRole::ColumnCount)); switch (static_cast(section)) { case ColumnRole::Share: - return i18n("Resource"); // TODO: maybe reword for 5.19 + return i18n("Resource"); case ColumnRole::Path: - return i18n("Mounted Under"); // TODO: maybe reword for 5.19 + return i18n("Mounted Under"); case ColumnRole::Accessible: return i18nc("@title:column whether a samba share is accessible locally (i.e. mounted)", "Accessible"); case ColumnRole::ColumnCount: