Merge branch 'master' of github.com:ola-ct/Qt-SESAM

607011 · Feb 10, 2016 · 045dbed · 045dbed
2 parents 9307706 + 2174598
commit 045dbed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Qt-SESAM/mainwindow.cpp b/Qt-SESAM/mainwindow.cpp
@@ -386,7 +386,7 @@ MainWindow::MainWindow(bool forceStart, QWidget *parent)
   ui->attachmentTableWidget->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
   d->attachmentsContextMenu = new QMenu(ui->attachmentTableWidget);
   d->actionAttachFile = new QAction(QIcon(":/images/filenew.png"),
-                                    tr("Attach file ..."),
+                                    tr("Attach files ..."),
                                     d->attachmentsContextMenu);
   d->attachmentsContextMenu->addAction(d->actionAttachFile);
   d->attachmentsContextMenu->addSeparator();
@@ -395,7 +395,7 @@ MainWindow::MainWindow(bool forceStart, QWidget *parent)
                                         d->attachmentsContextMenu);
   d->attachmentsContextMenu->addAction(d->actionSaveAttachment);
   d->actionDeleteAttachment = new QAction(QIcon(":/images/remove.png"),
-                                          tr("Delete attachment"),
+                                          tr("Delete attachments"),
                                           d->attachmentsContextMenu);
   d->attachmentsContextMenu->addAction(d->actionDeleteAttachment);
   QObject::connect(ui->addAttachmentPushButton, SIGNAL(clicked(bool)), SLOT(onAttachFile()));

diff --git a/Qt-SESAM/optionsdialog.ui b/Qt-SESAM/optionsdialog.ui
@@ -516,10 +516,6 @@
         </spacer>
        </item>
       </layout>
-      <zorder>writeBackupsCheckBox</zorder>
-      <zorder></zorder>
-      <zorder>extensiveWipeoutCheckBox</zorder>
-      <zorder>verticalSpacer_3</zorder>
      </widget>
      <widget class="QWidget" name="tabMisc">
       <attribute name="title">

diff --git a/Qt-SESAM/translations/QtSESAM_de.ts b/Qt-SESAM/translations/QtSESAM_de.ts
@@ -1262,7 +1262,7 @@ in %1 Thread%2 ...</translation>
     </message>
     <message>
         <source>Attach file ...</source>
-        <translation>Datei anhängen ...</translation>
+        <translation type="vanished">Datei anhängen ...</translation>
     </message>
     <message>
         <source>Attach files</source>
@@ -1274,15 +1274,15 @@ in %1 Thread%2 ...</translation>
     </message>
     <message>
         <source>Attach files ...</source>
-        <translation type="vanished">Dateien anhängen ...</translation>
+        <translation>Dateien anhängen ...</translation>
     </message>
     <message>
         <source>Save attachment as ...</source>
         <translation>Anhang speichern unter ...</translation>
     </message>
     <message>
         <source>Delete attachment</source>
-        <translation>Anhang entfernen</translation>
+        <translation type="vanished">Anhang entfernen</translation>
     </message>
     <message>
         <source>Filename</source>
@@ -1332,6 +1332,10 @@ in %1 Thread%2 ...</translation>
         <source>Add file</source>
         <translation>Datei hinzufügen</translation>
     </message>
+    <message>
+        <source>Delete attachments</source>
+        <translation>Anhänge löschen</translation>
+    </message>
 </context>
 <context>
     <name>MasterPasswordDialog</name>