diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-08-10 20:16:22 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-10 20:16:22 -0600 |
commit | 56865a2c98a589a1e530e296b1681e369e2ae48f (patch) | |
tree | c3ea1115b5afcca197c87e1a257f34583b2d57ce /src/gui/widgets | |
parent | 7a7018c517948c2cc567d28d221c5cd8a91f2c12 (diff) | |
parent | 0ebdce30ee61d7b038e81bc64ae7d1e27d98a144 (diff) | |
download | mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.gz mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.bz2 mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.tar.xz mana-client-56865a2c98a589a1e530e296b1681e369e2ae48f.zip |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/channeltab.cpp | 9 | ||||
-rw-r--r-- | src/gui/widgets/whispertab.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gui/widgets/channeltab.cpp b/src/gui/widgets/channeltab.cpp index e3edbba0..8b055a22 100644 --- a/src/gui/widgets/channeltab.cpp +++ b/src/gui/widgets/channeltab.cpp @@ -72,23 +72,24 @@ bool ChannelTab::handleCommand(const std::string &type, { chatLog(_("Command: /quit")); chatLog(_("This command leaves the current channel.")); - chatLog(_("If you're the last person in the channel, it will be deleted.")); + chatLog(_("If you're the last person in the channel, " + "it will be deleted.")); } else if (args == "op") { chatLog(_("Command: /op <nick>")); chatLog(_("This command makes <nick> a channel operator.")); chatLog(_("If the <nick> has spaces in it, enclose it in " - "double quotes (\").")); + "double quotes (\").")); chatLog(_("Channel operators can kick and op other users " - "from the channel.")); + "from the channel.")); } else if (args == "kick") { chatLog(_("Command: /kick <nick>")); chatLog(_("This command makes <nick> leave the channel.")); chatLog(_("If the <nick> has spaces in it, enclose it in " - "double quotes (\").")); + "double quotes (\").")); } else return false; diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index bc0d54d0..5509a589 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -91,7 +91,7 @@ bool WhisperTab::handleCommand(const std::string &type, { chatLog(_("Command: /unignore <player>")); chatLog(_("This command stops ignoring the other player if they " - "are being ignored")); + "are being ignored.")); } else return false; |