Merge branch 'master' into mop

diff --git a/SummonManager.lua b/SummonManager.lua
index 3c33062..efdc549 100644
--- a/SummonManager.lua
+++ b/SummonManager.lua
@@ -145,7 +145,7 @@ function SM:DeclineSummon()
 end

 function SM:HasSummon()
-	return PlayerCanTeleport()
+	return GetSummonConfirmTimeLeft() > 0 -- PlayerCanTeleport()
 end

 function SM:IsEnabled()
diff --git a/locales/enUS.lua b/locales/enUS.lua
index 4320683..17cc8a0 100644
--- a/locales/enUS.lua
+++ b/locales/enUS.lua
@@ -116,7 +116,7 @@ local L = {
 	CM_VERSION = "%s",

 	CM_SET_HELP = "Control the settings of Command.",
-	CM_SET_USAGE = "Usage: set cmdchar|groupinvite",
+	CM_SET_USAGE = "Usage: set cmdchar|groupinvite|deathmanager|summonmanager",
 	CM_SET_GROUPINVITE_USAGE = "Usage: set groupinvite enable|disable|<delay>",
 	CM_SET_DM_ISENABLED = "DeathManager is enabled.",
 	CM_SET_DM_ISDISABLED = "DeathManager is disabled.",
@@ -484,7 +484,7 @@ local L = {
 	-- SummonManager --
 	-------------------

-	SM_ERR_NOSUMMON = "I do not have an active summon request.",
+	SM_ERR_NOSUMMON = "I do not have an active summon request or it has expired.",

 	SM_ENABLED = "Summon Manager has been enabled!",

diff --git a/locales/svSE.lua b/locales/svSE.lua
index ede6e08..5899f17 100644
--- a/locales/svSE.lua
+++ b/locales/svSE.lua
@@ -116,7 +116,7 @@ local L = {
 	CM_VERSION = "%s",

 	CM_SET_HELP = "Ändra inställningarna i Command.",
-	CM_SET_USAGE = "Användning: set cmdchar|groupinvite",
+	CM_SET_USAGE = "Användning: set cmdchar|groupinvite|deathmanager|summonmanager",
 	CM_SET_GROUPINVITE_USAGE = "Användning: set groupinvite enable|disable|<fördröjning>",
 	CM_SET_DM_ISENABLED = "DeathManager is enabled.",
 	CM_SET_DM_ISDISABLED = "DeathManager is disabled.",
@@ -484,7 +484,7 @@ local L = {
 	-- SummonManager --
 	-------------------

-	SM_ERR_NOSUMMON = "I do not have an active summon request.",
+	SM_ERR_NOSUMMON = "I do not have an active summon request or it has expired.",

 	SM_ENABLED = "Summon Manager has been enabled!",