Added support for internationalization

Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.

Conflicts:

	INSTALL
	configure.ac
	src/Makefile.am
	src/gui/buy.cpp
	src/gui/confirm_dialog.cpp
	src/gui/inventorywindow.cpp
	src/gui/login.cpp
	src/gui/menuwindow.cpp
	src/gui/minimap.cpp
	src/gui/ok_dialog.cpp
	src/gui/popupmenu.cpp
	src/gui/register.cpp
	src/gui/sell.cpp
	src/gui/setup.cpp
	src/gui/setup_video.cpp

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 26 insertions, 23 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c0feb68d..2b2eb625 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -43,6 +43,9 @@
 #include "../resources/itemdb.h"
 #include "../resources/iteminfo.h"
 
+#include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
 extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
@@ -75,35 +78,35 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 		// Players can be traded with. Later also attack, follow and
 		// add as buddy will be options in this menu.
 		const std::string &name = mBeing->getName();
-		mBrowserBox->addRow("@@trade|Trade With " + name + "@@");
-		mBrowserBox->addRow("@@attack|Attack " + name + "@@");
+		mBrowserBox->addRow(_("@@trade|Trade With ") + name + "@@");
+		mBrowserBox->addRow(_("@@attack|Attack ") + name + "@@");
 
 		mBrowserBox->addRow("##3---");
 
 		switch (player_relations.getRelation(name)) {
 		case PlayerRelation::NEUTRAL:
-		    mBrowserBox->addRow("@@friend|Befriend " + name + "@@");
+		    mBrowserBox->addRow(_("@@friend|Befriend ") + name + "@@");
 
 		case PlayerRelation::FRIEND:
-		    mBrowserBox->addRow("@@disregard|Disregard " + name + "@@");
-		    mBrowserBox->addRow("@@ignore|Ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@disregard|Disregard ") + name + "@@");
+		    mBrowserBox->addRow(_("@@ignore|Ignore ") + name + "@@");
 		    break;
 
 		case PlayerRelation::DISREGARDED:
-		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
-		    mBrowserBox->addRow("@@ignore|Completely ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
+		    mBrowserBox->addRow(_("@@ignore|Completely ignore ") + name + "@@");
 		    break;
 
 		case PlayerRelation::IGNORED:
-		    mBrowserBox->addRow("@@unignore|Un-Ignore " + name + "@@");
+		    mBrowserBox->addRow(_("@@unignore|Un-Ignore ") + name + "@@");
 		    break;
 		}
 
-		//mBrowserBox->addRow("@@follow|Follow " + name + "@@");
-		//mBrowserBox->addRow("@@buddy|Add " + name + " to Buddy List@@");
+		//mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
+		//mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
 
 		mBrowserBox->addRow("##3---");
-		mBrowserBox->addRow("@@party-invite|Invite " + name +
+		mBrowserBox->addRow(_("@@party-invite|Invite ") + name +
 				    " to party@@");
 	    }
 	    break;
@@ -111,7 +114,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 	case Being::NPC:
 	    // NPCs can be talked to (single option, candidate for removal
 	    // unless more options would be added)
-	    mBrowserBox->addRow("@@talk|Talk To NPC@@");
+	    mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
 	    break;
 
 	default:
@@ -121,7 +124,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -133,11 +136,11 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
     // Floor item can be picked up (single option, candidate for removal)
     std::string name = ItemDB::get(mFloorItem->getItemId()).getName();
-    mBrowserBox->addRow("@@pickup|Pick Up " + name + "@@");
+    mBrowserBox->addRow(strprintf(_("@@pickup|Pick Up %s@@"), name.c_str()));
 
     //browserBox->addRow("@@look|Look To@@");
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }
@@ -285,18 +288,18 @@ void PopupMenu::showPopup(int x, int y, Item *item)
 
     if (item->isEquipment())
     {
-	if (item->isEquipped())
-	    mBrowserBox->addRow("@@use|Unequip@@");
-	else
-	    mBrowserBox->addRow("@@use|Equip@@");
+        if (item->isEquipped())
+            mBrowserBox->addRow(_("@@use|Unequip@@"));
+        else
+            mBrowserBox->addRow(_("@@use|Equip@@"));
     }
     else
-	mBrowserBox->addRow("@@use|Use@@");
+        mBrowserBox->addRow(_("@@use|Use@@"));
 
-    mBrowserBox->addRow("@@drop|Drop@@");
-    mBrowserBox->addRow("@@description|Description@@");
+    mBrowserBox->addRow(_("@@drop|Drop@@"));
+    mBrowserBox->addRow(_("@@description|Description@@"));
     mBrowserBox->addRow("##3---");
-    mBrowserBox->addRow("@@cancel|Cancel@@");
+    mBrowserBox->addRow(_("@@cancel|Cancel@@"));
 
     showPopup(x, y);
 }