diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index e9362003d..8811f2f81 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -235,7 +235,7 @@ void GameSettingsScreen::CreateViews() {
 	graphicsSettings->Add(new PopupMultiChoice(&g_Config.iFrameSkip, gs->T("Frame Skipping"), frameSkip, 0, 9, gs, screenManager()));
 	static const char *fpsChoices[] = {"None", "Speed", "FPS", "Both"};
 
-	graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Force <=60 FPS (helps GoW)")));
+	graphicsSettings->Add(new CheckBox(&cap60FPS_, gs->T("Force max 60 FPS (helps GoW)")));
 	static const char *customSpeed[] = {"Unlimited", "25%", "50%", "75%", "100%", "125%", "150%", "200%", "300%"};
 	graphicsSettings->Add(new PopupMultiChoice(&iAlternateSpeedPercent_, gs->T("Alternative Speed"), customSpeed, 0, 9, gs, screenManager()));
 
@@ -351,7 +351,7 @@ void GameSettingsScreen::CreateViews() {
 	LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
 	systemSettings->SetSpacing(0);
 	systemSettings->Add(new ItemHeader(g->T("General")));
-	systemSettings->Add(new CheckBox(&enableReports_, s->T("Enable Compatibility Server Reports")));
+	systemSettings->Add(new Choice(s->T("System Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
 #ifndef ANDROID
 	// Need to move the cheat config dir somewhere where it can be read/written on android
 	systemSettings->Add(new CheckBox(&g_Config.bEnableCheats, s->T("Enable Cheats")));
@@ -366,7 +366,7 @@ void GameSettingsScreen::CreateViews() {
 #ifdef _WIN32
 	systemSettings->Add(new Choice(s->T("Change Nickname")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeNickname);
 #endif
-	systemSettings->Add(new Choice(s->T("System Language", "Language")))->OnClick.Handle(this, &GameSettingsScreen::OnLanguage);
+	systemSettings->Add(new CheckBox(&enableReports_, s->T("Enable Compatibility Server Reports")));
 	systemSettings->Add(new Choice(s->T("Developer Tools")))->OnClick.Handle(this, &GameSettingsScreen::OnDeveloperTools);
 
 
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 2bed6d817..0aea95324 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -355,12 +355,13 @@ void GameBrowser::Refresh() {
 	Clear();
 
 	Add(new Spacer(5.0f));
+	I18NCategory *m = GetI18NCategory("MainMenu");
 
 	if (allowBrowsing_) {
 		LinearLayout *topBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
 		topBar->Add(new TextView(path_.GetFriendlyPath().c_str(), ALIGN_VCENTER, 0.7f, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 1.0f)));
 #ifdef ANDROID
-		topBar->Add(new Choice("Home"))->OnClick.Handle(this, &GameBrowser::HomeClick);
+		topBar->Add(new Choice(m->T("Home")))->OnClick.Handle(this, &GameBrowser::HomeClick);
 #endif
 		ChoiceStrip *layoutChoice = topBar->Add(new ChoiceStrip(ORIENT_HORIZONTAL));
 		layoutChoice->AddChoice(I_GRID);
diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
index e168d2966..fc247b069 100644
--- a/UI/MiscScreens.cpp
+++ b/UI/MiscScreens.cpp
@@ -179,25 +179,30 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") {
 #endif
 	langValuesMapping = GetLangValuesMapping();
 
+	std::vector<FileInfo> tempLangs;
 #ifdef ANDROID
-	VFSGetFileListing("assets/lang", &langs_, "ini");
+	VFSGetFileListing("assets/lang", &tempLangs, "ini");
 #else
-	VFSGetFileListing("lang", &langs_, "ini");
+	VFSGetFileListing("lang", &tempLangs, "ini");
 #endif
 	std::vector<std::string> listing;
 	int selected = -1;
-	for (size_t i = 0; i < langs_.size(); i++) {
+	int counter = 0;
+	for (size_t i = 0; i < tempLangs.size(); i++) {
 		// Skip README
-		if (langs_[i].name.find("README") != std::string::npos) {
+		if (tempLangs[i].name.find("README") != std::string::npos) {
 			continue;
 		}
 
-		std::string code;
-		size_t dot = langs_[i].name.find('.');
-		if (dot != std::string::npos)
-			code = langs_[i].name.substr(0, dot);
+		FileInfo lang = tempLangs[i];
+		langs_.push_back(lang);
 
-		std::string buttonTitle = langs_[i].name;
+		std::string code;
+		size_t dot = lang.name.find('.');
+		if (dot != std::string::npos)
+			code = lang.name.substr(0, dot);
+
+		std::string buttonTitle = lang.name;
 
 		if (!code.empty()) {
 			if (langValuesMapping.find(code) == langValuesMapping.end()) {
@@ -208,8 +213,9 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") {
 			}
 		}
 		if (g_Config.languageIni == code)
-			selected = (int)i;
+			selected = counter;
 		listing.push_back(buttonTitle);
+		counter++;
 	}
 
 	adaptor_ = UI::StringVectorListAdaptor(listing, selected);
diff --git a/lang b/lang
index 642cf6c14..e03a5a7fe 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit 642cf6c141b49c7b453ddaa82f4e0b08a47a3101
+Subproject commit e03a5a7fee7661d8d1949398c302770517d997ad