partitionmanager: adjust to KLocalizedString changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/partitionmanager/src/config/configureoptionsdialog.cpp b/partitionmanager/src/config/configureoptionsdialog.cpp
index 3ad2516..f0dc740 100644 (file)
--- a/partitionmanager/src/config/configureoptionsdialog.cpp
+++ b/partitionmanager/src/config/configureoptionsdialog.cpp
@@ -148,8 +148,8 @@ void ConfigureOptionsDialog::onComboBackendActivated(int)
 
        if (operationStack().size() == 0 || KMessageBox::warningContinueCancel(this,
                        i18nc("@info",
-                               "<para>Do you really want to change the backend?</para>"
-                               "<para><warning>This will also rescan devices and thus clear the list of pending operations.</warning></para>"),
+                               "<p>Do you really want to change the backend?</p>"
+                               "<p><warning>This will also rescan devices and thus clear the list of pending operations.</warning></p>"),
                        i18nc("@title:window", "Really Change Backend?"),
                        KGuiItem(i18nc("@action:button", "Change the Backend"), "arrow-right"),
                        KGuiItem(i18nc("@action:button", "Do Not Change the Backend"), "dialog-cancel"), "reallyChangeBackend") == KMessageBox::Continue)

diff --git a/partitionmanager/src/gui/createpartitiontabledialog.cpp b/partitionmanager/src/gui/createpartitiontabledialog.cpp
index 9b1aabb..9a54d3d 100644 (file)
--- a/partitionmanager/src/gui/createpartitiontabledialog.cpp
+++ b/partitionmanager/src/gui/createpartitiontabledialog.cpp
@@ -57,8 +57,8 @@ void CreatePartitionTableDialog::onMSDOSToggled(bool on)
        {
                if (KMessageBox::warningContinueCancel(this,
                                i18nc("@info",
-                                       "<para>Do you really want to create an MS-Dos partition table on <filename>%1</filename>?</para>"
-                                       "<para>This device has more than 2^32 sectors. That is the most the MS-Dos partition table type supports, so you will not be able to use the whole device.</para>", device().deviceNode()),
+                                       "<p>Do you really want to create an MS-Dos partition table on <filename>%1</filename>?</p>"
+                                       "<p>This device has more than 2^32 sectors. That is the most the MS-Dos partition table type supports, so you will not be able to use the whole device.</p>", device().deviceNode()),
                                i18nc("@title:window", "Really Create MS-Dos Partition Table Type?"),
                                KGuiItem(i18nc("@action:button", "Create MS-Dos Type"), "arrow-right"),
                                KStandardGuiItem::cancel(), "reallyCreateMSDOSOnLargeDevice") == KMessageBox::Cancel)

