diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp index 566a30d5b..cd3bd0b6f 100644 --- a/source/glest_game/main/battle_end.cpp +++ b/source/glest_game/main/battle_end.cpp @@ -679,7 +679,7 @@ void BattleEnd::render() { } } - textRenderer->render("\n"+(lang.get("left at")), lm, bm+400); + textRenderer->render("\n"+(lang.get("LeftAt")), lm, bm+400); textRenderer->render(lang.get("Result"), lm, bm+360); textRenderer->render(lang.get("Control"), lm, bm+320); textRenderer->render(lang.get("Faction"), lm, bm+280); diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp index 2f6147abc..932dda929 100644 --- a/source/glest_game/menu/menu_state_connected_game.cpp +++ b/source/glest_game/menu/menu_state_connected_game.cpp @@ -420,7 +420,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM // write hint to console: Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); - console.addLine(lang.get("To switch off music press") + " - \"" + configKeys.getString("ToggleMusic") + "\""); + console.addLine(lang.get("ToSwitchOffMusicPress") + " - \"" + configKeys.getString("ToggleMusic") + "\""); chatManager.init(&console, -1,true); GraphicComponent::applyAllCustomProperties(containerName); diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index 26383bfbc..4b890ffa0 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -678,7 +678,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, // write hint to console: Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); - console.addLine(lang.get("To switch off music press") + " - \"" + configKeys.getString("ToggleMusic") + "\""); + console.addLine(lang.get("ToSwitchOffMusicPress") + " - \"" + configKeys.getString("ToggleMusic") + "\""); chatManager.init(&console, -1,true); @@ -884,7 +884,7 @@ void MenuStateCustomGame::reloadUI() { // write hint to console: Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); - console.addLine(lang.get("To switch off music press") + " - \"" + configKeys.getString("ToggleMusic") + "\""); + console.addLine(lang.get("ToSwitchOffMusicPress") + " - \"" + configKeys.getString("ToggleMusic") + "\""); chatManager.init(&console, -1,true); diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp index 27b00301d..09a53391e 100644 --- a/source/glest_game/menu/menu_state_masterserver.cpp +++ b/source/glest_game/menu/menu_state_masterserver.cpp @@ -245,7 +245,7 @@ MenuStateMasterserver::MenuStateMasterserver(Program *program, MainMenu *mainMen NetworkManager::getInstance().end(); NetworkManager::getInstance().init(nrClient); - //console.addLine(lang.get("To switch off music press")+" - \""+configKeys.getCharKey("ToggleMusic")+"\""); + //console.addLine(lang.get("ToSwitchOffMusicPress")+" - \""+configKeys.getCharKey("ToggleMusic")+"\""); GraphicComponent::applyAllCustomProperties(containerName); @@ -912,7 +912,7 @@ void MenuStateMasterserver::simpleTask(BaseThread *callingThread) { consoleIRC.addLine("---------------------------------------------"); // write hint to console: Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); - consoleIRC.addLine(Lang::getInstance().get("To switch off music press")+" - \""+configKeys.getString("ToggleMusic")+"\""); + consoleIRC.addLine(Lang::getInstance().get("ToSwitchOffMusicPress")+" - \""+configKeys.getString("ToggleMusic")+"\""); announcementLoaded=true; } @@ -1058,7 +1058,7 @@ bool MenuStateMasterserver::connectToServer(string ipString, int port) { mainMessageBoxState=1; Lang &lang= Lang::getInstance(); - showMessageBox(lang.get("Couldnt connect"), lang.get("Connection failed"), false); + showMessageBox(lang.get("CouldNotConnect"), lang.get("ConnectionFailed"), false); return false; //if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] connection failed\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__);