Merge branch '2.0' into 2.1

Conflicts:
	cmake/Anope.cmake
	cmake/FindGettext.cmake
	include/access.h
	include/messages.h
	include/modes.h
	include/modules.h
	include/users.h
	modules/CMakeLists.txt
	modules/commands/bs_bot.cpp
	modules/commands/cs_access.cpp
	modules/commands/cs_ban.cpp
	modules/commands/cs_clone.cpp
	modules/commands/cs_flags.cpp
	modules/commands/cs_info.cpp
	modules/commands/cs_list.cpp
	modules/commands/cs_log.cpp
	modules/commands/cs_mode.cpp
	modules/commands/cs_status.cpp
	modules/commands/cs_suspend.cpp
	modules/commands/cs_updown.cpp
	modules/commands/cs_xop.cpp
	modules/commands/ms_check.cpp
	modules/commands/ns_access.cpp
	modules/commands/ns_cert.cpp
	modules/commands/ns_group.cpp
	modules/commands/ns_register.cpp
	modules/commands/ns_set.cpp
	modules/commands/ns_suspend.cpp
	modules/commands/os_session.cpp
	modules/commands/os_svs.cpp
	modules/extra/m_ldap_authentication.cpp
	modules/extra/m_regex_pcre.cpp
	modules/extra/m_sql_authentication.cpp
	modules/extra/stats/m_chanstats.cpp
	modules/protocol/bahamut.cpp
	modules/protocol/hybrid.cpp
	modules/protocol/inspircd12.cpp
	modules/protocol/inspircd20.cpp
	modules/protocol/unreal.cpp
	modules/pseudoclients/chanserv.cpp
	modules/pseudoclients/chanserv/channel.cpp
	modules/pseudoclients/nickserv/nickserv.cpp
	modules/webcpanel/pages/chanserv/access.cpp
	src/access.cpp
	src/bots.cpp
	src/channels.cpp
	src/language.cpp
	src/modes.cpp
	src/modulemanager.cpp
	src/process.cpp
	src/users.cpp
	src/version.sh

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index 62620f7c4..7a67337f9 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -138,12 +138,14 @@ class CommandNSGroup : public Command
 			Log(LOG_COMMAND, source, this) << "and tried to group to suspended nick " << target->nick;
 			source.Reply(_("\002{0}\002 is suspended."), target->nick);
 		}
+		else if (na && Config->GetModule(this->owner)->Get<bool>("nogroupchange"))
+			source.Reply(_("Your nick is already registered."));
 		else if (na && *target->nc == *na->nc)
 			source.Reply(_("You are already a member of the group of \002{0}\002."), target->nick);
 		else if (na && na->nc != u->Account())
 			source.Reply(_("\002{0}\002 is already registered."), na->nick);
 		else if (na && Config->GetModule(this->owner)->Get<bool>("nogroupchange"))
-			source.Reply(_("Your nick is already registered."));
+			source.Reply(_("You are already registered."));
 		else if (maxaliases && target->nc->aliases->size() >= maxaliases && !target->nc->IsServicesOper())
 			source.Reply(_("There are too many nicknames in your group."));
 		else if (u->nick.length() <= guestnick.length() + 7 &&
@@ -155,7 +157,7 @@ class CommandNSGroup : public Command
 		else
 		{
 			bool ok = false;
-			if (!na && u->Account())
+			if (!na && u->Account() == target->nc)
 				ok = true;
 
 			NSCertList *cl = target->nc->GetExt<NSCertList>("certificates");
@@ -290,7 +292,7 @@ class CommandNSGList : public Command
 
 			Anope::string expires;
 			if (na2->HasExt("NS_NO_EXPIRE"))
-				expires = "Does not expire";
+				expires = _("Does not expire");
 			else if (!nickserv_expire || Anope::NoExpire)
 				;
 			else if (na2->nc->HasExt("UNCONFIRMED") && unconfirmed_expire)