Merge branch 'master' into strippedstripped1.1.11.12

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/focushandler.cpp
	src/guichan/graphics.cpp
	src/guichan/gui.cpp
	src/guichan/image.cpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/sdl/sdlgraphics.cpp
	src/guichan/sdl/sdlimage.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/icon.cpp
	src/guichan/widgets/imagebutton.cpp
	src/guichan/widgets/listbox.cpp
	src/guichan/widgets/scrollarea.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textbox.cpp
	src/guichan/widgets/window.cpp

1 files changed, 9 insertions, 2 deletions

diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index c803cc296..1ff159195 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -30,10 +30,11 @@
 
 #include <guichan/actionlistener.hpp>
 
+class DropDown;
+class EditDialog;
 class FontsModel;
 class FontSizeChoiceListModel;
-class EditDialog;
-class DropDown;
+class LangListModel;
 class ThemesModel;
 
 class Setup_Theme : public SetupTab
@@ -58,6 +59,12 @@ class Setup_Theme : public SetupTab
         DropDown *mFontDropDown;
         std::string mFont;
 
+        LangListModel *mLangListModel;
+
+        gcn::Label *mLangLabel;
+        DropDown *mLangDropDown;
+        std::string mLang;
+
         gcn::Label *mBoldFontLabel;
         DropDown *mBoldFontDropDown;
         std::string mBoldFont;