6 files changed, 6 insertions, 6 deletions
diff --git a/Swift/QtUI/QtAffiliationEditor.ui b/Swift/QtUI/QtAffiliationEditor.ui
index 1447884..0a9b7bf 100644
--- a/Swift/QtUI/QtAffiliationEditor.ui
+++ b/Swift/QtUI/QtAffiliationEditor.ui
@@ -2,25 +2,25 @@
 <ui version="4.0">
  <class>QtAffiliationEditor</class>
  <widget class="QDialog" name="QtAffiliationEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>575</width>
     <height>466</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Edit Affiliations</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QLabel" name="label">
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 314e36c..e345f73 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -651,25 +651,25 @@ void QtChatWindow::setFileTransferProgress(std::string id, const int percentageD
 void QtChatWindow::setFileTransferStatus(std::string id, const FileTransferState state, const std::string& msg) {
 	messageLog_->setFileTransferStatus(QString::fromStdString(id), state, QString::fromStdString(msg));
 }
 
 std::string QtChatWindow::addWhiteboardRequest(bool senderIsSelf) {
 	QString wb_id = QString("wb%1").arg(P2QSTRING(boost::lexical_cast<std::string>(idCounter_++)));
 	QString htmlString;
 	if (senderIsSelf) {
 		htmlString = "<div id='" + wb_id + "'>" + tr("Starting whiteboard chat") + "<br />"+
 				buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +
 			"</div>";
 	} else {
-		htmlString = "<div id='" + wb_id + "'>" + Qt::escape(contact_) + tr(" would like to start whiteboard chat") + ": <br/>" +
+		htmlString = "<div id='" + wb_id + "'>" + tr("%1 would like to start a whiteboard chat").arg(Qt::escape(contact_)) + ": <br/>" +
 				buildChatWindowButton(tr("Cancel"), ButtonWhiteboardSessionCancel, wb_id) +
 				buildChatWindowButton(tr("Accept"), ButtonWhiteboardSessionAcceptRequest, wb_id) +
 			"</div>";
 	}
 
 	if (lastLineTracker_.getShouldMoveLastLine()) {
 		/* should this be queued? */
 		messageLog_->addLastSeenLine();
 		/* if the line is added we should break the snippet */
 //		appendToPrevious = false;
 	}
 	QString qAvatarPath = "qrc:/icons/avatar.png";
diff --git a/Swift/QtUI/QtConnectionSettings.ui b/Swift/QtUI/QtConnectionSettings.ui
index 4086cba..ee5061f 100644
--- a/Swift/QtUI/QtConnectionSettings.ui
+++ b/Swift/QtUI/QtConnectionSettings.ui
@@ -2,25 +2,25 @@
 <ui version="4.0">
  <class>QtConnectionSettings</class>
  <widget class="QDialog" name="QtConnectionSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>406</width>
     <height>434</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Connection Options</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
         <string>Connection Method:</string>
        </property>
       </widget>
      </item>
      <item>
diff --git a/Swift/QtUI/QtHistoryWindow.ui b/Swift/QtUI/QtHistoryWindow.ui
index 77d592f..71a4577 100644
--- a/Swift/QtUI/QtHistoryWindow.ui
+++ b/Swift/QtUI/QtHistoryWindow.ui
@@ -2,25 +2,25 @@
 <ui version="4.0">
  <class>QtHistoryWindow</class>
  <widget class="QWidget" name="QtHistoryWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>608</width>
     <height>522</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>History</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="topLayout_">
      <item>
       <widget class="QLabel" name="label_">
        <property name="text">
         <string>Search:</string>
        </property>
       </widget>
      </item>
      <item>
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index c8b40a4..52956bf 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -130,25 +130,25 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream, SettingsProvider* set
 	certificateButton_->setWhatsThis(tr("Click if you have a personal certificate used for login to the service."));
 
 	credentialsLayout->addWidget(certificateButton_);
 	connect(certificateButton_, SIGNAL(clicked(bool)), SLOT(handleCertficateChecked(bool)));
 
 	loginButton_ = new QPushButton(this);
 	loginButton_->setText(tr("Connect"));
 	loginButton_->setAutoDefault(true);
 	loginButton_->setDefault(true);
 	layout->addWidget(loginButton_);
 
 	QLabel* connectionOptionsLabel = new QLabel(this);
-	connectionOptionsLabel->setText("<a href=\"#\"><font size='-1'>Connection Options</font></a>");
+	connectionOptionsLabel->setText("<a href=\"#\"><font size='-1'>" + QObject::tr("Connection Options") + "</font></a>");
 	connectionOptionsLabel->setTextFormat(Qt::RichText);
 	connectionOptionsLabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
 	layout->addWidget(connectionOptionsLabel);
 	connect(connectionOptionsLabel, SIGNAL(linkActivated(const QString&)), SLOT(handleOpenConnectionOptions()));
 
 	message_ = new QLabel(this);
 	message_->setTextFormat(Qt::RichText);
 	message_->setWordWrap(true);
 	layout->addWidget(message_);
 
 	layout->addStretch(2);
 	remember_ = new QCheckBox(tr("Remember Password?"), this);
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 392eed9..cb283bb 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -249,25 +249,25 @@ for lang in translation_languages :
 	translation_sources.append(env.File(translation_source).abspath)
 	translation_modules.append(env.File(translation_resource).abspath)
 	myenv.Qm(translation_resource, translation_source)
 	commonResources["translations"] = commonResources.get("translations", []) + [translation_resource]
 
 # LUpdate translation (if requested)
 if ARGUMENTS.get("update_translations", False) :
 	myenv.Precious(translation_sources)
 	remove_obsolete_option = ""
 	if ARGUMENTS.get("remove_obsolete_translations", False) :
 		remove_obsolete_option = " -no-obsolete"
 	for translation_source in filter(lambda x: not x.endswith("_en.ts"), translation_sources) :
-		t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent -no-ui-lines -codecfortr utf-8 -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")])
+		t = myenv.Command([translation_source], [], [myenv.Action("$QT4_LUPDATE -I " + env.Dir("#").abspath + remove_obsolete_option + " -silent -codecfortr utf-8 -recursive Swift -ts " + translation_source, cmdstr = "$QT4_LUPDATECOMSTR")])
 		myenv.AlwaysBuild(t)
 
 # NSIS installation script
 if env["PLATFORM"] == "win32" :
 	nsis_translation_install_script = ""
 	nsis_translation_uninstall_script = ""
 	for lang in translation_languages :
 		nsis_translation_install_script += "File \"..\\..\\QtUI\\Swift\\translations\\swift_" + lang + ".qm\"\n"
 		nsis_translation_uninstall_script += "delete $INSTDIR\\translations\\swift_" + lang + ".qm\n"
 	myenv.WriteVal("../Packaging/nsis/translations-install.nsh", myenv.Value(nsis_translation_install_script))
 	myenv.WriteVal("../Packaging/nsis/translations-uninstall.nsh", myenv.Value(nsis_translation_uninstall_script))