Fixed a few strings for better translation

Just a few notes that would help us translators immensly:
  * Please do not split one sentence into several strings
  * Please try to refrain from inserting extra spaces into the strings

(cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)

6 files changed, 46 insertions, 29 deletions

diff --git a/src/net/tmwserv/chathandler.cpp b/src/net/tmwserv/chathandler.cpp
index 41dc7bee..e2d09534 100644
--- a/src/net/tmwserv/chathandler.cpp
+++ b/src/net/tmwserv/chathandler.cpp
@@ -43,11 +43,12 @@
 #include "gui/chat.h"
 #include "gui/guildwindow.h"
 
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
 #include <string>
 #include <iostream>
 
-#include "utils/gettext.h"
-
 extern Being *player_node;
 
 Net::ChatHandler *chatHandler;
@@ -154,7 +155,7 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
         Channel *channel = new Channel(channelId, channelName, announcement);
         channelManager->addChannel(channel);
         ChatTab *tab = channel->getTab();
-        tab->chatLog(_("Topic: ") + announcement, BY_CHANNEL);
+        tab->chatLog(strprintf(_("Topic: %s"), announcement.c_str()), BY_CHANNEL);
 
         std::string user;
         std::string userModes;
@@ -175,13 +176,13 @@ void ChatHandler::handleEnterChannelResponse(MessageIn &msg)
     }
     else
     {
-        localChatTab->chatLog("Error joining channel", BY_SERVER);
+        localChatTab->chatLog("Error joining channel.", BY_SERVER);
     }
 }
 
 void ChatHandler::handleListChannelsResponse(MessageIn &msg)
 {
-    localChatTab->chatLog("Listing Channels", BY_SERVER);
+    localChatTab->chatLog("Listing channels", BY_SERVER);
     while(msg.getUnreadLength())
     {
         std::string channelName = msg.readString();
@@ -193,7 +194,7 @@ void ChatHandler::handleListChannelsResponse(MessageIn &msg)
         channelName += numUsers.str();
         localChatTab->chatLog(channelName, BY_SERVER);
     }
-    localChatTab->chatLog("End of channel list", BY_SERVER);
+    localChatTab->chatLog("End of channel list.", BY_SERVER);
 }
 
 void ChatHandler::handlePrivateMessage(MessageIn &msg)
diff --git a/src/net/tmwserv/guildhandler.cpp b/src/net/tmwserv/guildhandler.cpp
index 92057e6e..8d078740 100644
--- a/src/net/tmwserv/guildhandler.cpp
+++ b/src/net/tmwserv/guildhandler.cpp
@@ -37,6 +37,9 @@
 #include "channel.h"
 #include "channelmanager.h"
 
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
 #include <iostream>
 
 namespace TmwServ {
@@ -68,12 +71,12 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if(msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge guild was created
-                localChatTab->chatLog("Guild created.");
+                localChatTab->chatLog(_("Guild created."));
                 joinedGuild(msg);
             }
             else
             {
-                localChatTab->chatLog("Error creating guild.");
+                localChatTab->chatLog(_("Error creating guild."));
             }
         } break;
 
@@ -83,7 +86,7 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if(msg.readInt8() == ERRMSG_OK)
             {
                 // TODO - Acknowledge invite was sent
-                localChatTab->chatLog("Invite sent.");
+                localChatTab->chatLog(_("Invite sent."));
             }
         } break;
 
@@ -144,7 +147,8 @@ void GuildHandler::handleMessage(MessageIn &msg)
                 {
                     case GUILD_EVENT_NEW_PLAYER:
                         guild->addMember(guildMember);
-                        guildWindow->setOnline(guild->getName(), guildMember, true);
+                        guildWindow->setOnline(guild->getName(), guildMember,
+                                               true);
                         break;
 
                     case GUILD_EVENT_LEAVING_PLAYER:
@@ -152,11 +156,13 @@ void GuildHandler::handleMessage(MessageIn &msg)
                         break;
 
                     case GUILD_EVENT_ONLINE_PLAYER:
-                        guildWindow->setOnline(guild->getName(), guildMember, true);
+                        guildWindow->setOnline(guild->getName(), guildMember,
+                                               true);
                         break;
 
                     case GUILD_EVENT_OFFLINE_PLAYER:
-                        guildWindow->setOnline(guild->getName(), guildMember, false);
+                        guildWindow->setOnline(guild->getName(), guildMember,
+                                               false);
                         break;
 
                     default:
@@ -185,12 +191,12 @@ void GuildHandler::handleMessage(MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 // promotion succeeded
-                localChatTab->chatLog("Member was promoted successfully");
+                localChatTab->chatLog(_("Member was promoted successfully."));
             }
             else
             {
                 // promotion failed
-                localChatTab->chatLog("Failed to promote member");
+                localChatTab->chatLog(_("Failed to promote member."));
             }
         }
 
@@ -241,7 +247,8 @@ void GuildHandler::joinedGuild(MessageIn &msg)
     // COMMENT: Should this go here??
     Channel *channel = new Channel(channelId, guildName, announcement);
     channelManager->addChannel(channel);