diff --git a/partitionmanager/src/gui/editmountpointdialog.cpp b/partitionmanager/src/gui/editmountpointdialog.cpp
index df02d6c..8075d32 100644 (file)
--- a/partitionmanager/src/gui/editmountpointdialog.cpp
+++ b/partitionmanager/src/gui/editmountpointdialog.cpp
@@ -49,8 +49,8 @@ EditMountPointDialog::~EditMountPointDialog()
 void EditMountPointDialog::accept()
 {
        if (KMessageBox::warningContinueCancel(this,
-                       i18nc("@info", "<para>Are you sure you want to save the changes you made to the system table file <filename>/etc/fstab</filename>?</para>"
-                       "<para><warning>This will overwrite the existing file on your hard drive now. This <strong>can not be undone</strong>.</warning></para>"),
+                       i18nc("@info", "<p>Are you sure you want to save the changes you made to the system table file <filename>/etc/fstab</filename>?</p>"
+                       "<p><warning>This will overwrite the existing file on your hard drive now. This <strong>can not be undone</strong>.</warning></p>"),
                        i18nc("@title:window", "Really save changes?"),
                        KGuiItem(i18nc("@action:button", "Save changes"), "arrow-right"),
                        KStandardGuiItem::cancel(),

diff --git a/partitionmanager/src/gui/mainwindow.cpp b/partitionmanager/src/gui/mainwindow.cpp
index 30ab63d..2931abe 100644 (file)
--- a/partitionmanager/src/gui/mainwindow.cpp
+++ b/partitionmanager/src/gui/mainwindow.cpp
@@ -141,8 +141,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
        if (operationStack().size() > 0)
        {
                if (KMessageBox::warningContinueCancel(this,
-                       i18ncp("@info", "<para>Do you really want to quit the application?</para><para>There is still an operation pending.</para>",
-               "<para>Do you really want to quit the application?</para><para>There are still %1 operations pending.</para>", operationStack().size()),
+                       i18ncp("@info", "<p>Do you really want to quit the application?</p><p>There is still an operation pending.</p>",
+               "<p>Do you really want to quit the application?</p><p>There are still %1 operations pending.</p>", operationStack().size()),
                        i18nc("@title:window", "Discard Pending Operations and Quit?"),
                        KGuiItem(i18nc("@action:button", "Quit <application>%1</application>", KGlobal::mainComponent().aboutData()->programName()), "arrow-right"),
                        KStandardGuiItem::cancel(), "reallyQuit") == KMessageBox::Cancel)
@@ -642,8 +642,8 @@ void MainWindow::onRefreshDevices()
 {
        if (operationStack().size() == 0 || KMessageBox::warningContinueCancel(this,
                i18nc("@info",
-                       "<para>Do you really want to rescan the devices?</para>"
-                       "<para><warning>This will also clear the list of pending operations.</warning></para>"),
+                       "<p>Do you really want to rescan the devices?</p>"
+                       "<p><warning>This will also clear the list of pending operations.</warning></p>"),
                i18nc("@title:window", "Really Rescan the Devices?"),
                KGuiItem(i18nc("@action:button", "Rescan Devices"), "arrow-right"),
                KStandardGuiItem::cancel(), "reallyRescanDevices") == KMessageBox::Continue)
@@ -661,8 +661,8 @@ void MainWindow::onApplyAllOperations()
 
        if (KMessageBox::warningContinueCancelList(this,
                i18nc("@info",
-                       "<para>Do you really want to apply the pending operations listed below?</para>"
-                       "<para><warning>This will permanently modify your disks.</warning></para>"),
+                       "<p>Do you really want to apply the pending operations listed below?</p>"
+                       "<p><warning>This will permanently modify your disks.</warning></p>"),
                opList, i18nc("@title:window", "Apply Pending Operations?"),
                KGuiItem(i18nc("@action:button", "Apply Pending Operations"), "arrow-right"),
                KStandardGuiItem::cancel()) == KMessageBox::Continue)
@@ -1067,7 +1067,7 @@ void MainWindow::checkFileSystemSupport()
        if (!supportList.isEmpty())
                KMessageBox::information(this,
                                i18nc("@info",
-                                       "<para>No support tools were found for file systems currently present on hard disks in this computer:</para>"
+                                       "<p>No support tools were found for file systems currently present on hard disks in this computer:</p>"
                                        "<table style='margin-top:12px'>"
                                        "<tr>"
                                        "<td style='font-weight:bold;padding-right:12px;white-space:nowrap;'>Partition</td>"
@@ -1077,8 +1077,8 @@ void MainWindow::checkFileSystemSupport()
                                        "</tr>"
                                        "%1"
                                        "</table>"
-                                       "<para>As long as the support tools for these file systems are not installed you will not be able to modify them.</para>"
-                                       "<para>You should find packages with these support tools in your distribution's package manager.</para>",
+                                       "<p>As long as the support tools for these file systems are not installed you will not be able to modify them.</p>"
+                                       "<p>You should find packages with these support tools in your distribution's package manager.</p>",
                                supportList.join("\n")),
                                i18nc("@title:window", "Missing File System Support Packages"),
                                "showInformationOnMissingFileSystemSupport", KMessageBox::Notify | KMessageBox::AllowLink);

diff --git a/partitionmanager/src/gui/partitionmanagerwidget.cpp b/partitionmanager/src/gui/partitionmanagerwidget.cpp
index 0e1e6bd..7d7ed2f 100644 (file)
--- a/partitionmanager/src/gui/partitionmanagerwidget.cpp
+++ b/partitionmanager/src/gui/partitionmanagerwidget.cpp
@@ -449,10 +449,10 @@ static bool checkTooManyPartitions(QWidget* parent, const Device& d, const Parti
        if (p.roles().has(PartitionRole::Unallocated) && d.partitionTable()->numPrimaries() >= d.partitionTable()->maxPrimaries() && !p.roles().has(PartitionRole::Logical))
        {
                KMessageBox::sorry(parent, i18ncp("@info",
-                       "<para>There is already one primary partition on this device. This is the maximum number its partition table type can handle.</para>"
-                       "<para>You cannot create, paste or restore a primary partition on it before you delete an existing one.</para>",
-                  "<para>There are already %1 primary partitions on this device. This is the maximum number its partition table type can handle.</para>"
-                       "<para>You cannot create, paste or restore a primary partition on it before you delete an existing one.</para>",
+                       "<p>There is already one primary partition on this device. This is the maximum number its partition table type can handle.</p>"
+                       "<p>You cannot create, paste or restore a primary partition on it before you delete an existing one.</p>",
+                  "<p>There are already %1 primary partitions on this device. This is the maximum number its partition table type can handle.</p>"
+                       "<p>You cannot create, paste or restore a primary partition on it before you delete an existing one.</p>",
                        d.partitionTable()->numPrimaries()), i18nc("@title:window", "Too Many Primary Partitions."));
                return true;
        }
@@ -518,8 +518,8 @@ void PartitionManagerWidget::onDeletePartition(bool shred)
                {
                        KMessageBox::sorry(this,
                                i18nc("@info",
-                                       "<para>The partition <filename>%1</filename> cannot currently be deleted because one or more partitions with higher logical numbers are still mounted.</para>"
-                                       "<para>Please unmount all partitions with higher logical numbers than %2 first.</para>",
+                                       "<p>The partition <filename>%1</filename> cannot currently be deleted because one or more partitions with higher logical numbers are still mounted.</p>"
+                                       "<p>Please unmount all partitions with higher logical numbers than %2 first.</p>",
                                selectedPartition()->deviceNode(), selectedPartition()->number()),
                                i18nc("@title:window", "Cannot Delete Partition."));
 
@@ -679,13 +679,13 @@ bool PartitionManagerWidget::showInsertDialog(Partition& insertedPartition, qint
                        return false;
        }
        else if (KMessageBox::warningContinueCancel(this,
-                       i18nc("@info", "<para><warning>You are about to lose all data on partition "
-                               "<filename>%1</filename>.</warning></para>"
-                               "<para>Overwriting one partition with another (or with an image file) will "
-                               "destroy all data on this target partition.</para>"
-                               "<para>If you continue now and apply the resulting operation in the main "
+                       i18nc("@info", "<p><warning>You are about to lose all data on partition "
+                               "<filename>%1</filename>.</warning></p>"
+                               "<p>Overwriting one partition with another (or with an image file) will "
+                               "destroy all data on this target partition.</p>"
+                               "<p>If you continue now and apply the resulting operation in the main "
                                "window, all data currently stored on <filename>%1</filename> will "
-                               "unrecoverably be overwritten.</para>",
+                               "unrecoverably be overwritten.</p>",
                                selectedPartition()->deviceNode()),
                        i18nc("@title:window", "Really Overwrite Existing Partition?"),
                        KGuiItem(i18nc("@action:button", "Overwrite Partition"), "arrow-right"),
@@ -697,13 +697,13 @@ bool PartitionManagerWidget::showInsertDialog(Partition& insertedPartition, qint
        {
                if (overwrite)
                        KMessageBox::error(this, i18nc("@info",
-                               "<para>The selected partition is not large enough to hold the source partition or the backup file.</para>"
-                               "<para>Pick another target or resize this partition so it is as large as the source.</para>"), i18nc("@title:window", "Target Not Large Enough"));
+                               "<p>The selected partition is not large enough to hold the source partition or the backup file.</p>"
+                               "<p>Pick another target or resize this partition so it is as large as the source.</p>"), i18nc("@title:window", "Target Not Large Enough"));
                else
                        KMessageBox::sorry(this, i18nc("@info",
-                               "<para>It is not possible to create the target partition large enough to hold the source.</para>"
-                               "<para>This may happen if not all partitions on a device are correctly aligned "
-                               "or when copying a primary partition into an extended partition.</para>"),
+                               "<p>It is not possible to create the target partition large enough to hold the source.</p>"
+                               "<p>This may happen if not all partitions on a device are correctly aligned "
+                               "or when copying a primary partition into an extended partition.</p>"),
                                i18nc("@title:window", "Cannot Create Target Partition."));
                return false;
        }

diff --git a/partitionmanager/src/gui/partpropsdialog.cpp b/partitionmanager/src/gui/partpropsdialog.cpp
index e7ee893..53dc526 100644 (file)
--- a/partitionmanager/src/gui/partpropsdialog.cpp
+++ b/partitionmanager/src/gui/partpropsdialog.cpp
@@ -325,8 +325,8 @@ void PartPropsDialog::updatePartitionFileSystem()
 void PartPropsDialog::onFilesystemChanged(int)
 {
        if (partition().state() == Partition::StateNew || warnFileSystemChange() || KMessageBox::warningContinueCancel(this,
-                       i18nc("@info", "<para><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></para>"
-                               "<para>Changing the file system on a partition already on disk will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</para>", partition().deviceNode()),
+                       i18nc("@info", "<p><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></p>"
+                               "<p>Changing the file system on a partition already on disk will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</p>", partition().deviceNode()),
                        i18nc("@title:window", "Really Recreate <filename>%1</filename> with File System %2?", partition().deviceNode(), dialogWidget().fileSystem().currentText()),
                        KGuiItem(i18nc("@action:button", "Change the File System"), "arrow-right"),
                        KGuiItem(i18nc("@action:button", "Do Not Change the File System"), "dialog-cancel"), "reallyChangeFileSystem") == KMessageBox::Continue)
@@ -350,8 +350,8 @@ void PartPropsDialog::onFilesystemChanged(int)
 void PartPropsDialog::onRecreate(int state)
 {
        if (state == Qt::Checked && (warnFileSystemChange() || KMessageBox::warningContinueCancel(this,
-                       i18nc("@info", "<para><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></para>"
-                               "<para>Recreating a file system will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</para>", partition().deviceNode()),
+                       i18nc("@info", "<p><warning>You are about to lose all data on partition <filename>%1</filename>.</warning></p>"
+                               "<p>Recreating a file system will erase all its contents. If you continue now and apply the resulting operation in the main window, all data on <filename>%1</filename> will unrecoverably be lost.</p>", partition().deviceNode()),
                        i18nc("@title:window", "Really Recreate File System on <filename>%1</filename>?", partition().deviceNode()),
                        KGuiItem(i18nc("@action:button", "Recreate the File System"), "arrow-right"),
                        KGuiItem(i18nc("@action:button", "Do Not Recreate the File System"), "dialog-cancel"), "reallyRecreateFileSystem") == KMessageBox::Continue))

diff --git a/partitionmanager/src/util/helpers.cpp b/partitionmanager/src/util/helpers.cpp
index e11d71c..a746dfd 100644 (file)
--- a/partitionmanager/src/util/helpers.cpp
+++ b/partitionmanager/src/util/helpers.cpp
@@ -92,10 +92,10 @@ bool checkPermissions()
                }
 
                return KMessageBox::warningContinueCancel(NULL, i18nc("@info",
-                               "<para><warning>You do not have administrative privileges.</warning></para>"
-                               "<para>It is possible to run <application>%1</application> without these privileges. "
-                               "You will, however, <emphasis>not</emphasis> be allowed to apply operations.</para>"
-                               "<para>Do you want to continue running <application>%1</application>?</para>",
+                               "<p><warning>You do not have administrative privileges.</warning></p>"
+                               "<p>It is possible to run <application>%1</application> without these privileges. "
+                               "You will, however, <emphasis>not</emphasis> be allowed to apply operations.</p>"
+                               "<p>Do you want to continue running <application>%1</application>?</p>",
                                KGlobal::mainComponent().aboutData()->programName()),
                        i18nc("@title:window", "No administrative privileges"),
                        KGuiItem(i18nc("@action:button", "Run without administrative privileges"), "arrow-right"),
@@ -186,8 +186,8 @@ bool loadBackend()
                if (CoreBackendManager::self()->load(CoreBackendManager::defaultBackendName()))
                {
                        KMessageBox::sorry(NULL,
-                               i18nc("@info", "<para>The configured backend plugin \"%1\" could not be loaded.</para>"
-                                       "<para>Loading the default backend plugin \"%2\" instead.</para>",
+                               i18nc("@info", "<p>The configured backend plugin \"%1\" could not be loaded.</p>"
+                                       "<p>Loading the default backend plugin \"%2\" instead.</p>",
                                Config::backend(), CoreBackendManager::defaultBackendName()),
                                i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
                        Config::setBackend(CoreBackendManager::defaultBackendName());
@@ -195,8 +195,8 @@ bool loadBackend()
                else
                {
                        KMessageBox::error(NULL,
-                               i18nc("@info", "<para>Neither the configured (\"%1\") nor the default (\"%2\") backend "
-                                       "plugin could be loaded.</para><para>Please check your installation.</para>",
+                               i18nc("@info", "<p>Neither the configured (\"%1\") nor the default (\"%2\") backend "
+                                       "plugin could be loaded.</p><p>Please check your installation.</p>",
                                Config::backend(), CoreBackendManager::defaultBackendName()),
                                i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
                        return false;