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_set.cpp b/modules/commands/ns_set.cpp
index 58311f0af..cec5e10b0 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -334,7 +334,7 @@ class CommandNSSetDisplay : public Command
 			return;
 		}
 
-		const NickServ::Nick *user_na = NickServ::FindNick(user), *na = NickServ::FindNick(param);
+		NickServ::Nick *user_na = NickServ::FindNick(user), *na = NickServ::FindNick(param);
 
 		if (Config->GetModule("nickserv")->Get<bool>("nonicknameownership"))
 		{
@@ -362,6 +362,8 @@ class CommandNSSetDisplay : public Command
 		Log(user_na->nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to change the display of " << user_na->nc->display << " to " << na->nick;
 
 		user_na->nc->SetDisplay(na);
+		if (source.GetUser())
+			IRCD->SendLogin(source.GetUser(), na);
 		source.Reply(_("The new display is now \002{0}\002."), user_na->nc->display);
 	}
 
@@ -762,7 +764,7 @@ class CommandNSSetLanguage : public Command
 		if (MOD_RESULT == EVENT_STOP)
 			return;
 
-		if (param != "en")
+		if (param != "en_US")
 			for (unsigned j = 0; j < Language::Languages.size(); ++j)
 			{
 				if (Language::Languages[j] == param)
@@ -789,7 +791,7 @@ class CommandNSSetLanguage : public Command
 	{
 		source.Reply(_("Changes the language services will use when sending messages to you (for example, when responding to a command you send). \037language\037 should be chosen from the following list of supported languages:"));
 
-		source.Reply("         en (English)");
+		source.Reply("         en_US (English)");
 		for (unsigned j = 0; j < Language::Languages.size(); ++j)
 		{
 			const Anope::string &langname = Language::Translate(Language::Languages[j].c_str(), _("English"));