Some more text fixes and improvements (#1618).

[user/henk/code/inspircd.git] / src / modules / m_remove.cpp

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 8d60ff8c6e49632d6acf7f3ebca561a2be898252..850864be2d612435838e3b50f2f21d9a8b8d0b52 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -87,13 +87,13 @@ class RemoveBase : public Command
 
                if (!channel->HasUser(target))
                {
-                       user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
+                       user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str()));
                        return CMD_FAILURE;
                }
 
                if (target->server->IsULine())
                {
-                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a u-line may remove a u-line from a channel.");
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel.");
                        return CMD_FAILURE;
                }
 
@@ -142,14 +142,14 @@ class RemoveBase : public Command
                        }
                        else
                        {
-                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str()));
+                               user->WriteNotice(InspIRCd::Format("*** You do not have access to /REMOVE %s from %s", target->nick.c_str(), channel->name.c_str()));
                                return CMD_FAILURE;
                        }
                }
                else
                {
                        /* m_nokicks.so was loaded and +Q was set, block! */
-                       user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (nokicks mode is set)", target->nick.c_str()));
+                       user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (+Q is set)", target->nick.c_str()));
                        return CMD_FAILURE;
                }
 
@@ -165,7 +165,7 @@ class CommandRemove : public RemoveBase
        CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm)
                : RemoveBase(Creator, snk, nkm, "REMOVE")
        {
-               syntax = "<channel> <nick> [<reason>]";
+               syntax = "<channel> <nick> [:<reason>]";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT);
        }
 
@@ -183,7 +183,7 @@ class CommandFpart : public RemoveBase
        CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm)
                : RemoveBase(Creator, snk, nkm, "FPART")
        {
-               syntax = "<channel> <nick> [<reason>]";
+               syntax = "<channel> <nick> [:<reason>]";
                TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT);
        }
 
@@ -222,7 +222,7 @@ class ModuleRemove : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
+               return Version("Provides the REMOVE command as an alternative to KICK, it makes users appear to have left the channel", VF_OPTCOMMON | VF_VENDOR);
        }
 };