summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-18 02:46:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-18 02:46:11 +0300
commit718cc20f00d8724c79d2c0e928696b476119af6d (patch)
tree93aff7f1d62e35341336b861495d8d4a989b8eba
parent393ab30aff714f9054ceea626fa5ba5447eee16d (diff)
downloadmanaplus-718cc20f00d8724c79d2c0e928696b476119af6d.tar.gz
manaplus-718cc20f00d8724c79d2c0e928696b476119af6d.tar.bz2
manaplus-718cc20f00d8724c79d2c0e928696b476119af6d.tar.xz
manaplus-718cc20f00d8724c79d2c0e928696b476119af6d.zip
Fix typos.
-rw-r--r--src/gui/widgets/tabs/setup_chat.cpp2
-rw-r--r--src/logger.cpp2
-rw-r--r--src/resources/mapreader.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/tabs/setup_chat.cpp b/src/gui/widgets/tabs/setup_chat.cpp
index a005524c2..1a26fe131 100644
--- a/src/gui/widgets/tabs/setup_chat.cpp
+++ b/src/gui/widgets/tabs/setup_chat.cpp
@@ -269,7 +269,7 @@ Setup_Chat::Setup_Chat(const Widget2 *const widget) :
_("If this feature enabled, text in chat will be automatically "
"adjusted to adapt to appearance of chat input field when you "
"typing message and when input field of chat disappears. If disabled, "
- "chat input area will allways occupy its place, which could be "
+ "chat input area will always occupy its place, which could be "
"otherwise usable for text.\n\n"
"Note: its mostly about jumpy attitude vs "
"less usable space for text."),
diff --git a/src/logger.cpp b/src/logger.cpp
index c2538803d..2368f6f2e 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -368,7 +368,7 @@ void Logger::error(const std::string &error_text)
// (ConstStr255Param) msg, nullptr, nullptr);
#elif defined(__linux__) || defined(_linux)
std::cerr << "Error: " << error_text << std::endl;
- const std::string msg("xmessage \"Error happend. "
+ const std::string msg("xmessage \"Error happened. "
"Please see log file for more information.\"");
if (system(msg.c_str()) == -1)
std::cerr << "Error: " << error_text << std::endl;
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 555185094..73317fcba 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -324,7 +324,7 @@ Map *MapReader::readMap(XmlNodePtrConst node, const std::string &path)
if (tilew < 0 || tileh < 0)
{
logger->log("MapReader: Warning: "
- "Unitialized tile width or height value for map: %s",
+ "Uninitialized tile width or height value for map: %s",
path.c_str());
BLOCK_END("MapReader::readMap xml")
return nullptr;