From 77d35be6bd8debc0818761b9ee6235f9e23467f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 28 Apr 2011 23:00:40 +0200
Subject: Updated some text strings.


diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 737839f..c00c080 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -364,7 +364,7 @@ void MainController::handleInputIdleChanged(bool idle) {
 void MainController::handleLoginRequest(const std::string &username, const std::string &password, const std::string& certificateFile, bool remember, bool loginAutomatically) {
 	jid_ = JID(username);
 	if (!jid_.isValid() || jid_.getNode().empty()) {
-		loginWindow_->setMessage(QT_TRANSLATE_NOOP("", "Username not a valid format"));
+		loginWindow_->setMessage(QT_TRANSLATE_NOOP("", "User address invalid. User address should be of the form 'alice@wonderland.lit'"));
 		loginWindow_->setIsLoggingIn(false);
 	} else {
 		loginWindow_->setMessage("");
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 5262c38..0c959d6 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -108,7 +108,7 @@ QtMainWindow::QtMainWindow(QtSettingsProvider* settings, UIEventStream* uiEventS
 	chatUserAction_ = new QAction(tr("Start &Chat"), this);
 	connect(chatUserAction_, SIGNAL(triggered(bool)), this, SLOT(handleChatUserActionTriggered(bool)));
 	actionsMenu->addAction(chatUserAction_);
-	serverAdHocMenu_ = new QMenu("Server Commands", this);
+	serverAdHocMenu_ = new QMenu(tr("Run Server Command"), this);
 	actionsMenu->addMenu(serverAdHocMenu_);
 	actionsMenu->addSeparator();
 	QAction* signOutAction = new QAction(tr("&Sign Out"), this);
@@ -118,7 +118,7 @@ QtMainWindow::QtMainWindow(QtSettingsProvider* settings, UIEventStream* uiEventS
 	connect(treeWidget_, SIGNAL(onSomethingSelectedChanged(bool)), editUserAction_, SLOT(setEnabled(bool)));
 
 	setAvailableAdHocCommands(std::vector<DiscoItems::Item>());
-	QAction* adHocAction = new QAction("Populating commands..", this);
+	QAction* adHocAction = new QAction(tr("Collecting commands..."), this);
 	adHocAction->setEnabled(false);
 	serverAdHocMenu_->addAction(adHocAction);
 	serverAdHocCommandActions_.append(adHocAction);
@@ -248,7 +248,7 @@ void QtMainWindow::setAvailableAdHocCommands(const std::vector<DiscoItems::Item>
 		serverAdHocCommandActions_.append(action);
 	}
 	if (serverAdHocCommandActions_.isEmpty()) {
-		QAction* action = new QAction("No available commands", this);
+		QAction* action = new QAction(tr("No Available Commands"), this);
 		action->setEnabled(false);
 		serverAdHocMenu_->addAction(action);
 		serverAdHocCommandActions_.append(action);
diff --git a/Swift/Translations/swift_nl.ts b/Swift/Translations/swift_nl.ts
index 0683260..7e8bfbd 100644
--- a/Swift/Translations/swift_nl.ts
+++ b/Swift/Translations/swift_nl.ts
@@ -416,6 +416,22 @@
         <source>There was an error publishing your profile data</source>
         <translation>Er is een fout opgetreden bij het publiceren van uw profiel</translation>
     </message>
+    <message>
+        <source>%1% (%2%)</source>
+        <translation>%1% (%2%)</translation>
+    </message>
+    <message>
+        <source>%1% and %2% others (%3%)</source>
+        <translation>%1% en %2% anderen (%3%)</translation>
+    </message>
+    <message>
+        <source>%1%, %2% (%3%)</source>
+        <translation>%1%, %2% (%3%)</translation>
+    </message>
+    <message>
+        <source>User address invalid. User address should be of the form &apos;alice@wonderland.lit&apos;</source>
+        <translation>Gebruikersadres ongeldig. Gebruikersadres moet van de vorm &apos;alice@wonderland.lit&apos; zijn</translation>
+    </message>
 </context>
 <context>
     <name>CloseButton</name>
@@ -835,6 +851,10 @@
         <source>Bookmarked Rooms</source>
         <translation>Bladwijzers</translation>
     </message>
+    <message>
+        <source>Recent Chats</source>
+        <translation>Recente conversaties</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtAboutWidget</name>
@@ -866,6 +886,37 @@
     </message>
 </context>
 <context>
+    <name>Swift::QtAdHocCommandWindow</name>
+    <message>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <source>Back</source>
+        <translation>Terug</translation>
+    </message>
+    <message>
+        <source>Next</source>
+        <translation>Volgende</translation>
+    </message>
+    <message>
+        <source>Complete</source>
+        <translation>Voltooien</translation>
+    </message>
+    <message>
+        <source>Error: %1</source>
+        <translation>Fout: %1</translation>
+    </message>
+    <message>
+        <source>Warning: %1</source>
+        <translation>Waarschuwing: %1</translation>
+    </message>
+    <message>
+        <source>Error executing command</source>
+        <translation>Fout bij het uitvoeren van de opdracht</translation>
+    </message>
+</context>
+<context>
     <name>Swift::QtAvatarWidget</name>
     <message>
         <source>No picture</source>
@@ -1161,6 +1212,18 @@ afbeelding</translation>
         <source>Enter &amp;Room</source>
         <translation>&amp;Kamer betreden</translation>
     </message>
+    <message>
+        <source>Run Server Command</source>
+        <translation>Voer opdracht op server uit</translation>
+    </message>
+    <message>
+        <source>Collecting commands...</source>
+        <translation>Opdrachten aan het verzamelen...</translation>
+    </message>
+    <message>
+        <source>No Available Commands</source>
+        <translation>Geen beschikbare opdrachten</translation>
+    </message>
 </context>
 <context>
     <name>Swift::QtNameWidget</name>
-- 
cgit v0.10.2-6-g49f6