diff --git a/src/gui/applyprogressdetailswidgetbase.ui b/src/gui/applyprogressdetailswidgetbase.ui
index 73a4365..9ecb2fb 100644
--- a/src/gui/applyprogressdetailswidgetbase.ui
+++ b/src/gui/applyprogressdetailswidgetbase.ui
@@ -34,14 +34,14 @@
    <item row="1" column="2">
     <widget class="QPushButton" name="m_ButtonSave">
      <property name="text">
-      <string>&amp;Save</string>
+      <string>Save</string>
      </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="m_ButtonBrowser">
      <property name="text">
-      <string>&amp;Open in External Browser</string>
+      <string>Open in External Browser</string>
      </property>
     </widget>
    </item>
diff --git a/src/gui/configureoptionsdialog.cpp b/src/gui/configureoptionsdialog.cpp
index b7d0aec..85c1a29 100644
--- a/src/gui/configureoptionsdialog.cpp
+++ b/src/gui/configureoptionsdialog.cpp
@@ -72,10 +72,10 @@ ConfigureOptionsDialog::ConfigureOptionsDialog(QWidget* parent, const QString& n
 
 	KPageWidgetItem* item = NULL;
 
-	item = addPage(&generalPageWidget(), i18n("General"), QString(), i18n("General Settings"));
+	item = addPage(&generalPageWidget(), i18nc("@title:tab general application settings", "General"), QString(), i18n("General Settings"));
 	item->setIcon(KIcon(DesktopIcon("configure")));
 
-	item = addPage(&fileSystemColorsPageWidget(), i18n("File System Colors"), QString(), i18n("File System Color Settings"));
+	item = addPage(&fileSystemColorsPageWidget(), i18nc("@title:tab", "File System Colors"), QString(), i18n("File System Color Settings"));
 	item->setIcon(KIcon(DesktopIcon("format-fill-color")));
 
 	restoreDialogSize(KConfigGroup(KGlobal::config(), "configureOptionsDialog"));
diff --git a/src/gui/editmountpointdialog.cpp b/src/gui/editmountpointdialog.cpp
index 03782c9..d2be9d9 100644
--- a/src/gui/editmountpointdialog.cpp
+++ b/src/gui/editmountpointdialog.cpp
@@ -33,7 +33,7 @@ EditMountPointDialog::EditMountPointDialog(QWidget* parent, Partition& p) :
 	m_DialogWidget(new EditMountPointDialogWidget(this, partition()))
 {
 	setMainWidget(&widget());
-	setCaption(i18nc("@title:window", "Edit mount point for %1", p.deviceNode()));
+	setCaption(i18nc("@title:window", "Edit mount point for <filename>%1</filename>", p.deviceNode()));
 
 	restoreDialogSize(KConfigGroup(KGlobal::config(), "editMountPointDialog"));
 }
diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp
index f859a32..ffd43e8 100644
--- a/src/gui/editmountpointdialogwidget.cpp
+++ b/src/gui/editmountpointdialogwidget.cpp
@@ -331,7 +331,7 @@ bool EditMountPointDialogWidget::writeMountpoints(const QString& filename)
 	if (!rval)
 		KMessageBox::sorry(this,
 				i18nc("@info", "Could not save mount points to file <filename>%1</filename>.", filename),
-				i18nc("@title:window", "Error while saving mount points"));
+				i18nc("@title:window", "Error While Saving Mount Points"));
 
 	return rval;
 }
diff --git a/src/gui/filesystemsupportdialogwidgetbase.ui b/src/gui/filesystemsupportdialogwidgetbase.ui
index 7eca764..25e67d6 100644
--- a/src/gui/filesystemsupportdialogwidgetbase.ui
+++ b/src/gui/filesystemsupportdialogwidgetbase.ui
@@ -127,7 +127,7 @@ Some file systems need external tools to be installed for them to be supported.
      <item>
       <widget class="KPushButton" name="m_ButtonRescan">
        <property name="text">
-        <string comment="@action:button">&amp;Rescan Support</string>
+        <string comment="@action:button">Rescan Support</string>
        </property>
       </widget>
      </item>
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 8e5f6f9..2ae201e 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -727,7 +727,7 @@ void MainWindow::onImportPartitionTable()
 
 	if (!file.open(QFile::ReadOnly))
 	{
-		KMessageBox::error(this, i18nc("@info", "Could not open input file <filename>%1</filename>.", fileName), i18nc("@title:window", "Error Importing Partition Table"));
+		KMessageBox::error(this, i18nc("@info", "Could not open input file <filename>%1</filename> for import.", fileName), i18nc("@title:window", "Error Importing Partition Table"));
 		return;
 	}
 
@@ -750,7 +750,7 @@ void MainWindow::onImportPartitionTable()
 
 		if (!haveMagic && rxMagic.indexIn(line) == -1)
 		{
-			KMessageBox::error(this, i18nc("@info", "The file <filename>%1</filename> is not a valid partition table text file.", fileName), i18nc("@title:window", "Error While Importing Partition Table"));
+			KMessageBox::error(this, i18nc("@info", "The import file <filename>%1</filename> does not contain a valid partition table.", fileName), i18nc("@title:window", "Error While Importing Partition Table"));
 			return;
 		}
 		else
