From 7dbb1c0e9f55a106a48a2155cb6de20b5ca04358 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Fri, 16 Jun 2017 00:36:02 +0200 Subject: String typo fixes --- dat/citynames.xml.in | 2 +- dat/glade/editor/validation-dialog.ui | 2 +- dat/various/items/items.xml.in | 2 +- src/Commentator.cpp | 2 +- src/Configuration.cpp | 2 +- src/GameScenario.cpp | 2 +- src/armybase.cpp | 2 +- src/ghs/gamehost-server.cpp | 2 +- src/shieldset.cpp | 2 +- src/utils/import.cpp | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dat/citynames.xml.in b/dat/citynames.xml.in index 1018b87a..03b9e3bd 100644 --- a/dat/citynames.xml.in +++ b/dat/citynames.xml.in @@ -15,7 +15,7 @@ <_d_name>Devilian - <_d_name>Ankh-Morpok + <_d_name>Ankh-Morpork <_d_name>Warportal diff --git a/dat/glade/editor/validation-dialog.ui b/dat/glade/editor/validation-dialog.ui index c40dede7..b9085656 100644 --- a/dat/glade/editor/validation-dialog.ui +++ b/dat/glade/editor/validation-dialog.ui @@ -6,7 +6,7 @@ False 6 - Scenario Valdiation + Scenario Validation dialog diff --git a/dat/various/items/items.xml.in b/dat/various/items/items.xml.in index 9584f224..04ea9439 100644 --- a/dat/various/items/items.xml.in +++ b/dat/various/items/items.xml.in @@ -64,7 +64,7 @@ ItemProto::ADD2STR - <_d_name>Beserker Helm + <_d_name>Berserker Helm ItemProto::ADD2STR diff --git a/src/Commentator.cpp b/src/Commentator.cpp index 40f76001..bbc33fae 100644 --- a/src/Commentator.cpp +++ b/src/Commentator.cpp @@ -68,7 +68,7 @@ std::vector Commentator::getComments(Player *player) const comments.push_back(_("You are sadly in need of gold!")); else if (player->getGold() > 2500) { - comments.push_back(_("Your wealth is greather than the mightiest of dragons!")); + comments.push_back(_("Your wealth is greater than the mightiest of dragons!")); comments.push_back(_("All your gold must surely be a burden!")); } std::list heroes = player->getHeroes(); diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 46d93d10..ba094aef 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -207,7 +207,7 @@ bool Configuration::parseConfiguration(XML_Helper* helper) if (helper->getVersion() != LORDSAWAR_CONFIG_VERSION) { - std::cerr << String::ucompose(_("Configuration file has wrong version. expected %1, but got %2"), LORDSAWAR_CONFIG_VERSION, helper->getVersion()) << std::endl; + std::cerr << String::ucompose(_("Configuration file has wrong version. Expected %1, but got %2"), LORDSAWAR_CONFIG_VERSION, helper->getVersion()) << std::endl; Glib::ustring orig = s_filename; Glib::ustring dest = s_filename+".OLD"; std::cerr << String::ucompose(_("backing up config file `%1' to `%2'."), orig, dest) << std::endl; diff --git a/src/GameScenario.cpp b/src/GameScenario.cpp index 85e9211a..9350a311 100644 --- a/src/GameScenario.cpp +++ b/src/GameScenario.cpp @@ -795,7 +795,7 @@ bool GameScenario::load(Glib::ustring tag, XML_Helper* helper) { if (helper->getVersion() != LORDSAWAR_SAVEGAME_VERSION) { - std::cerr << String::ucompose(_("saved game file has wrong version. expecting %1 but got %2."), LORDSAWAR_SAVEGAME_VERSION, helper->getVersion()) << std::endl; + std::cerr << String::ucompose(_("saved game file has wrong version. Expecting %1 but got %2."), LORDSAWAR_SAVEGAME_VERSION, helper->getVersion()) << std::endl; return false; } return true; diff --git a/src/armybase.cpp b/src/armybase.cpp index 391b3753..e62e7fa4 100644 --- a/src/armybase.cpp +++ b/src/armybase.cpp @@ -94,7 +94,7 @@ Glib::ustring ArmyBase::getArmyBonusDescription() const _("+1 str in woods")); else if (bonus & ArmyBase::ADD2STRINFOREST) s += String::ucompose("%1%2", s == "" ? " " : "& ", - _("+1 str in woods")); + _("+2 str in woods")); if (bonus & ArmyBase::ADD1STRINHILLS && bonus & ArmyBase::ADD2STRINHILLS) s += String::ucompose("%1%2", s == "" ? " " : " & ", _("+3 str in hills")); diff --git a/src/ghs/gamehost-server.cpp b/src/ghs/gamehost-server.cpp index 2298600b..846c7d13 100644 --- a/src/ghs/gamehost-server.cpp +++ b/src/ghs/gamehost-server.cpp @@ -370,7 +370,7 @@ bool GamehostServer::onGotMessage(void *conn, int type, Glib::ustring payload) if (add_to_profiles_awaiting_maps(profile, scenario_id) == false) { delete profile; - err = _("Server too busy. try again later."); + err = _("Server too busy. Try again later."); network_server->send(conn, GHS_MESSAGE_COULD_NOT_HOST_GAME, scenario_id + " " + err); return true; diff --git a/src/shieldset.cpp b/src/shieldset.cpp index a43eb0fd..5edd4ad0 100644 --- a/src/shieldset.cpp +++ b/src/shieldset.cpp @@ -152,7 +152,7 @@ public: if (!helper.parseXML()) { unsupported = unsupported_version; - std::cerr << String::ucompose(_("Error! can't load shieldet `%1'."), filename) << std::endl; + std::cerr << String::ucompose(_("Error! can't load shieldset `%1'."), filename) << std::endl; if (shieldset != NULL) delete shieldset; shieldset = NULL; diff --git a/src/utils/import.cpp b/src/utils/import.cpp index 2cd8ee6e..a668c495 100644 --- a/src/utils/import.cpp +++ b/src/utils/import.cpp @@ -703,7 +703,7 @@ import_ruins_and_temples (FILE *scn, FILE *spc) Ruinlist::getInstance()->add(r); } else - std::cerr << String::ucompose(_("Error: We got an unknkown temple/ruin type of %1 for %2 at %3,%4"), type, Glib::ustring(name),x,y) << std::endl; + std::cerr << String::ucompose(_("Error: We got an unknown temple/ruin type of %1 for %2 at %3,%4"), type, Glib::ustring(name),x,y) << std::endl; } } @@ -1461,7 +1461,7 @@ main (int argc, char* argv[]) std::list map = File::scanForFiles(filename, ".MAP"); if (map.size() == 0) { - std::cerr << String::ucompose (_("Error, Could not find a .MAP file in %1"), filename) << std::endl; + std::cerr << String::ucompose (_("Error: Could not find a .MAP file in `%1'"), filename) << std::endl; exit (EXIT_FAILURE); } std::list scn = File::scanForFiles(filename, ".SCN"); -- 2.11.0