# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1398778003 -7200
# Node ID a097dd86cb4d5c209cb66fadc255e248602d7563
# Parent  ca583ffe728aaf0f5fd0118840ea290635676d6c# Parent  fd29ab9cadafedd8ce464d6692daf9dc18b2f379
merged.

diff -r fd29ab9cadaf -r a097dd86cb4d ui/createcertlistdialog.cpp
--- a/ui/createcertlistdialog.cpp	Tue Apr 29 15:06:47 2014 +0200
+++ b/ui/createcertlistdialog.cpp	Tue Apr 29 15:26:43 2014 +0200
@@ -62,8 +62,8 @@
     headerLayout->addWidget(headerSeparator);
     headerLayout->insertSpacing(3, 10);
 
-    QLabel *certLabel = new QLabel("Select signing key:");
-    QLabel *saveLabel = new QLabel("Select output folder:");
+    QLabel *certLabel = new QLabel(tr("Select signing key:"));
+    QLabel *saveLabel = new QLabel(tr("Select output folder:"));
     labelLayout->addWidget(certLabel);
     labelLayout->addWidget(saveLabel);
 
diff -r fd29ab9cadaf -r a097dd86cb4d ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Tue Apr 29 15:06:47 2014 +0200
+++ b/ui/mainwindow.cpp	Tue Apr 29 15:26:43 2014 +0200
@@ -318,16 +318,16 @@
     QMenu *mMenu = new QMenu(tr("Menu"), mMenuBar);
     mMenuBar->addMenu(mMenu);
     QAction *update = mMenu->addAction(tr("Force Update"));
-    QAction *settings = mMenu->addAction(tr("Settings"));
-    QAction *status = mMenu->addAction(tr("Statusdialog"));
+//    QAction *settings = mMenu->addAction(tr("Settings"));
+//    QAction *status = mMenu->addAction(tr("Statusdialog"));
     mMenu->addSeparator();
     QAction *help = mMenu->addAction(tr("Help"));
     QAction *about = mMenu->addAction(tr("About"));
     mMenu->addSeparator();
     QAction *quit = mMenu->addAction(tr("Quit"));
     connect(update, SIGNAL(triggered()), this, SLOT(checkUpdates()));
-    connect(settings, SIGNAL(triggered()), this, SLOT(showSettings()));
-    connect(status, SIGNAL(triggered()), this, SLOT(showStatus()));
+//    connect(settings, SIGNAL(triggered()), this, SLOT(showSettings()));
+//    connect(status, SIGNAL(triggered()), this, SLOT(showStatus()));
     connect(help, SIGNAL(triggered()), this, SLOT(showHelp()));
     connect(about, SIGNAL(triggered()), this, SLOT(showAbout()));
     connect(quit, SIGNAL(triggered()), this, SLOT(closeApp()));