removed conflict

1 files changed, 5 insertions, 5 deletions

diff --git a/client/launcherwindow.cc b/client/launcherwindow.cc
index cea9b72..e939f00 100644
--- a/client/launcherwindow.cc
+++ b/client/launcherwindow.cc
@@ -34,10 +34,10 @@
 LauncherWindow::LauncherWindow(QString cpr, QString templ, QWidget *parent)
     : QDialog(parent)
 {
-    setWindowTitle("Pracro Starter");
+  setWindowTitle(tr("Pracro Launcher"));
     resize(250,80);
 /*
-    QLabel *userLabel = new QLabel("Brugernavn:");
+    QLabel *userLabel = new QLabel(tr("Username:"));
     QComboBox *user = new QComboBox();
     QFile file("users.txt");
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -48,7 +48,7 @@ LauncherWindow::LauncherWindow(QString cpr, QString templ, QWidget *parent)
         file.close();
     }
 */
-    QLabel *cprLabel = new QLabel("Patient CPR:");
+    QLabel *cprLabel = new QLabel(tr("Patient ID:"));
     cprLineEdit = new QLineEdit();
     cprLineEdit->setValidator(new QRegExpValidator(QRegExp("^[0-9]{10,10}$"), this));
 
@@ -61,9 +61,9 @@ LauncherWindow::LauncherWindow(QString cpr, QString templ, QWidget *parent)
     templates->addItem("Refraktiv kirurgi: Efterkontrol",
                        "ref_efterkontrol");
 
-    QPushButton *ok = new QPushButton("Ok");
+    QPushButton *ok = new QPushButton(tr("Accept"));
     connect(ok, SIGNAL(clicked()), this, SLOT(accept()));
-    QPushButton *cancel = new QPushButton("Annuller");
+    QPushButton *cancel = new QPushButton(tr("Cancel"));
     connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
 
     QGridLayout *layout = new QGridLayout();