@@ -802,7 +802,7 @@ void MainWindow::onImportPartitionTable()
 
 			if (firstSector < ptable->firstUsable() || lastSector > ptable->lastUsable())
 			{
-				KMessageBox::error(this, i18nc("@info", "Partition %1 would be outside the device's boundaries (line %2).", num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
+				KMessageBox::error(this, i18nc("@info the partition is NOT a device path, just a number", "Partition %1 would be outside the device's boundaries (line %2).", num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
 				return;
 			}
 
@@ -830,13 +830,13 @@ void MainWindow::onImportPartitionTable()
 
 			if (role == PartitionRole(PartitionRole::None))
 			{
-				KMessageBox::error(this, i18nc("@info", "Unrecognized partition role \"%1\" for partition %2 (line %3).", roleNames, num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
+				KMessageBox::error(this, i18nc("@info the partition is NOT a device path, just a number", "Unrecognized partition role \"%1\" for partition %2 (line %3).", roleNames, num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
 				return;
 			}
 
 			if (parent == NULL)
 			{
-				KMessageBox::error(this, i18nc("@info", "No parent partition or partition table found for partition %1 (line %2).", num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
+				KMessageBox::error(this, i18nc("@info the partition is NOT a device path, just a number", "No parent partition or partition table found for partition %1 (line %2).", num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
 				return;
 			}
 
@@ -850,7 +850,7 @@ void MainWindow::onImportPartitionTable()
 
 			if (fs == NULL)
 			{
-				KMessageBox::error(this, i18nc("@info", "Could not create file system \"%1\" for partition %2 (line %3).", fsName, num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
+				KMessageBox::error(this, i18nc("@info the partition is NOT a device path, just a number", "Could not create file system \"%1\" for partition %2 (line %3).", fsName, num, lineNo), i18nc("@title:window", "Error While Importing Partition Table"));
 				return;
 			}
 
@@ -886,7 +886,7 @@ void MainWindow::onExportPartitionTable()
 
 	if (!file.open(QFile::WriteOnly | QFile::Truncate))
 	{
-		KMessageBox::error(this, i18nc("@info", "Could not create output file <filename>%1</filename>.", fileName), i18nc("@title:window", "Error Exporting Partition Table"));
+		KMessageBox::error(this, i18nc("@info", "Could not create output file <filename>%1</filename> for export.", fileName), i18nc("@title:window", "Error Exporting Partition Table"));
 		return;
 	}
 
diff --git a/src/gui/partpropswidgetbase.ui b/src/gui/partpropswidgetbase.ui
index 3adac24..6dc4c9d 100644
--- a/src/gui/partpropswidgetbase.ui
+++ b/src/gui/partpropswidgetbase.ui
@@ -30,7 +30,7 @@
    <item row="3" column="0">
     <widget class="QLabel" name="m_LabelTextLabel">
      <property name="text">
-      <string comment="@label">&amp;Label:</string>
+      <string comment="@label">Label:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -60,7 +60,7 @@
    <item row="5" column="0">
     <widget class="QLabel" name="m_LabelFileSystem">
      <property name="text">
-      <string comment="@label:listbox">File &amp;system:</string>
+      <string comment="@label:listbox">File system:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -264,7 +264,7 @@
    <item row="23" column="0">
     <widget class="QLabel" name="m_LabelTextFlags">
      <property name="text">
-      <string comment="@label">&amp;Flags:</string>
+      <string comment="@label">Flags:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
diff --git a/src/gui/sizedialogwidgetbase.ui b/src/gui/sizedialogwidgetbase.ui
index bc4d698..4e08127 100644
--- a/src/gui/sizedialogwidgetbase.ui
+++ b/src/gui/sizedialogwidgetbase.ui
@@ -54,7 +54,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string comment="@label:listbox">Partition &amp;type:</string>
+        <string comment="@label:listbox">Partition type:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -73,7 +73,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string comment="@label:listbox">File &amp;system:</string>
+        <string comment="@label:listbox">File system:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -148,7 +148,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string comment="@label:listbox">Free space &amp;before:</string>
+        <string comment="@label:listbox">Free space before:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -186,7 +186,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string comment="@label:listbox">S&amp;ize:</string>
+        <string comment="@label:listbox">Size:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -224,7 +224,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string comment="@label:listbox">Free space &amp;after:</string>
+        <string comment="@label:listbox">Free space after:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -258,21 +258,21 @@
        <item>
         <widget class="QRadioButton" name="m_RadioPrimary">
          <property name="text">
-          <string>&amp;Primary</string>
+          <string>Primary</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="m_RadioExtended">
          <property name="text">
-          <string>&amp;Extended</string>
+          <string>Extended</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QRadioButton" name="m_RadioLogical">
          <property name="text">
-          <string>&amp;Logical</string>
+          <string>Logical</string>
          </property>
         </widget>
        </item>
@@ -298,7 +298,7 @@
      <item row="3" column="0">
       <widget class="QLabel" name="m_LabelTextLabel">
        <property name="text">
-        <string comment="@label">&amp;Label:</string>
+        <string comment="@label">Label:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>