-    channel->getTab()->chatLog("Topic: " + announcement, BY_CHANNEL);
+    channel->getTab()->chatLog(strprintf(_("Topic: %s"), announcement.c_str()),
+                               BY_CHANNEL);
 }
 
 } // namespace TmwServ
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index 47ef791c..557a3a43 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -35,6 +35,9 @@
 #include "log.h"
 #include "localplayer.h"
 
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
 #include <iostream>
 
 Net::PartyHandler *partyHandler;
@@ -80,7 +83,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
             if (msg.readInt8() == ERRMSG_OK)
             {
                 player_node->setInParty(true);
-                localChatTab->chatLog("Joined party");
+                localChatTab->chatLog(_("Joined party."));
             }
         }
 
@@ -97,7 +100,8 @@ void PartyHandler::handleMessage(MessageIn &msg)
             int id = msg.readInt16(); // being id
             std::string name = msg.readString();
 
-            localChatTab->chatLog(name + " joined the party");
+            localChatTab->chatLog(strprintf(_("%s joined the "
+                    "party."), name.c_str()));
 
             if (!player_node->isInParty())
                 player_node->setInParty(true);
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index b697e8a8..931e4294 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -284,7 +284,7 @@ void PlayerHandler::handleMessage(MessageIn &msg)
 
                 switch (type) {
                     case 0:
-                        localChatTab->chatLog("Equip arrows first",
+                        localChatTab->chatLog(_("Equip arrows first."),
                                              BY_SERVER);
                         break;
                     default:
@@ -391,12 +391,12 @@ void PlayerHandler::respawn()
     // TODO
 }
 
-void PlayerHandler::ingorePlayer(const std::string &player, bool ignore)
+void PlayerHandler::ignorePlayer(const std::string &player, bool ignore)
 {
     // TODO
 }
 
-void PlayerHandler::ingoreAll(bool ignore)
+void PlayerHandler::ignoreAll(bool ignore)
 {
     // TODO
 }
diff --git a/src/net/tmwserv/playerhandler.h b/src/net/tmwserv/playerhandler.h
index 5524415e..13ae8f39 100644
--- a/src/net/tmwserv/playerhandler.h
+++ b/src/net/tmwserv/playerhandler.h
@@ -52,9 +52,9 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
 
         void respawn();
 
-        void ingorePlayer(const std::string &player, bool ignore);
+        void ignorePlayer(const std::string &player, bool ignore);
 
-        void ingoreAll(bool ignore);
+        void ignoreAll(bool ignore);
 
     private:
         void handleMapChangeMessage(MessageIn &msg);
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 74789a34..aabd8b2a 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -40,6 +40,9 @@
 
 #include "gui/widgets/chattab.h"
 
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
 std::string tradePartnerName;
 int tradePartnerID;
 
@@ -87,9 +90,9 @@ void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
 {
     mAcceptTradeRequests = acceptTradeRequests;
     if (mAcceptTradeRequests) {
-        localChatTab->chatLog("Accepting incoming trade requests", BY_SERVER);
+        localChatTab->chatLog(_("Accepting incoming trade requests."), BY_SERVER);
     } else {
-        localChatTab->chatLog("Ignoring incoming trade requests", BY_SERVER);
+        localChatTab->chatLog(_("Ignoring incoming trade requests."), BY_SERVER);
     }
 }
 
@@ -108,8 +111,9 @@ void TradeHandler::handleMessage(MessageIn &msg)
             player_node->setTrading(true);
             tradePartnerName = being->getName();
             tradePartnerID = being->getId();
-            ConfirmDialog *dlg = new ConfirmDialog("Request for trade",
-                tradePartnerName + " wants to trade with you, do you accept?");
+            ConfirmDialog *dlg = new ConfirmDialog(_("Request for Trade"),
+                    strprintf(_("%s wants to trade with you, do you accept?"),
+                            tradePartnerName.c_str()));
             dlg->addActionListener(&listener);
         }   break;
 
@@ -126,7 +130,8 @@ void TradeHandler::handleMessage(MessageIn &msg)
 
         case GPMSG_TRADE_START:
             tradeWindow->reset();
-            tradeWindow->setCaption("Trading with " + tradePartnerName);
+            tradeWindow->setCaption(strprintf(_("Trading with %s"),
+                                              tradePartnerName.c_str()));
             tradeWindow->setVisible(true);
             break;
 
@@ -139,14 +144,14 @@ void TradeHandler::handleMessage(MessageIn &msg)
             break;
             
         case GPMSG_TRADE_CANCEL:
-            localChatTab->chatLog("Trade canceled.", BY_SERVER);
+            localChatTab->chatLog(_("Trade canceled."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);
             break;
 
         case GPMSG_TRADE_COMPLETE:
-            localChatTab->chatLog("Trade completed.", BY_SERVER);
+            localChatTab->chatLog(_("Trade completed."), BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);