Fix minor EBN issues

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

doc/referencemanual.docbook

@@ -510,8 +510,8 @@
 		<title>The Settings and Help Menu</title>
 
 		<para>
-		&partman; has the common &kde; <ulink url="help:/fundamentals/ui.html#menus-settings">Settings</ulink> and
-		<ulink url="help:/fundamentals/ui.html#menus-help">Help</ulink> menu described in
+		&partman; has the common &kde; <ulink url="help:/fundamentals/menus.html#menus-settings">Settings</ulink> and
+		<ulink url="help:/fundamentals/menus.html#menus-help">Help</ulink> menu described in
 		the &kde; Fundamentals with an additional submenu <guisubmenu>Panels Shown</guisubmenu>,
 		where you can toggle the display of the <guimenuitem>Devices</guimenuitem>,
                 <guimenuitem>Pending Operations</guimenuitem>, <guimenuitem>Information</guimenuitem>

src/config/advancedpagewidget.h

@@ -32,7 +32,7 @@ class QComboBox;
 class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced
 {
 public:
-    AdvancedPageWidget(QWidget* parent);
+    explicit AdvancedPageWidget(QWidget* parent);
 
 public:
     QComboBox& comboBackend() {

src/config/filesystemcolorspagewidget.h

@@ -26,7 +26,7 @@
 class FileSystemColorsPageWidget : public QWidget, public Ui::ConfigurePageFileSystemColors
 {
 public:
-    FileSystemColorsPageWidget(QWidget* parent);
+    explicit FileSystemColorsPageWidget(QWidget* parent);
 };
 
 #endif

src/config/generalpagewidget.h

@@ -31,7 +31,7 @@ class QString;
 class GeneralPageWidget : public QWidget, public Ui::ConfigurePageGeneral
 {
 public:
-    GeneralPageWidget(QWidget* parent);
+    explicit GeneralPageWidget(QWidget* parent);
 
 public:
     QComboBox& comboDefaultFileSystem() {

src/gui/applyprogressdetailswidget.h

@@ -27,7 +27,7 @@
 class ApplyProgressDetailsWidget : public QWidget, public Ui::ApplyProgressDetailsWidgetBase
 {
 public:
-    ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) {
+    explicit ApplyProgressDetailsWidget(QWidget* parent) : QWidget(parent) {
         setupUi(this);
     }
 

src/gui/applyprogressdialogwidget.h

@@ -27,7 +27,7 @@
 class ApplyProgressDialogWidget : public QWidget, public Ui::ApplyProgressDialogWidgetBase
 {
 public:
-    ApplyProgressDialogWidget(QWidget* parent);
+    explicit ApplyProgressDialogWidget(QWidget* parent);
 
 public:
     QTreeWidget& treeTasks() {

src/gui/createpartitiontablewidget.h

@@ -28,7 +28,7 @@
 class CreatePartitionTableWidget : public QWidget, public Ui::CreatePartitionTableWidgetBase
 {
 public:
-    CreatePartitionTableWidget(QWidget* parent);
+    explicit CreatePartitionTableWidget(QWidget* parent);
 
 public:
     QRadioButton& radioMSDOS() {

src/gui/createvolumegroupdialog.cpp

@@ -71,7 +71,7 @@ void CreateVolumeGroupDialog::setupDialog()
         if (toBeDeleted)
             continue;
 
-        if (!p.isLuks() && p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition()))
+        if (!p.isLuks() && p.vgName().isEmpty() && !LvmDevice::s_DirtyPVs.contains(p.partition()))
             dialogWidget().listPV().addPartition(*p.partition(), false);
     }
 

src/gui/devicepropswidget.h

@@ -29,7 +29,7 @@ class PartTableWidget;
 class DevicePropsWidget : public QWidget, public Ui::DevicePropsWidgetBase
 {
 public:
-    DevicePropsWidget(QWidget* parent);
+    explicit DevicePropsWidget(QWidget* parent);
 
 public:
     PartTableWidget& partTableWidget() {

src/gui/filesystemsupportdialog.h

@@ -38,7 +38,7 @@ class FileSystemSupportDialog : public QDialog
     Q_DISABLE_COPY(FileSystemSupportDialog)
 
 public:
-    FileSystemSupportDialog(QWidget* parent);
+    explicit FileSystemSupportDialog(QWidget* parent);
     ~FileSystemSupportDialog();
 
 public:

src/gui/filesystemsupportdialogwidget.h

@@ -24,7 +24,7 @@
 class FileSystemSupportDialogWidget : public QWidget, public Ui::FileSystemSupportDialogWidgetBase
 {
 public:
-    FileSystemSupportDialogWidget(QWidget* parent);
+    explicit FileSystemSupportDialogWidget(QWidget* parent);
 
 public:
     QTreeWidget& tree() {

src/gui/formattedspinbox.h

@@ -24,7 +24,7 @@
 class FormattedSpinBox : public QDoubleSpinBox
 {
 public:
-    FormattedSpinBox(QWidget* parent = nullptr) : QDoubleSpinBox(parent) {}
+    explicit FormattedSpinBox(QWidget* parent = nullptr) : QDoubleSpinBox(parent) {}
 
 public:
     QString textFromValue(double value) const override;

src/gui/infopane.h

@@ -39,7 +39,7 @@ class InfoPane : public QWidget
     Q_DISABLE_COPY(InfoPane)
 
 public:
-    InfoPane(QWidget* parent = nullptr);
+    explicit InfoPane(QWidget* parent = nullptr);
 
 public:
     void showPartition(Qt::DockWidgetArea area, const Partition& p);

src/gui/listdevices.h

@@ -38,7 +38,7 @@ class ListDevices : public QWidget, public Ui::ListDevicesBase
     Q_DISABLE_COPY(ListDevices)
 
 public:
-    ListDevices(QWidget* parent = nullptr);
+    explicit ListDevices(QWidget* parent = nullptr);
 
 Q_SIGNALS:
     void selectionChanged(const QString& device_node);

src/gui/listoperations.h

@@ -38,7 +38,7 @@ class ListOperations : public QWidget, public Ui::ListOperationsBase
     Q_DISABLE_COPY(ListOperations)
 
 public:
-    ListOperations(QWidget* parent = nullptr);
+    explicit ListOperations(QWidget* parent = nullptr);
 
 public:
     void setActionCollection(KActionCollection* coll) {

src/gui/listphysicalvolumes.h

@@ -46,7 +46,7 @@ class ListPhysicalVolumes : public QWidget, public Ui::ListPhysicalVolumesBase
     Q_DISABLE_COPY(ListPhysicalVolumes)
 
 public:
-    ListPhysicalVolumes(QWidget* parent = nullptr);
+    explicit ListPhysicalVolumes(QWidget* parent = nullptr);
 
     void addPartition(const Partition& p, bool checked);
 

src/gui/partitionmanagerui.rc

@@ -1,21 +1,13 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 
 <gui name="KDE Partition Manager" version="11">
-    <ToolBar name="editToolBar">
-        <text context="@title:menu turn on and off edit toolbar">Edit Toolbar</text>
+    <ToolBar name="partitionToolBar">
+        <text context="@title:menu">Partition Manager Toolbar</text>
         <Action name="applyAllOperations"/>
         <Action name="undoOperation"/>
-    </ToolBar>
-
-    <ToolBar name="partitionToolBar">
-        <text context="@title:menu">Partition Toolbar</text>
         <Action name="newPartition"/>
         <Action name="resizePartition"/>
         <Action name="deletePartition"/>
-    </ToolBar>
-
-    <ToolBar name="deviceToolBar">
-        <text context="@title:menu">Device Toolbar</text>
         <Action name="createNewPartitionTable"/>
     </ToolBar>
 

src/gui/partitionmanagerwidget.h

@@ -45,7 +45,7 @@ class PartitionManagerWidget : public QWidget, Ui::PartitionManagerWidgetBase
     Q_DISABLE_COPY(PartitionManagerWidget)
 
 public:
-    PartitionManagerWidget(QWidget* parent = nullptr);
+    explicit PartitionManagerWidget(QWidget* parent = nullptr);
     virtual ~PartitionManagerWidget();
 
 Q_SIGNALS:

src/gui/partpropswidget.h

@@ -30,7 +30,7 @@
 class PartPropsWidget : public QWidget, public Ui::PartPropsWidgetBase
 {
 public:
-    PartPropsWidget(QWidget* parent) : QWidget(parent) {
+    explicit PartPropsWidget(QWidget* parent) : QWidget(parent) {
         setupUi(this);
 
         m_PartWidget->setFileSystemColorCode(GuiHelpers::fileSystemColorCodesFromSettings());

src/gui/parttablewidget.h

@@ -38,7 +38,7 @@ class PartTableWidget : public PartWidgetBase
     Q_DISABLE_COPY(PartTableWidget)
 
 public:
-    PartTableWidget(QWidget* parent);
+    explicit PartTableWidget(QWidget* parent);
     qint32 borderWidth() const override {
         return 0;    /**< @return border width */
     }

src/gui/resizevolumegroupdialog.cpp

@@ -73,7 +73,7 @@ void ResizeVolumeGroupDialog::setupDialog()
                 continue;
             if (p.vgName() == device()->name())
                 dialogWidget().listPV().addPartition(*p.partition(), true);
-            else if (p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition())) // TODO: Remove LVM PVs in current VG
+            else if (p.vgName().isEmpty() && !LvmDevice::s_DirtyPVs.contains(p.partition())) // TODO: Remove LVM PVs in current VG
                 dialogWidget().listPV().addPartition(*p.partition(), false);
         }
 

src/gui/scanprogressdialog.h

@@ -23,7 +23,7 @@
 class ScanProgressDialog : public QProgressDialog
 {
 public:
-    ScanProgressDialog(QWidget* parent);
+    explicit ScanProgressDialog(QWidget* parent);
 
     void setProgress(int p) {
         setValue(p);

src/gui/sizedetailswidget.h

@@ -29,7 +29,7 @@
 class SizeDetailsWidget : public QWidget, public Ui::SizeDetailsWidgetBase
 {
 public:
-    SizeDetailsWidget(QWidget* parent);
+    explicit SizeDetailsWidget(QWidget* parent);
 
 public:
     QDoubleSpinBox& spinFirstSector() {

src/gui/smartdialogwidget.h

@@ -30,7 +30,7 @@ class QPoint;
 class SmartDialogWidget : public QWidget, public Ui::SmartDialogWidgetBase
 {
 public:
-    SmartDialogWidget(QWidget* parent);
+    explicit SmartDialogWidget(QWidget* parent);
     ~SmartDialogWidget();
 
 public:

src/gui/treelog.h

@@ -35,7 +35,7 @@ class TreeLog: public QWidget, public Ui::TreeLogBase
     Q_DISABLE_COPY(TreeLog)
 
 public:
-    TreeLog(QWidget* parent = nullptr);
+    explicit TreeLog(QWidget* parent = nullptr);
     ~TreeLog();
 
 public:

src/gui/volumegroupwidget.h

@@ -26,7 +26,7 @@
 class  VolumeGroupWidget : public QWidget, public Ui::VolumeGroupWidgetBase
 {
 public:
-    VolumeGroupWidget(QWidget* parent) :
+    explicit VolumeGroupWidget(QWidget* parent) :
         QWidget(parent), Ui::VolumeGroupWidgetBase()
     {
         setupUi(this);

src/org.kde.partitionmanager.desktop

@@ -172,6 +172,7 @@ Keywords[de]=partition;disk;festplatte
 Keywords[el]=κατάτμηση;δίσκος;
 Keywords[en_GB]=partition;disk;
 Keywords[es]=partición;disco;
+Keywords[et]=partitsioon;ketas;
 Keywords[eu]=partizioa;diskoa;
 Keywords[fi]=osio;levy;
 Keywords[fr]=partition;disque;