Merge pull request #1363 from slingamn/strings

update strings

irc/nickserv.go

@@ -343,7 +343,7 @@ Suspending an account disables it (preventing new logins) and disconnects
 all associated clients. You can specify a time limit or a reason for
 the suspension. The $bDEL$b subcommand reverses a suspension, and the $bLIST$b
 command lists all current suspensions.`,
-			helpShort: `$bSUSPEND$b adds or removes an account suspension`,
+			helpShort: `$bSUSPEND$b manages account suspensions`,
 			minParams: 1,
 			capabs:    []string{"accreg"},
 		},
@@ -1375,5 +1375,5 @@ func suspensionToString(client *Client, suspension AccountSuspension) (result st
 	if suspension.Reason != "" {
 		reason = fmt.Sprintf(client.t("Reason: %s"), suspension.Reason)
 	}
-	return fmt.Sprintf(client.t("Account %s suspended at %s. Duration: %s. %s"), suspension.AccountName, ts, duration, reason)
+	return fmt.Sprintf(client.t("Account %[1]s suspended at %[2]s. Duration: %[3]s. %[4]s"), suspension.AccountName, ts, duration, reason)
 }

languages/example/chanserv.lang.json

@@ -1,6 +1,7 @@
 {
   "$bAMODE$b modifies persistent mode settings for channel members.": "$bAMODE$b modifies persistent mode settings for channel members.",
   "$bCLEAR$b removes users or settings from a channel.": "$bCLEAR$b removes users or settings from a channel.",
+  "$bDEOP$b removes the given user (or yourself) from a channel admin.": "$bDEOP$b removes the given user (or yourself) from a channel admin.",
   "$bGET$b queries the current values of a channel's settings": "$bGET$b queries the current values of a channel's settings",
   "$bHISTORY$b\n'history' lets you control how channel history is stored. Your options are:\n1. 'off'        [no history]\n2. 'ephemeral'  [a limited amount of temporary history, not stored on disk]\n3. 'on'         [history stored in a permanent database, if available]\n4. 'default'    [use the server default]": "$bHISTORY$b\n'history' lets you control how channel history is stored. Your options are:\n1. 'off'        [no history]\n2. 'ephemeral'  [a limited amount of temporary history, not stored on disk]\n3. 'on'         [history stored in a permanent database, if available]\n4. 'default'    [use the server default]",
   "$bINFO$b displays info about a registered channel.": "$bINFO$b displays info about a registered channel.",
@@ -17,6 +18,7 @@
   "Syntax: $INFO #channel$b\n\nINFO displays info about a registered channel.": "Syntax: $INFO #channel$b\n\nINFO displays info about a registered channel.",
   "Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.": "Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.",
   "Syntax: $bCLEAR #channel target$b\n\nCLEAR removes users or settings from a channel. Specifically:\n\n$bCLEAR #channel users$b kicks all users except for you.\n$bCLEAR #channel access$b resets all stored bans, invites, ban exceptions,\nand persistent user-mode grants made with CS AMODE.": "Syntax: $bCLEAR #channel target$b\n\nCLEAR removes users or settings from a channel. Specifically:\n\n$bCLEAR #channel users$b kicks all users except for you.\n$bCLEAR #channel access$b resets all stored bans, invites, ban exceptions,\nand persistent user-mode grants made with CS AMODE.",
+  "Syntax: $bDEOP #channel [nickname]$b\n\nDEOP removes the given nickname, or yourself, the channel admin. You can only use\nthis command if you're the founder of the channel.": "Syntax: $bDEOP #channel [nickname]$b\n\nDEOP removes the given nickname, or yourself, the channel admin. You can only use\nthis command if you're the founder of the channel.",
   "Syntax: $bGET #channel <setting>$b\n\nGET queries the current values of the channel settings. For more information\non the settings and their possible values, see HELP SET.": "Syntax: $bGET #channel <setting>$b\n\nGET queries the current values of the channel settings. For more information\non the settings and their possible values, see HELP SET.",
   "Syntax: $bLIST [regex]$b\n\nLIST returns the list of registered channels, which match the given regex.\nIf no regex is provided, all registered channels are returned.": "Syntax: $bLIST [regex]$b\n\nLIST returns the list of registered channels, which match the given regex.\nIf no regex is provided, all registered channels are returned.",
   "Syntax: $bOP #channel [nickname]$b\n\nOP makes the given nickname, or yourself, a channel admin. You can only use\nthis command if you're the founder of the channel.": "Syntax: $bOP #channel [nickname]$b\n\nOP makes the given nickname, or yourself, a channel admin. You can only use\nthis command if you're the founder of the channel.",

languages/example/help.lang.json

@@ -1,8 +1,8 @@
 {
   "= Help Topics =\n\nCommands:\n%[1]s\n\nRPL_ISUPPORT Tokens:\n%[2]s\n\nInformation:\n%[3]s": "= Help Topics =\n\nCommands:\n%[1]s\n\nRPL_ISUPPORT Tokens:\n%[2]s\n\nInformation:\n%[3]s",
-  "== Channel Modes ==\n\nOragono supports the following channel modes:\n\n  +b  |  Client masks that are banned from the channel (e.g. *!*@127.0.0.1)\n  +e  |  Client masks that are exempted from bans.\n  +I  |  Client masks that are exempted from the invite-only flag.\n  +i  |  Invite-only mode, only invited clients can join the channel.\n  +k  |  Key required when joining the channel.\n  +l  |  Client join limit for the channel.\n  +m  |  Moderated mode, only privileged clients can talk on the channel.\n  +n  |  No-outside-messages mode, only users that are on the channel can send\n      |  messages to it.\n  +R  |  Only registered users can join the channel.\n  +s  |  Secret mode, channel won't show up in /LIST or whois replies.\n  +t  |  Only channel opers can modify the topic.\n  +E  |  Roleplaying commands are enabled in the channel.\n  +C  |  Clients are blocked from sending CTCP messages in the channel.\n\n= Prefixes =\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.": "== Channel Modes ==\n\nOragono supports the following channel modes:\n\n  +b  |  Client masks that are banned from the channel (e.g. *!*@127.0.0.1)\n  +e  |  Client masks that are exempted from bans.\n  +I  |  Client masks that are exempted from the invite-only flag.\n  +i  |  Invite-only mode, only invited clients can join the channel.\n  +k  |  Key required when joining the channel.\n  +l  |  Client join limit for the channel.\n  +m  |  Moderated mode, only privileged clients can talk on the channel.\n  +n  |  No-outside-messages mode, only users that are on the channel can send\n      |  messages to it.\n  +R  |  Only registered users can join the channel.\n  +s  |  Secret mode, channel won't show up in /LIST or whois replies.\n  +t  |  Only channel opers can modify the topic.\n  +E  |  Roleplaying commands are enabled in the channel.\n  +C  |  Clients are blocked from sending CTCP messages in the channel.\n\n= Prefixes =\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.",
+  "== Channel Modes ==\n\nOragono supports the following channel modes:\n\n  +b  |  Client masks that are banned from the channel (e.g. *!*@127.0.0.1)\n  +e  |  Client masks that are exempted from bans.\n  +I  |  Client masks that are exempted from the invite-only flag.\n  +i  |  Invite-only mode, only invited clients can join the channel.\n  +k  |  Key required when joining the channel.\n  +l  |  Client join limit for the channel.\n  +m  |  Moderated mode, only privileged clients can talk on the channel.\n  +n  |  No-outside-messages mode, only users that are on the channel can send\n      |  messages to it.\n  +R  |  Only registered users can join the channel.\n  +M  |  Only registered or voiced users can speak in the channel.\n  +s  |  Secret mode, channel won't show up in /LIST or whois replies.\n  +t  |  Only channel opers can modify the topic.\n  +E  |  Roleplaying commands are enabled in the channel.\n  +C  |  Clients are blocked from sending CTCP messages in the channel.\n  +u  |  Auditorium mode: JOIN, PART, QUIT, NAMES, and WHO are hidden\n         hidden from unvoiced clients.\n  +U  |  Op-moderated mode: messages from unprivileged clients are sent\n         only to channel operators.\n\n= Prefixes =\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.": "== Channel Modes ==\n\nOragono supports the following channel modes:\n\n  +b  |  Client masks that are banned from the channel (e.g. *!*@127.0.0.1)\n  +e  |  Client masks that are exempted from bans.\n  +I  |  Client masks that are exempted from the invite-only flag.\n  +i  |  Invite-only mode, only invited clients can join the channel.\n  +k  |  Key required when joining the channel.\n  +l  |  Client join limit for the channel.\n  +m  |  Moderated mode, only privileged clients can talk on the channel.\n  +n  |  No-outside-messages mode, only users that are on the channel can send\n      |  messages to it.\n  +R  |  Only registered users can join the channel.\n  +M  |  Only registered or voiced users can speak in the channel.\n  +s  |  Secret mode, channel won't show up in /LIST or whois replies.\n  +t  |  Only channel opers can modify the topic.\n  +E  |  Roleplaying commands are enabled in the channel.\n  +C  |  Clients are blocked from sending CTCP messages in the channel.\n  +u  |  Auditorium mode: JOIN, PART, QUIT, NAMES, and WHO are hidden\n         hidden from unvoiced clients.\n  +U  |  Op-moderated mode: messages from unprivileged clients are sent\n         only to channel operators.\n\n= Prefixes =\n\n  +q (~)  |  Founder channel mode.\n  +a (&)  |  Admin channel mode.\n  +o (@)  |  Operator channel mode.\n  +h (%)  |  Halfop channel mode.\n  +v (+)  |  Voice channel mode.",
   "== Server Notice Masks ==\n\nOragono supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  j  |  Local channel actions.\n  k  |  Local kills.\n  n  |  Local nick changes.\n  o  |  Local oper actions.\n  q  |  Local quits.\n  t  |  Local /STATS usage.\n  u  |  Local client account actions.\n  x  |  Local X-lines (DLINE/KLINE/etc).\n  v  |  Local vhost changes.\n\nTo set a snomask, do this with your nickname:\n\n  /MODE <nick> +s <chars>\n\nFor instance, this would set the kill, oper, account and xline snomasks on dan:\n\n  /MODE dan +s koux": "== Server Notice Masks ==\n\nOragono supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  j  |  Local channel actions.\n  k  |  Local kills.\n  n  |  Local nick changes.\n  o  |  Local oper actions.\n  q  |  Local quits.\n  t  |  Local /STATS usage.\n  u  |  Local client account actions.\n  x  |  Local X-lines (DLINE/KLINE/etc).\n  v  |  Local vhost changes.\n\nTo set a snomask, do this with your nickname:\n\n  /MODE <nick> +s <chars>\n\nFor instance, this would set the kill, oper, account and xline snomasks on dan:\n\n  /MODE dan +s koux",
-  "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users. \n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  User is blocked from sending CTCP messages.": "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users. \n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  User is blocked from sending CTCP messages.",
+  "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users.\n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  CTCP messages to the user are blocked.": "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users.\n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  CTCP messages to the user are blocked.",
   "@+client-only-tags TAGMSG <target>{,<target>}\n\nSends the given client-only tags to the given targets as a TAGMSG. See the IRCv3\nspecs for more info: http://ircv3.net/specs/core/message-tags-3.3.html": "@+client-only-tags TAGMSG <target>{,<target>}\n\nSends the given client-only tags to the given targets as a TAGMSG. See the IRCv3\nspecs for more info: http://ircv3.net/specs/core/message-tags-3.3.html",
   "ACC LS\nACC REGISTER <accountname> [callback_namespace:]<callback> [cred_type] :<credential>\nACC VERIFY <accountname> <auth_code>\n\nUsed in account registration. See the relevant specs for more info:\nhttps://oragono.io/specs.html": "ACC LS\nACC REGISTER <accountname> [callback_namespace:]<callback> [cred_type] :<credential>\nACC VERIFY <accountname> <auth_code>\n\nUsed in account registration. See the relevant specs for more info:\nhttps://oragono.io/specs.html",
   "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.": "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.",
@@ -45,7 +45,9 @@
   "PONG <args>...\n\nReplies to a PING. Used to check link connectivity.": "PONG <args>...\n\nReplies to a PING. Used to check link connectivity.",
   "PRIVMSG <target>{,<target>} <text to be sent>\n\nSends the text to the given targets as a PRIVMSG.": "PRIVMSG <target>{,<target>} <text to be sent>\n\nSends the text to the given targets as a PRIVMSG.",
   "QUIT [reason]\n\nIndicates that you're leaving the server, and shows everyone the given reason.": "QUIT [reason]\n\nIndicates that you're leaving the server, and shows everyone the given reason.",
+  "REGISTER <email | *> <password>\n\nRegisters an account in accordance with the draft/register capability.": "REGISTER <email | *> <password>\n\nRegisters an account in accordance with the draft/register capability.",
   "REHASH\n\nReloads the config file and updates TLS certificates on listeners": "REHASH\n\nReloads the config file and updates TLS certificates on listeners",
+  "RELAYMSG <channel> <spoofed nick> :<message>\n\nThis command lets channel operators relay messages to their\nchannel from other messaging systems using relay bots. The\nspoofed nickname MUST contain a forwardslash.\n\nFor example:\n\tRELAYMSG #ircv3 Mallory/D :Welp, we linked Discord...": "RELAYMSG <channel> <spoofed nick> :<message>\n\nThis command lets channel operators relay messages to their\nchannel from other messaging systems using relay bots. The\nspoofed nickname MUST contain a forwardslash.\n\nFor example:\n\tRELAYMSG #ircv3 Mallory/D :Welp, we linked Discord...",
   "RENAME <channel> <newname> [<reason>]\n\nRenames the given channel with the given reason, if possible.\n\nFor example:\n\tRENAME #ircv2 #ircv3 :Protocol upgrades!": "RENAME <channel> <newname> [<reason>]\n\nRenames the given channel with the given reason, if possible.\n\nFor example:\n\tRENAME #ircv2 #ircv3 :Protocol upgrades!",
   "RESUME <oldnick> [timestamp]\n\nSent before registration has completed, this indicates that the client wants to\nresume their old connection <oldnick>.": "RESUME <oldnick> [timestamp]\n\nSent before registration has completed, this indicates that the client wants to\nresume their old connection <oldnick>.",
   "RPL_ISUPPORT CASEMAPPING\n\nOragono supports an experimental unicode casemapping designed for extended\nUnicode support. This casemapping is based off RFC 7613 and the draft rfc7613\ncasemapping spec here: https://oragono.io/specs.html": "RPL_ISUPPORT CASEMAPPING\n\nOragono supports an experimental unicode casemapping designed for extended\nUnicode support. This casemapping is based off RFC 7613 and the draft rfc7613\ncasemapping spec here: https://oragono.io/specs.html",
@@ -59,10 +61,12 @@
   "TIME [server]\n\nShows the time of the current, or the given, server.": "TIME [server]\n\nShows the time of the current, or the given, server.",
   "TOPIC <channel> [topic]\n\nIf [topic] is given, sets the topic in the channel to that. If [topic] is not\ngiven, views the current topic on the channel.": "TOPIC <channel> [topic]\n\nIf [topic] is given, sets the topic in the channel to that. If [topic] is not\ngiven, views the current topic on the channel.",
   "UNDLINE <ip>/<net>\n\nRemoves an existing ban on an IP address or a network.\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24": "UNDLINE <ip>/<net>\n\nRemoves an existing ban on an IP address or a network.\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24",
+  "UNINVITE <nickname> <channel>\n\nUNINVITE rescinds a channel invitation sent for an invite-only channel.": "UNINVITE <nickname> <channel>\n\nUNINVITE rescinds a channel invitation sent for an invite-only channel.",
   "UNKLINE <mask>\n\nRemoves an existing ban on a mask.\n\nFor example:\n\tdan\n\tdan!5*@127.*": "UNKLINE <mask>\n\nRemoves an existing ban on a mask.\n\nFor example:\n\tdan\n\tdan!5*@127.*",
   "USER <username> 0 * <realname>\n\nUsed in connection registration, sets your username and realname to the given\nvalues (though your username may also be looked up with Ident).": "USER <username> 0 * <realname>\n\nUsed in connection registration, sets your username and realname to the given\nvalues (though your username may also be looked up with Ident).",
   "USERHOST <nickname>{ <nickname>}\n\t\t\nShows information about the given users. Takes up to 10 nicknames.": "USERHOST <nickname>{ <nickname>}\n\t\t\nShows information about the given users. Takes up to 10 nicknames.",
   "USERS [parameters]\n\nThe USERS command is not implemented.": "USERS [parameters]\n\nThe USERS command is not implemented.",
+  "VERIFY <account> <password>\n\nVerifies an account in accordance with the draft/register capability.": "VERIFY <account> <password>\n\nVerifies an account in accordance with the draft/register capability.",
   "VERSION [server]\n\nViews the version of software and the RPL_ISUPPORT tokens for the given server.": "VERSION [server]\n\nViews the version of software and the RPL_ISUPPORT tokens for the given server.",
   "WEBIRC <password> <gateway> <hostname> <ip> [:<flags>]\n\nUsed by web<->IRC gateways and bouncers, the WEBIRC command allows gateways to\npass-through the real IP addresses of clients:\nircv3.net/specs/extensions/webirc.html\n\n<flags> is a list of space-separated strings indicating various details about\nthe connection from the client to the gateway, such as:\n\n- tls: this flag indicates that the client->gateway connection is secure": "WEBIRC <password> <gateway> <hostname> <ip> [:<flags>]\n\nUsed by web<->IRC gateways and bouncers, the WEBIRC command allows gateways to\npass-through the real IP addresses of clients:\nircv3.net/specs/extensions/webirc.html\n\n<flags> is a list of space-separated strings indicating various details about\nthe connection from the client to the gateway, such as:\n\n- tls: this flag indicates that the client->gateway connection is secure",
   "WHO <name> [o]\n\nReturns information for the given user.": "WHO <name> [o]\n\nReturns information for the given user.",

languages/example/hostserv.lang.json

@@ -1,32 +1,16 @@
 {
-  "$bAPPROVE$b approves a user's vhost request.": "$bAPPROVE$b approves a user's vhost request.",
   "$bDEL$b deletes a user's vhost.": "$bDEL$b deletes a user's vhost.",
-  "$bFORBID$b prevents a user from using vhosts.": "$bFORBID$b prevents a user from using vhosts.",
   "$bOFF$b disables your vhost, if you have one approved.": "$bOFF$b disables your vhost, if you have one approved.",
-  "$bOFFERLIST$b lists vhosts that can be taken without operator approval.": "$bOFFERLIST$b lists vhosts that can be taken without operator approval.",
   "$bON$b enables your vhost, if you have one approved.": "$bON$b enables your vhost, if you have one approved.",
-  "$bPERMIT$b allows a user to use vhosts again.": "$bPERMIT$b allows a user to use vhosts again.",
-  "$bREJECT$b rejects a user's vhost request.": "$bREJECT$b rejects a user's vhost request.",
-  "$bREQUEST$b requests a new vhost, pending operator approval.": "$bREQUEST$b requests a new vhost, pending operator approval.",
   "$bSET$b sets a user's vhost.": "$bSET$b sets a user's vhost.",
   "$bSETCLOAKSECRET$b modifies the IP cloaking secret.": "$bSETCLOAKSECRET$b modifies the IP cloaking secret.",
   "$bSTATUS$b shows your vhost and request status.": "$bSTATUS$b shows your vhost and request status.",
-  "$bTAKE$b sets your vhost to one of the options from the offer list.": "$bTAKE$b sets your vhost to one of the options from the offer list.",
-  "$bWAITING$b shows a list of pending vhost requests.": "$bWAITING$b shows a list of pending vhost requests.",
   "HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).": "HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).",
-  "Syntax: $bAPPROVE <user>$b\n\nAPPROVE approves a user's vhost request.": "Syntax: $bAPPROVE <user>$b\n\nAPPROVE approves a user's vhost request.",
   "Syntax: $bDEL <user>$b\n\nDEL deletes a user's vhost.": "Syntax: $bDEL <user>$b\n\nDEL deletes a user's vhost.",
-  "Syntax: $bFORBID <user>$b\n\nFORBID prevents a user from using any vhost, including ones on the offer list.": "Syntax: $bFORBID <user>$b\n\nFORBID prevents a user from using any vhost, including ones on the offer list.",
   "Syntax: $bOFF$b\n\nOFF disables your vhost, if you have one approved.": "Syntax: $bOFF$b\n\nOFF disables your vhost, if you have one approved.",
-  "Syntax: $bOFFERLIST$b\n\nOFFERLIST lists vhosts that can be chosen without requiring operator approval;\nto use one of the listed vhosts, take it with /HOSTSERV TAKE.": "Syntax: $bOFFERLIST$b\n\nOFFERLIST lists vhosts that can be chosen without requiring operator approval;\nto use one of the listed vhosts, take it with /HOSTSERV TAKE.",
   "Syntax: $bON$b\n\nON enables your vhost, if you have one approved.": "Syntax: $bON$b\n\nON enables your vhost, if you have one approved.",
-  "Syntax: $bPERMIT <user>$b\n\nPERMIT undoes FORBID, allowing the user to TAKE vhosts again.": "Syntax: $bPERMIT <user>$b\n\nPERMIT undoes FORBID, allowing the user to TAKE vhosts again.",
-  "Syntax: $bREJECT <user> [<reason>]$b\n\nREJECT rejects a user's vhost request, optionally giving them a reason\nfor the rejection.": "Syntax: $bREJECT <user> [<reason>]$b\n\nREJECT rejects a user's vhost request, optionally giving them a reason\nfor the rejection.",
-  "Syntax: $bREQUEST <vhost>$b\n\nREQUEST requests that a new vhost by assigned to your account. The request must\nthen be approved by a server operator.": "Syntax: $bREQUEST <vhost>$b\n\nREQUEST requests that a new vhost by assigned to your account. The request must\nthen be approved by a server operator.",
   "Syntax: $bSET <user> <vhost>$b\n\nSET sets a user's vhost, bypassing the request system.": "Syntax: $bSET <user> <vhost>$b\n\nSET sets a user's vhost, bypassing the request system.",
   "Syntax: $bSETCLOAKSECRET$b <secret> [code]\n\nSETCLOAKSECRET can be used to set or rotate the cloak secret. You should use\na cryptographically strong secret. To prevent accidental modification, a\nverification code is required; invoking the command without a code will\ndisplay the necessary code.": "Syntax: $bSETCLOAKSECRET$b <secret> [code]\n\nSETCLOAKSECRET can be used to set or rotate the cloak secret. You should use\na cryptographically strong secret. To prevent accidental modification, a\nverification code is required; invoking the command without a code will\ndisplay the necessary code.",
   "Syntax: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and the status of your most recent\nrequest for a new one. A server operator can view someone else's status.": "Syntax: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and the status of your most recent\nrequest for a new one. A server operator can view someone else's status.",
-  "Syntax: $bTAKE$b <vhost>\n\nTAKE sets your vhost to one of the vhosts in the server's offer list; to see\nthe offered vhosts, use /HOSTSERV OFFERLIST.": "Syntax: $bTAKE$b <vhost>\n\nTAKE sets your vhost to one of the vhosts in the server's offer list; to see\nthe offered vhosts, use /HOSTSERV OFFERLIST.",
-  "Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected.": "Syntax: $bWAITING$b\n\nWAITING shows a list of pending vhost requests, which can then be approved\nor rejected.",
   "^[0-9A-Za-z.\\-_/]+$": "^[0-9A-Za-z.\\-_/]+$"
 }

languages/example/irc.lang.json

@@ -5,7 +5,6 @@
   "$bWarning: unregistering this account will remove its stored privileges.$b": "$bWarning: unregistering this account will remove its stored privileges.$b",
   "$bWarning: unregistering this channel will remove all stored channel attributes.$b": "$bWarning: unregistering this channel will remove all stored channel attributes.$b",
   "$bWarning: you are about to transfer control of your channel to another user.$b": "$bWarning: you are about to transfer control of your channel to another user.$b",
-  "%[1]d. User %[2]s requests vhost: %[3]s": "%[1]d. User %[2]s requests vhost: %[3]s",
   "%[1]s [account: %[2]s] joined the channel": "%[1]s [account: %[2]s] joined the channel",
   "%[1]s changed nick to %[2]s": "%[1]s changed nick to %[2]s",
   "%[1]s kicked %[2]s (%[3]s)": "%[1]s kicked %[2]s (%[3]s)",
@@ -27,15 +26,18 @@
   "- %s Message of the day - ": "- %s Message of the day - ",
   "... and other commands which have been disabled": "... and other commands which have been disabled",
   "A client is already using that account; try logging out and logging back in with SASL": "A client is already using that account; try logging out and logging back in with SASL",
-  "A request is pending for vhost: %s": "A request is pending for vhost: %s",
+  "A valid e-mail address is required": "A valid e-mail address is required",
-  "A request was previously made for vhost: %s": "A request was previously made for vhost: %s",
   "Account %[1]s has vhost: %[2]s": "Account %[1]s has vhost: %[2]s",
   "Account %[1]s receives mode +%[2]s": "Account %[1]s receives mode +%[2]s",
+  "Account %[1]s suspended at %[2]s. Duration: %[3]s. %[4]s": "Account %[1]s suspended at %[2]s. Duration: %[3]s. %[4]s",
   "Account %s has no vhost": "Account %s has no vhost",
   "Account already exists": "Account already exists",
   "Account created": "Account created",
   "Account created, pending verification; verification code has been sent to %s": "Account created, pending verification; verification code has been sent to %s",
   "Account does not exist": "Account does not exist",
+  "Account registration is disabled": "Account registration is disabled",
+  "Account successfully registered": "Account successfully registered",
+  "Account was not suspended": "Account was not suspended",
   "Account: %s": "Account: %s",
   "Actual user@host, Actual IP": "Actual user@host, Actual IP",
   "Added D-Line for %s": "Added D-Line for %s",
@@ -43,7 +45,6 @@
   "Added temporary (%[1]s) D-Line for %[2]s": "Added temporary (%[1]s) D-Line for %[2]s",
   "Added temporary (%[1]s) K-Line for %[2]s": "Added temporary (%[1]s) K-Line for %[2]s",
   "Additional grouped nick: %s": "Additional grouped nick: %s",
-  "An administrator has denied you the ability to use vhosts": "An administrator has denied you the ability to use vhosts",
   "An error occurred": "An error occurred",
   "Authentication failed: %s": "Authentication failed: %s",
   "Authentication successful": "Authentication successful",
@@ -63,7 +64,6 @@
   "Cannot resume connection, old and new clients must have TLS": "Cannot resume connection, old and new clients must have TLS",
   "Cannot resume connection, token is not valid": "Cannot resume connection, token is not valid",
   "Cannot send a blank line with the multiline concat tag": "Cannot send a blank line with the multiline concat tag",
-  "Cannot send to channel": "Cannot send to channel",
   "Cannot send to channel (+%s)": "Cannot send to channel (+%s)",
   "Certfp:      %s": "Certfp:      %s",
   "Certificate fingerprint not found": "Certificate fingerprint not found",
@@ -80,21 +80,28 @@
   "Channel %s wasn't previously purged from the server": "Channel %s wasn't previously purged from the server",
   "Channel does not exist": "Channel does not exist",
   "Channel doesn't have roleplaying mode available": "Channel doesn't have roleplaying mode available",
+  "Channel is not invite-only": "Channel is not invite-only",
   "Channel is not registered": "Channel is not registered",
   "Channel list is full": "Channel list is full",
   "Channel registration is restricted to server operators": "Channel registration is restricted to server operators",
   "Channel renamed": "Channel renamed",
   "Channel renamed: %s": "Channel renamed: %s",
   "Channels with persistent history cannot be renamed": "Channels with persistent history cannot be renamed",
+  "Client %d (currently attached client):": "Client %d (currently attached client):",
+  "Client %d:": "Client %d:",
   "Client %s is always-on and cannot be fully removed by /KILL; consider /NS SUSPEND instead": "Client %s is always-on and cannot be fully removed by /KILL; consider /NS SUSPEND instead",
+  "Client ID to logout should be an integer (or \\\"all\\": "Client ID to logout should be an integer (or \\\"all\\",
+  "Client already had the desired nickname": "Client already had the desired nickname",
   "Client reconnected": "Client reconnected",
   "Client reconnected (message history may have been lost)": "Client reconnected (message history may have been lost)",
   "Client reconnected (up to %d seconds of message history lost)": "Client reconnected (up to %d seconds of message history lost)",
   "Command not allowed during a multiline batch": "Command not allowed during a multiline batch",
   "Command restricted": "Command restricted",
+  "Connection:  %s": "Connection:  %s",
   "Core Developers:": "Core Developers:",
   "Could not accept ownership of channel %s": "Could not accept ownership of channel %s",
   "Could not delete message": "Could not delete message",
+  "Could not dispatch verification e-mail": "Could not dispatch verification e-mail",
   "Could not find given client": "Could not find given client",
   "Could not generate EXTJWT token": "Could not generate EXTJWT token",
   "Could not look up account name, proceeding anyway": "Could not look up account name, proceeding anyway",
@@ -102,7 +109,7 @@
   "Could not register": "Could not register",
   "Could not remove ban [%s]": "Could not remove ban [%s]",
   "Could not retrieve history": "Could not retrieve history",
-  "Could not set or change nickname: %s": "Could not set or change nickname: %s",
+  "Could not set or change nickname": "Could not set or change nickname",
   "Could not successfully save new D-LINE: %s": "Could not successfully save new D-LINE: %s",
   "Could not successfully save new K-LINE: %s": "Could not successfully save new K-LINE: %s",
   "Could not transfer channel": "Could not transfer channel",
@@ -131,7 +138,7 @@
   "Error opening export file: %v": "Error opening export file: %v",
   "Error reserving nickname": "Error reserving nickname",
   "Error while unregistering account": "Error while unregistering account",
-  "Fake source must be a valid nickname": "Fake source must be a valid nickname",
+  "Failed to verify account": "Failed to verify account",
   "First param must be a mask or channel": "First param must be a mask or channel",
   "For a more complete list of contributors, see our changelog:": "For a more complete list of contributors, see our changelog:",
   "For more details, try /%s HELP": "For more details, try /%s HELP",
@@ -166,13 +173,17 @@
   "Invalid mode %[1]s parameter: %[2]s": "Invalid mode %[1]s parameter: %[2]s",
   "Invalid mode change": "Invalid mode change",
   "Invalid multiline batch": "Invalid multiline batch",
+  "Invalid nickname": "Invalid nickname",
   "Invalid parameters": "Invalid parameters",
   "Invalid parameters. For usage, do /msg %[1]s HELP %[2]s": "Invalid parameters. For usage, do /msg %[1]s HELP %[2]s",
   "Invalid params": "Invalid params",
   "Invalid regex": "Invalid regex",
+  "Invalid roleplay name": "Invalid roleplay name",
+  "Invalid time duration for NS SUSPEND": "Invalid time duration for NS SUSPEND",
+  "Invalid verification code": "Invalid verification code",
   "Invalid vhost": "Invalid vhost",
   "It was built from git hash %s.": "It was built from git hash %s.",
-  "It was rejected for reason: %s": "It was rejected for reason: %s",
+  "It was compiled using %s.": "It was compiled using %s.",
   "JOIN 0 is not allowed": "JOIN 0 is not allowed",
   "Language %s is not supported by this server": "Language %s is not supported by this server",
   "Language preferences have been set": "Language preferences have been set",
@@ -182,17 +193,19 @@
   "Mask isn't valid": "Mask isn't valid",
   "Message rejected for containing invalid UTF-8": "Message rejected for containing invalid UTF-8",
   "Messages could not be retrieved": "Messages could not be retrieved",
+  "Missing client ID to logout (or \\\"all\\": "Missing client ID to logout (or \\\"all\\",
   "Multiclient functionality is currently disabled for your account": "Multiclient functionality is currently disabled for your account",
   "Multiclient functionality is currently disabled for your account, but you can opt in": "Multiclient functionality is currently disabled for your account, but you can opt in",
   "Multiclient functionality is currently enabled for your account": "Multiclient functionality is currently enabled for your account",
   "Multiclient functionality is currently enabled for your account, but you can opt out": "Multiclient functionality is currently enabled for your account, but you can opt out",
   "Network service, for more info /msg %s HELP": "Network service, for more info /msg %s HELP",
-  "Nickname %[1]s has %[2]d attached session(s)": "Nickname %[1]s has %[2]d attached session(s)",
+  "Nickname %[1]s has %[2]d attached clients(s)": "Nickname %[1]s has %[2]d attached clients(s)",
   "Nickname is already in use": "Nickname is already in use",
   "Nickname is reserved by a different account": "Nickname is reserved by a different account",
   "No DLINEs have been set!": "No DLINEs have been set!",
   "No changes were made": "No changes were made",
   "No nickname given": "No nickname given",
+  "No reason given.": "No reason given.",
   "No such account": "No such account",
   "No such channel": "No such channel",
   "No such module [%s]": "No such module [%s]",
@@ -210,18 +223,23 @@
   "Password changed": "Password changed",
   "Password could not be changed due to server error": "Password could not be changed due to server error",
   "Password incorrect": "Password incorrect",
+  "Password was invalid": "Password was invalid",
   "Permission Denied": "Permission Denied",
   "Permission Denied - You're not an IRC operator": "Permission Denied - You're not an IRC operator",
   "Please wait at least %v and try again": "Please wait at least %v and try again",
   "Purge reason: %s": "Purge reason: %s",
   "Purged at: %s": "Purged at: %s",
   "Purged by operator: %s": "Purged by operator: %s",
+  "RELAYMSG has been disabled": "RELAYMSG has been disabled",
   "Realname is not valid": "Realname is not valid",
+  "Reason: %s": "Reason: %s",
   "Received malformed line": "Received malformed line",
   "Registered at: %s": "Registered at: %s",
   "Registered channel: %s": "Registered channel: %s",
   "Registration requires a valid e-mail address": "Registration requires a valid e-mail address",
   "Rehash complete": "Rehash complete",
+  "Relayed nicknames MUST contain a relaymsg separator from this set: %s": "Relayed nicknames MUST contain a relaymsg separator from this set: %s",
+  "Relayed users cannot receive private messages": "Relayed users cannot receive private messages",
   "Remote servers not yet supported": "Remote servers not yet supported",
   "Removed D-Line for %s": "Removed D-Line for %s",
   "Removed K-Line for %s": "Removed K-Line for %s",
@@ -240,12 +258,10 @@
   "SASL message too long": "SASL message too long",
   "SUMMON has been disabled": "SUMMON has been disabled",
   "Server notice masks": "Server notice masks",
-  "Session %d (currently attached session):": "Session %d (currently attached session):",
-  "Session %d:": "Session %d:",
   "Some additional message history may have been lost": "Some additional message history may have been lost",
+  "Specified client ID does not exist": "Specified client ID does not exist",
   "Started exporting data for account %[1]s to file %[2]s": "Started exporting data for account %[1]s to file %[2]s",
   "Successfully accepted ownership of channel %s": "Successfully accepted ownership of channel %s",
-  "Successfully approved vhost request for %s": "Successfully approved vhost request for %s",
   "Successfully changed the channel settings": "Successfully changed the channel settings",
   "Successfully changed your account settings": "Successfully changed your account settings",
   "Successfully cleared vhost": "Successfully cleared vhost",
@@ -254,9 +270,11 @@
   "Successfully enabled your vhost": "Successfully enabled your vhost",
   "Successfully granted operator privileges": "Successfully granted operator privileges",
   "Successfully grouped nick %s with your account": "Successfully grouped nick %s with your account",
+  "Successfully logged out all sessions": "Successfully logged out all sessions",
+  "Successfully logged out session": "Successfully logged out session",
   "Successfully purged channel %s from the server": "Successfully purged channel %s from the server",
   "Successfully registered account %s": "Successfully registered account %s",
-  "Successfully rejected vhost request for %s": "Successfully rejected vhost request for %s",
+  "Successfully removed operator privileges": "Successfully removed operator privileges",
   "Successfully reset channel access": "Successfully reset channel access",
   "Successfully set persistent mode %[1]s on %[2]s": "Successfully set persistent mode %[1]s on %[2]s",
   "Successfully set vhost": "Successfully set vhost",
@@ -266,19 +284,17 @@
   "Successfully ungrouped nick %s with your account": "Successfully ungrouped nick %s with your account",
   "Successfully unpurged channel %s from the server": "Successfully unpurged channel %s from the server",
   "Successfully unregistered account %s": "Successfully unregistered account %s",
+  "Target has no privileges to remove": "Target has no privileges to remove",
   "That certificate fingerprint is already associated with another account": "That certificate fingerprint is already associated with another account",
   "That certificate fingerprint was already authorized": "That certificate fingerprint was already authorized",
   "That channel is not registered": "That channel is not registered",
   "That nickname is already reserved by someone else": "That nickname is already reserved by someone else",
   "That nickname is not registered": "That nickname is not registered",
-  "That vhost isn't being offered by the server": "That vhost isn't being offered by the server",
+  "The message must not be blank": "The message must not be blank",
-  "The following vhosts are available and can be chosen with /HOSTSERV TAKE:": "The following vhosts are available and can be chosen with /HOSTSERV TAKE:",
-  "The server does not offer any vhosts": "The server does not offer any vhosts",
-  "The server does not offer any vhosts, but you can request one with /HOSTSERV REQUEST": "The server does not offer any vhosts, but you can request one with /HOSTSERV REQUEST",
   "The stored channel history setting is: %s": "The stored channel history setting is: %s",
   "There are %[1]d certificate fingerprint(s) authorized for account %[2]s.": "There are %[1]d certificate fingerprint(s) authorized for account %[2]s.",
-  "There are %[1]d pending requests for vhosts (%[2]d displayed)": "There are %[1]d pending requests for vhosts (%[2]d displayed)",
   "There are %[1]d users and %[2]d invisible on %[3]d server(s)": "There are %[1]d users and %[2]d invisible on %[3]d server(s)",
+  "There are %d active suspensions.": "There are %d active suspensions.",
   "There was no such nickname": "There was no such nickname",
   "They aren't on that channel": "They aren't on that channel",
   "This ban matches you. To DLINE yourself, you must use the command:  /DLINE MYSELF <arguments>": "This ban matches you. To DLINE yourself, you must use the command:  /DLINE MYSELF <arguments>",
@@ -289,6 +305,7 @@
   "This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.": "This server is in debug mode and is logging all user I/O. If you do not wish for everything you send to be readable by the server owner(s), please disconnect.",
   "This server requires that you wait %v after connecting before you can use /LIST. You have %v left.": "This server requires that you wait %v after connecting before you can use /LIST. You have %v left.",
   "This server was created %s": "This server was created %s",
+  "This user's nickname and account name need to be equal": "This user's nickname and account name need to be equal",
   "This vhost is currently disabled, but can be enabled with /HS ON": "This vhost is currently disabled, but can be enabled with /HS ON",
   "Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it": "Timestamp is not in 2006-01-02T15:04:05.999Z format, ignoring it",
   "To change a password, use the PASSWD command. For details, /msg NickServ HELP PASSWD": "To change a password, use the PASSWD command. For details, /msg NickServ HELP PASSWD",
@@ -305,11 +322,11 @@
   "Unknown subcommand": "Unknown subcommand",
   "Unrecognized DEBUG subcommand": "Unrecognized DEBUG subcommand",
   "Usage: REGISTER <passphrase> [email]": "Usage: REGISTER <passphrase> [email]",
-  "User %s is no longer allowed to use vhosts": "User %s is no longer allowed to use vhosts",
-  "User %s is now allowed to use vhosts": "User %s is now allowed to use vhosts",
   "User doesn't have roleplaying mode enabled": "User doesn't have roleplaying mode enabled",
   "User is already on that channel": "User is already on that channel",
   "User is currently disconnected": "User is currently disconnected",
+  "Username invalid or not given": "Username invalid or not given",
+  "Username is already registered or otherwise unavailable": "Username is already registered or otherwise unavailable",
   "Verification code: %s": "Verification code: %s",
   "Verify your account on %s": "Verify your account on %s",
   "WEBIRC command is not usable from your address or incorrect password given": "WEBIRC command is not usable from your address or incorrect password given",
@@ -326,8 +343,10 @@
   "You can't mix secure and insecure connections to this account": "You can't mix secure and insecure connections to this account",
   "You can't remove all your certificate fingerprints unless you add a password": "You can't remove all your certificate fingerprints unless you add a password",
   "You can't ungroup your primary nickname (try unregistering your account instead)": "You can't ungroup your primary nickname (try unregistering your account instead)",
+  "You cannot relay messages to this channel": "You cannot relay messages to this channel",
   "You don't have enough channel privileges": "You don't have enough channel privileges",
   "You don't own that nick": "You don't own that nick",
+  "You have already registered or attempted to register": "You have already registered or attempted to register",
   "You have already registered the maximum number of channels; try dropping some with /CS UNREGISTER": "You have already registered the maximum number of channels; try dropping some with /CS UNREGISTER",
   "You have been banned from this server (%s)": "You have been banned from this server (%s)",
   "You have been marked as being away": "You have been marked as being away",
@@ -335,15 +354,16 @@
   "You have enabled autoreplay of missed messages, but you can't receive them because your client isn't set to always-on": "You have enabled autoreplay of missed messages, but you can't receive them because your client isn't set to always-on",
   "You have sent too many registration messages": "You have sent too many registration messages",
   "You have too many nicks reserved already (you can remove some with /NS DROP)": "You have too many nicks reserved already (you can remove some with /NS DROP)",
+  "You may not change your nickname": "You may not change your nickname",
   "You may not reregister": "You may not reregister",
   "You must be an oper on the channel to register it": "You must be an oper on the channel to register it",
   "You must be connected with TLS and a client certificate to do this": "You must be connected with TLS and a client certificate to do this",
+  "You must complete the connection before registering your account": "You must complete the connection before registering your account",
+  "You must complete the connection before verifying your account": "You must complete the connection before verifying your account",
   "You must have rehash permissions in order to execute DEBUG CRASHSERVER": "You must have rehash permissions in order to execute DEBUG CRASHSERVER",
   "You must log in with SASL to join this server": "You must log in with SASL to join this server",
   "You must specify an account": "You must specify an account",
   "You must use your account name as your nickname": "You must use your account name as your nickname",
-  "You must wait an additional %v before making another request": "You must wait an additional %v before making another request",
-  "You must wait an additional %v before taking a vhost": "You must wait an additional %v before taking a vhost",
   "You need to register before you can use that command": "You need to register before you can use that command",
   "You specified too many languages": "You specified too many languages",
   "You weren't offered ownership of channel %s": "You weren't offered ownership of channel %s",
@@ -367,18 +387,16 @@
   "Your stored auto-away setting is: %s": "Your stored auto-away setting is: %s",
   "Your stored direct message history setting is: %s": "Your stored direct message history setting is: %s",
   "Your stored nickname enforcement setting is: %s": "Your stored nickname enforcement setting is: %s",
-  "Your vhost request was approved by an administrator": "Your vhost request was approved by an administrator",
-  "Your vhost request was rejected by an administrator": "Your vhost request was rejected by an administrator",
-  "Your vhost request was rejected by an administrator. The reason given was: %s": "Your vhost request was rejected by an administrator. The reason given was: %s",
-  "Your vhost request will be reviewed by an administrator": "Your vhost request will be reviewed by an administrator",
   "are supported by this server": "are supported by this server",
   "channels formed": "channels formed",
   "has client certificate fingerprint %s": "has client certificate fingerprint %s",
+  "indefinite": "indefinite",
   "is a $bBot$b on %s": "is a $bBot$b on %s",
   "is a network service": "is a network service",
   "is an unknown mode character to me": "is an unknown mode character to me",
   "is logged in as": "is logged in as",
   "is using a secure connection": "is using a secure connection",
+  "is using modes +%s": "is using modes +%s",
   "seconds idle, signon time": "seconds idle, signon time",
   "unregistered connections": "unregistered connections"
 }

languages/example/nickserv.lang.json

@@ -4,6 +4,7 @@
   "$bAUTOREPLAY-LINES$b\n'autoreplay-lines' controls the number of lines of channel history that will\nbe replayed to you automatically when joining a channel. Your options are any\npositive number, 0 to disable the feature, and 'default' to use the server\ndefault.": "$bAUTOREPLAY-LINES$b\n'autoreplay-lines' controls the number of lines of channel history that will\nbe replayed to you automatically when joining a channel. Your options are any\npositive number, 0 to disable the feature, and 'default' to use the server\ndefault.",
   "$bAUTOREPLAY-MISSED$b\n'autoreplay-missed' is only effective for always-on clients. If enabled,\nif you have at most one active session, the server will remember the time\nyou disconnect and then replay missed messages to you when you reconnect.\nYour options are 'on' and 'off'.": "$bAUTOREPLAY-MISSED$b\n'autoreplay-missed' is only effective for always-on clients. If enabled,\nif you have at most one active session, the server will remember the time\nyou disconnect and then replay missed messages to you when you reconnect.\nYour options are 'on' and 'off'.",
   "$bCERT$b controls a user account's certificate fingerprints": "$bCERT$b controls a user account's certificate fingerprints",
+  "$bCLIENTS$b can list and logout the sessions attached to a nickname.": "$bCLIENTS$b can list and logout the sessions attached to a nickname.",
   "$bDM-HISTORY$b\n'dm-history' is only effective for always-on clients. It lets you control\nhow the history of your direct messages is stored. Your options are:\n1. 'off'        [no history]\n2. 'ephemeral'  [a limited amount of temporary history, not stored on disk]\n3. 'on'         [history stored in a permanent database, if available]\n4. 'default'    [use the server default]": "$bDM-HISTORY$b\n'dm-history' is only effective for always-on clients. It lets you control\nhow the history of your direct messages is stored. Your options are:\n1. 'off'        [no history]\n2. 'ephemeral'  [a limited amount of temporary history, not stored on disk]\n3. 'on'         [history stored in a permanent database, if available]\n4. 'default'    [use the server default]",
   "$bDROP$b de-links your current (or the given) nickname from your user account.": "$bDROP$b de-links your current (or the given) nickname from your user account.",
   "$bENFORCE$b\n'enforce' lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none'    [no enforcement, overriding the server default]\n2. 'strict'  [you must already be authenticated to use the nick]\n3. 'default' [use the server default]": "$bENFORCE$b\n'enforce' lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none'    [no enforcement, overriding the server default]\n2. 'strict'  [you must already be authenticated to use the nick]\n3. 'default' [use the server default]",
@@ -22,11 +23,9 @@
   "$bSAGET$b queries the current values of another user's account settings": "$bSAGET$b queries the current values of another user's account settings",
   "$bSAREGISTER$b registers an account on someone else's behalf.": "$bSAREGISTER$b registers an account on someone else's behalf.",
   "$bSASET$b modifies another user's account settings": "$bSASET$b modifies another user's account settings",
-  "$bSESSIONS$b lists the sessions attached to a nickname.": "$bSESSIONS$b lists the sessions attached to a nickname.",
   "$bSET$b modifies your account settings": "$bSET$b modifies your account settings",
-  "$bSUSPEND$b disables an account and disconnects the clients": "$bSUSPEND$b disables an account and disconnects the clients",
+  "$bSUSPEND$b manages account suspensions": "$bSUSPEND$b manages account suspensions",
   "$bUNREGISTER$b lets you delete your user account.": "$bUNREGISTER$b lets you delete your user account.",
-  "$bUNSUSPEND$b restores access to a suspended account": "$bUNSUSPEND$b restores access to a suspended account",
   "$bVERIFY$b lets you complete account registration.": "$bVERIFY$b lets you complete account registration.",
   "Insufficient privileges": "Insufficient privileges",
   "Invalid parameters": "Invalid parameters",
@@ -35,6 +34,7 @@
   "Passwords do not match": "Passwords do not match",
   "Syntax $bSET <setting> <value>$b\n\nSET modifies your account settings. The following settings are available:": "Syntax $bSET <setting> <value>$b\n\nSET modifies your account settings. The following settings are available:",
   "Syntax: $bCERT <LIST | ADD | DEL> [account] [certfp]$b\n\nCERT examines or modifies the TLS certificate fingerprints that can be used to\nlog into an account. Specifically, $bCERT LIST$b lists the authorized\nfingerprints, $bCERT ADD <fingerprint>$b adds a new fingerprint, and\n$bCERT DEL <fingerprint>$b removes a fingerprint. If you're an IRC operator\nwith the correct permissions, you can act on another user's account, for\nexample with $bCERT ADD <account> <fingerprint>$b.": "Syntax: $bCERT <LIST | ADD | DEL> [account] [certfp]$b\n\nCERT examines or modifies the TLS certificate fingerprints that can be used to\nlog into an account. Specifically, $bCERT LIST$b lists the authorized\nfingerprints, $bCERT ADD <fingerprint>$b adds a new fingerprint, and\n$bCERT DEL <fingerprint>$b removes a fingerprint. If you're an IRC operator\nwith the correct permissions, you can act on another user's account, for\nexample with $bCERT ADD <account> <fingerprint>$b.",
+  "Syntax: $bCLIENTS LIST [nickname]$b\n\nCLIENTS LIST shows information about the clients currently attached, via\nthe server's multiclient functionality, to your nickname. An administrator\ncan use this command to list another user's clients.\n\nSyntax: $bCLIENTS LOGOUT [nickname] [client_id/all]$b\n\nCLIENTS LOGOUT detaches a single client, or all other clients currently\nattached, via the server's multiclient functionality, to your nickname. An\nadministrator can use this command to logout another user's clients.": "Syntax: $bCLIENTS LIST [nickname]$b\n\nCLIENTS LIST shows information about the clients currently attached, via\nthe server's multiclient functionality, to your nickname. An administrator\ncan use this command to list another user's clients.\n\nSyntax: $bCLIENTS LOGOUT [nickname] [client_id/all]$b\n\nCLIENTS LOGOUT detaches a single client, or all other clients currently\nattached, via the server's multiclient functionality, to your nickname. An\nadministrator can use this command to logout another user's clients.",
   "Syntax: $bDROP [nickname]$b\n\nDROP de-links the given (or your current) nickname from your user account.": "Syntax: $bDROP [nickname]$b\n\nDROP de-links the given (or your current) nickname from your user account.",
   "Syntax: $bENFORCE [method]$b\n\nENFORCE is an alias for $bGET enforce$b and $bSET enforce$b. See the help\nentry for $bSET$b for more information.": "Syntax: $bENFORCE [method]$b\n\nENFORCE is an alias for $bGET enforce$b and $bSET enforce$b. See the help\nentry for $bSET$b for more information.",
   "Syntax: $bERASE <username> [code]$b\n\nERASE deletes all records of an account, allowing it to be re-registered.\nThis should be used with caution, because it violates an expectation that\naccount names are permanent identifiers. Typically, UNREGISTER should be\nused instead. A confirmation code is required; invoking the command\nwithout a code will display the necessary code.": "Syntax: $bERASE <username> [code]$b\n\nERASE deletes all records of an account, allowing it to be re-registered.\nThis should be used with caution, because it violates an expectation that\naccount names are permanent identifiers. Typically, UNREGISTER should be\nused instead. A confirmation code is required; invoking the command\nwithout a code will display the necessary code.",
@@ -50,10 +50,9 @@
   "Syntax: $bSAGET <account> <setting>$b\n\nSAGET queries the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.": "Syntax: $bSAGET <account> <setting>$b\n\nSAGET queries the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.",
   "Syntax: $bSAREGISTER <username> [password]$b\n\nSAREGISTER registers an account on someone else's behalf.\nThis is for use in configurations that require SASL for all connections;\nan administrator can set use this command to set up user accounts.": "Syntax: $bSAREGISTER <username> [password]$b\n\nSAREGISTER registers an account on someone else's behalf.\nThis is for use in configurations that require SASL for all connections;\nan administrator can set use this command to set up user accounts.",
   "Syntax: $bSASET <account> <setting> <value>$b\n\nSASET modifies the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.": "Syntax: $bSASET <account> <setting> <value>$b\n\nSASET modifies the values of someone else's account settings. For more\ninformation on the settings and their possible values, see HELP SET.",
-  "Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS lists information about the sessions currently attached, via\nthe server's multiclient functionality, to your nickname. An administrator\ncan use this command to list another user's sessions.": "Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS lists information about the sessions currently attached, via\nthe server's multiclient functionality, to your nickname. An administrator\ncan use this command to list another user's sessions.",
+  "Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS is an alias for $bCLIENTS LIST$b. See the help entry for $bCLIENTS$b\nfor more information.": "Syntax: $bSESSIONS [nickname]$b\n\nSESSIONS is an alias for $bCLIENTS LIST$b. See the help entry for $bCLIENTS$b\nfor more information.",
-  "Syntax: $bSUSPEND <nickname>$b\n\nSUSPEND disables an account and disconnects the associated clients.": "Syntax: $bSUSPEND <nickname>$b\n\nSUSPEND disables an account and disconnects the associated clients.",
+  "Syntax: $bSUSPEND ADD <nickname> [DURATION duration] [reason]$b\n        $bSUSPEND DEL <nickname>$b\n        $bSUSPEND LIST$b\n\nSuspending an account disables it (preventing new logins) and disconnects\nall associated clients. You can specify a time limit or a reason for\nthe suspension. The $bDEL$b subcommand reverses a suspension, and the $bLIST$b\ncommand lists all current suspensions.": "Syntax: $bSUSPEND ADD <nickname> [DURATION duration] [reason]$b\n        $bSUSPEND DEL <nickname>$b\n        $bSUSPEND LIST$b\n\nSuspending an account disables it (preventing new logins) and disconnects\nall associated clients. You can specify a time limit or a reason for\nthe suspension. The $bDEL$b subcommand reverses a suspension, and the $bLIST$b\ncommand lists all current suspensions.",
   "Syntax: $bUNREGISTER <username> [code]$b\n\nUNREGISTER lets you delete your user account (or someone else's, if you're an\nIRC operator with the correct permissions). To prevent accidental\nunregistrations, a verification code is required; invoking the command without\na code will display the necessary code.": "Syntax: $bUNREGISTER <username> [code]$b\n\nUNREGISTER lets you delete your user account (or someone else's, if you're an\nIRC operator with the correct permissions). To prevent accidental\nunregistrations, a verification code is required; invoking the command without\na code will display the necessary code.",
-  "Syntax: $bUNSUSPEND <nickname>$b\n\nUNSUSPEND reverses a previous SUSPEND, restoring access to the account.": "Syntax: $bUNSUSPEND <nickname>$b\n\nUNSUSPEND reverses a previous SUSPEND, restoring access to the account.",
   "Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification.": "Syntax: $bVERIFY <username> <code>$b\n\nVERIFY lets you complete an account registration, if the server requires email\nor other verification.",
   "You're not logged into an account": "You're not logged into an account"
 }