Update example language files and translation grabber

languages/example-chanserv.lang.json

@@ -0,0 +1,7 @@
+{
+  "ChanServ lets you register and manage channels.\n\nTo see in-depth help for a specific ChanServ command, try:\n    $b/CS HELP <command>$b\n\nHere are the commands you can use:\n%s": "ChanServ lets you register and manage channels.\n\nTo see in-depth help for a specific ChanServ command, try:\n    $b/CS HELP <command>$b\n\nHere are the commands you can use:\n%s",
+  "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: $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.",
+  "Syntax: $bREGISTER #channel$b\n\nREGISTER lets you own the given channel. If you rejoin this channel, you'll be\ngiven admin privs on it. Modes set on the channel and the topic will also be\nremembered.": "Syntax: $bREGISTER #channel$b\n\nREGISTER lets you own the given channel. If you rejoin this channel, you'll be\ngiven admin privs on it. Modes set on the channel and the topic will also be\nremembered.",
+  "Syntax: $bUNREGISTER #channel [code]$b\n\nUNREGISTER deletes a channel registration, allowing someone else to claim it.\nTo prevent accidental unregistrations, a verification code is required;\ninvoking the command without a code will display the necessary code.": "Syntax: $bUNREGISTER #channel [code]$b\n\nUNREGISTER deletes a channel registration, allowing someone else to claim it.\nTo prevent accidental unregistrations, a verification code is required;\ninvoking the command without a code will display the necessary code."
+}

languages/example-help.lang.json

@@ -15,6 +15,8 @@
   "DLINE [ANDKILL] [MYSELF] [duration] <ip>/<net> [ON <server>] [reason [| oper reason]]\nDLINE LIST\n\nBans an IP address or network from connecting to the server. If the duration is\ngiven then only for that long. The reason is shown to the user themselves, but\neveryone else will see a standard message. The oper reason is shown to\noperators getting info about the DLINEs that exist.\n\nBans are saved across subsequent launches of the server.\n\n\"ANDKILL\" means that all matching clients are also removed from the server.\n\n\"MYSELF\" is required when the DLINE matches the address the person applying it is connected\nfrom. If \"MYSELF\" is not given, trying to DLINE yourself will result in an error.\n\n[duration] can be of the following forms:\n\t1y 12mo 31d 10h 8m 13s\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24\n\nON <server> specifies that the ban is to be set on that specific server.\n\n[reason] and [oper reason], if they exist, are separated by a vertical bar (|).\n\nIf \"DLINE LIST\" is sent, the server sends back a list of our current DLINEs.": "DLINE [ANDKILL] [MYSELF] [duration] <ip>/<net> [ON <server>] [reason [| oper reason]]\nDLINE LIST\n\nBans an IP address or network from connecting to the server. If the duration is\ngiven then only for that long. The reason is shown to the user themselves, but\neveryone else will see a standard message. The oper reason is shown to\noperators getting info about the DLINEs that exist.\n\nBans are saved across subsequent launches of the server.\n\n\"ANDKILL\" means that all matching clients are also removed from the server.\n\n\"MYSELF\" is required when the DLINE matches the address the person applying it is connected\nfrom. If \"MYSELF\" is not given, trying to DLINE yourself will result in an error.\n\n[duration] can be of the following forms:\n\t1y 12mo 31d 10h 8m 13s\n\n<net> is specified in typical CIDR notation. For example:\n\t127.0.0.1/8\n\t8.8.8.8/24\n\nON <server> specifies that the ban is to be set on that specific server.\n\n[reason] and [oper reason], if they exist, are separated by a vertical bar (|).\n\nIf \"DLINE LIST\" is sent, the server sends back a list of our current DLINEs.",
   "HELP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "HELP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.",
   "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.",
+  "HOSTSERV <command> [params]\n\nHostServ lets you manage your vhost (a string displayed in place of your\nreal hostname).": "HOSTSERV <command> [params]\n\nHostServ lets you manage your vhost (a string displayed in place of your\nreal hostname).",
+  "HS <command> [params]\n\nHostServ lets you manage your vhost (a string displayed in place of your\nreal hostname).": "HS <command> [params]\n\nHostServ lets you manage your vhost (a string displayed in place of your\nreal hostname).",
   "INFO\n\nSends information about the server, developers, etc.": "INFO\n\nSends information about the server, developers, etc.",
   "INVITE <nickname> <channel>\n\nInvites the given user to the given channel, so long as you have the\nappropriate channel privs.": "INVITE <nickname> <channel>\n\nInvites the given user to the given channel, so long as you have the\nappropriate channel privs.",
   "ISON <nickname>{ <nickname>}\n\nReturns whether the given nicks exist on the network.": "ISON <nickname>{ <nickname>}\n\nReturns whether the given nicks exist on the network.",
@@ -41,13 +43,13 @@
   "PING <args>...\n\nRequests a PONG. Used to check link connectivity.": "PING <args>...\n\nRequests a PONG. Used to check link connectivity.",
   "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.",
-  "PROXY TCP4/6 <sourceip> <destip> <sourceport> <destport>\n\nUsed by haproxy's PROXY v1 protocol, to allow for alternate TLS support:\nhttp://www.haproxy.org/download/1.8/doc/proxy-protocol.txt": "PROXY TCP4/6 <sourceip> <destip> <sourceport> <destport>\n\nUsed by haproxy's PROXY v1 protocol, to allow for alternate TLS support:\nhttp://www.haproxy.org/download/1.8/doc/proxy-protocol.txt",
   "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.",
   "REHASH\n\nReloads the config file and updates TLS certificates on listeners": "REHASH\n\nReloads the config file and updates TLS certificates on listeners",
   "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",
   "RPL_ISUPPORT PREFIX\n\nOragono supports the following channel membership 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.": "RPL_ISUPPORT PREFIX\n\nOragono supports the following channel membership 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.",
+  "SAJOIN [nick] #channel{,#channel}\n\nForcibly joins a user to a channel, ignoring restrictions like bans, user limits\nand channel keys. If [nick] is omitted, it defaults to the operator.": "SAJOIN [nick] #channel{,#channel}\n\nForcibly joins a user to a channel, ignoring restrictions like bans, user limits\nand channel keys. If [nick] is omitted, it defaults to the operator.",
   "SAMODE <target> [<modestring> [<mode arguments>...]]\n\nForcibly sets and removes modes from the given target -- only available to\nopers. For more specific information on mode characters, see the help for\n\"cmode\" and \"umode\".": "SAMODE <target> [<modestring> [<mode arguments>...]]\n\nForcibly sets and removes modes from the given target -- only available to\nopers. For more specific information on mode characters, see the help for\n\"cmode\" and \"umode\".",
   "SANICK <currentnick> <newnick>\n\nGives the given user a new nickname.": "SANICK <currentnick> <newnick>\n\nGives the given user a new nickname.",
   "SCENE <target> <text to be sent>\n\nThe SCENE command is used to send a scene notification to the given target.": "SCENE <target> <text to be sent>\n\nThe SCENE command is used to send a scene notification to the given target.",

languages/example-hostserv.lang.json

@@ -0,0 +1,12 @@
+{
+  "HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).\n\nTo see in-depth help for a specific HostServ command, try:\n    $b/HS HELP <command>$b\n\nHere are the commands you can use:\n%s": "HostServ lets you manage your vhost (i.e., the string displayed\nin place of your client's hostname/IP).\n\nTo see in-depth help for a specific HostServ command, try:\n    $b/HS HELP <command>$b\n\nHere are the commands you can use:\n%s",
+  "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: $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: $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: $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: $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: $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."
+}

languages/example-irc.lang.json

@@ -1,15 +1,24 @@
 {
-  "%d IRC Operators online": "%d IRC Operators online",
-  "%d channels formed": "%d channels formed",
-  "*** $bChanServ HELP$b ***": "*** $bChanServ HELP$b ***",
-  "*** $bEnd of ChanServ HELP$b ***": "*** $bEnd of ChanServ HELP$b ***",
-  "*** $bEnd of NickServ HELP$b ***": "*** $bEnd of NickServ HELP$b ***",
-  "*** $bNickServ HELP$b ***": "*** $bNickServ HELP$b ***",
+  "$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",
+  "%d. User %s requests vhost: %s": "%d. User %s requests vhost: %s",
+  "%s [account: %s] joined the channel": "%s [account: %s] joined the channel",
+  "%s joined the channel": "%s joined the channel",
+  "%s kicked %s (%s)": "%s kicked %s (%s)",
+  "%s left the channel (%s)": "%s left the channel (%s)",
+  "%s quit (%s)": "%s quit (%s)",
+  "*** $bEnd of %s HELP$b ***": "*** $bEnd of %s HELP$b ***",
   "*** Could not find your username": "*** Could not find your username",
   "*** Found your username": "*** Found your username",
   "*** Got a malformed username, ignoring": "*** Got a malformed username, ignoring",
   "*** Looking up your username": "*** Looking up your username",
   "- %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 request is pending for vhost: %s": "A request is pending for vhost: %s",
+  "A request was previously made for vhost: %s": "A request was previously made for vhost: %s",
+  "Account %s has no vhost": "Account %s has no vhost",
+  "Account %s has vhost: %s": "Account %s has vhost: %s",
+  "Account %s receives mode +%s": "Account %s receives mode +%s",
   "Account already exists": "Account already exists",
   "Account created": "Account created",
   "Account created, pending verification; verification code has been sent to %s:%s": "Account created, pending verification; verification code has been sent to %s:%s",
@@ -25,32 +34,36 @@
   "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 account already exists for your certificate fingerprint": "An account already exists for your certificate fingerprint",
+  "An error occurred": "An error occurred",
   "Authentication successful": "Authentication successful",
+  "Bad or unauthorized PROXY command": "Bad or unauthorized PROXY command",
   "Bad password": "Bad password",
   "Ban - %[1]s - added by %[2]s - %[3]s": "Ban - %[1]s - added by %[2]s - %[3]s",
   "Callback namespace is not supported": "Callback namespace is not supported",
   "Can't change modes for other users": "Can't change modes for other users",
   "Can't view modes for other users": "Can't view modes for other users",
   "Cannot join channel (+%s)": "Cannot join channel (+%s)",
+  "Cannot resume connection": "Cannot resume connection",
   "Cannot resume connection, connection registration has already been completed": "Cannot resume connection, connection registration has already been completed",
-  "Cannot resume connection, old and new clients must be logged into the same account": "Cannot resume connection, old and new clients must be logged into the same account",
+  "Cannot resume connection, invalid resume token": "Cannot resume connection, invalid resume token",
   "Cannot resume connection, old and new clients must have TLS": "Cannot resume connection, old and new clients must have TLS",
   "Cannot resume connection, old client not found": "Cannot resume connection, old client not found",
-  "Cannot resume connection, old nickname contains spaces": "Cannot resume connection, old nickname contains spaces",
   "Cannot send to channel": "Cannot send to channel",
+  "Change was a no-op": "Change was a no-op",
+  "Channel %s has %d persistent modes set": "Channel %s has %d persistent modes set",
+  "Channel %s is now unregistered": "Channel %s is now unregistered",
   "Channel %s successfully registered": "Channel %s successfully registered",
   "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 registered": "Channel is not registered",
   "Channel list is full": "Channel list is full",
   "Channel name is not valid": "Channel name is not valid",
-  "Channel registration is not enabled": "Channel registration is not enabled",
   "Channel renamed: %s": "Channel renamed: %s",
   "Client reconnected": "Client reconnected",
-  "Command error. Please report this to the developers": "Command error. Please report this to the developers",
+  "Client reconnected (up to %d seconds of history lost)": "Client reconnected (up to %d seconds of history lost)",
   "Command restricted": "Command restricted",
   "Contributors and Former Developers:": "Contributors and Former Developers:",
   "Core Developers:": "Core Developers:",
-  "Could not apply mode changes: +%s": "Could not apply mode changes: +%s",
   "Could not find given client": "Could not find given client",
   "Could not login with your TLS certificate or supplied username/password": "Could not login with your TLS certificate or supplied username/password",
   "Could not parse IP address or CIDR network": "Could not parse IP address or CIDR network",
@@ -70,6 +83,7 @@
   "End of WHO list": "End of WHO list",
   "End of WHOWAS": "End of WHOWAS",
   "End of list": "End of list",
+  "Enforcement method set": "Enforcement method set",
   "Erroneous nickname": "Erroneous nickname",
   "Error reserving nickname": "Error reserving nickname",
   "Error while unregistering account": "Error while unregistering account",
@@ -79,22 +93,31 @@
   "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.": "HELPOP <argument>\n\nGet an explanation of <argument>, or \"index\" for a list of help topics.",
   "Help not found": "Help not found",
   "I have %[1]d clients and %[2]d servers": "I have %[1]d clients and %[2]d servers",
+  "IRC Operators online": "IRC Operators online",
   "Insufficient oper privs": "Insufficient oper privs",
+  "Insufficient privileges": "Insufficient privileges",
+  "Internal error": "Internal error",
   "Invalid CAP subcommand": "Invalid CAP subcommand",
-  "Invalid username": "Invalid username",
+  "Invalid account name": "Invalid account name",
+  "Invalid mode change": "Invalid mode change",
+  "Invalid parameters": "Invalid parameters",
+  "Invalid parameters. For usage, do /msg %s HELP %s": "Invalid parameters. For usage, do /msg %s HELP %s",
+  "Invalid vhost": "Invalid vhost",
+  "It was rejected for reason: %s": "It was rejected for reason: %s",
   "JOIN 0 is not allowed": "JOIN 0 is not allowed",
   "Language preferences have been set": "Language preferences have been set",
   "Languages are not supported by this server": "Languages are not supported by this server",
-  "Login has been disabled": "Login has been disabled",
   "MOTD File is missing": "MOTD File is missing",
   "Malformed username": "Malformed username",
   "Mask isn't valid": "Mask isn't valid",
+  "Network service, for more info /msg %s HELP": "Network service, for more info /msg %s HELP",
   "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 command given": "No command given",
   "No masks given": "No masks given",
   "No nickname given": "No nickname given",
+  "No such account": "No such account",
   "No such channel": "No such channel",
   "No such nick": "No such nick",
   "No topic is set": "No topic is set",
@@ -102,10 +125,13 @@
   "Not enough parameters": "Not enough parameters",
   "Only channel founders can change registered channels": "Only channel founders can change registered channels",
   "Oragono is released under the MIT license.": "Oragono is released under the MIT license.",
-  "PROXY command is not usable from your address": "PROXY command is not usable from your address",
+  "Passphrase contains forbidden characters or is otherwise invalid": "Passphrase contains forbidden characters or is otherwise invalid",
+  "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",
   "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",
   "Proxied IP address is not valid: [%s]": "Proxied IP address is not valid: [%s]",
   "Received malformed line": "Received malformed line",
   "Registered at: %s": "Registered at: %s",
@@ -114,6 +140,7 @@
   "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",
+  "Resume may have lost up to %d seconds of history": "Resume may have lost up to %d seconds of history",
   "SASL authentication aborted": "SASL authentication aborted",
   "SASL authentication failed": "SASL authentication failed",
   "SASL authentication failed, you are not connecting with a certificate": "SASL authentication failed, you are not connecting with a certificate",
@@ -123,28 +150,38 @@
   "SASL authentication failed: authcid and authzid should be the same": "SASL authentication failed: authcid and authzid should be the same",
   "SASL message too long": "SASL message too long",
   "Server notice masks": "Server notice masks",
+  "Some additional message history may have been lost": "Some additional message history may have been lost",
+  "Successfully approved vhost request for %s": "Successfully approved vhost request for %s",
+  "Successfully cleared vhost": "Successfully cleared vhost",
+  "Successfully disabled your vhost": "Successfully disabled your vhost",
+  "Successfully enabled your vhost": "Successfully enabled your vhost",
   "Successfully grouped nick %s with your account": "Successfully grouped nick %s with your account",
   "Successfully op'd in channel %s": "Successfully op'd in channel %s",
+  "Successfully rejected vhost request for %s": "Successfully rejected vhost request for %s",
+  "Successfully set mode %s": "Successfully set mode %s",
+  "Successfully set vhost": "Successfully set vhost",
   "Successfully ungrouped nick %s with your account": "Successfully ungrouped nick %s with your account",
   "Successfully unregistered account %s": "Successfully unregistered account %s",
-  "Syntax: $bOP #channel [nickname]$b": "Syntax: $bOP #channel [nickname]$b",
-  "Syntax: $bREGISTER #channel$b": "Syntax: $bREGISTER #channel$b",
   "Thanks to Jeremy Latt for founding Ergonomadic, the project this is based on": "Thanks to Jeremy Latt for founding Ergonomadic, the project this is based on",
   "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",
   "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 pending requests for vhosts (%d displayed)": "There are %d pending requests for vhosts (%d displayed)",
   "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>",
   "This ban matches you. To KLINE yourself, you must use the command:  /KLINE MYSELF <arguments>": "This ban matches you. To KLINE yourself, you must use the command:  /KLINE MYSELF <arguments>",
+  "This command has been disabled by the server administrators": "This command has been disabled by the server administrators",
   "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 was created %s": "This server was created %s",
+  "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 confirm account unregistration, type: /NS UNREGISTER %s %s": "To confirm account unregistration, type: /NS UNREGISTER %s %s",
+  "To confirm channel unregistration, type: /CS UNREGISTER %s %s": "To confirm channel unregistration, type: /CS UNREGISTER %s %s",
   "To verify your account, issue one of these commands:": "To verify your account, issue one of these commands:",
   "Translators:": "Translators:",
   "Unknown command": "Unknown command",
-  "Unknown command. To see available commands, run /CS HELP": "Unknown command. To see available commands, run /CS HELP",
-  "Unknown command. To see available commands, run /NS HELP": "Unknown command. To see available commands, run /NS HELP",
+  "Unknown command. To see available commands, run": "Unknown command. To see available commands, run",
   "Unknown subcommand": "Unknown subcommand",
   "User doesn't have roleplaying mode enabled": "User doesn't have roleplaying mode enabled",
   "Verification code: %s": "Verification code: %s",
@@ -158,15 +195,16 @@
   "You are now logged in as %s": "You are now logged in as %s",
   "You can't GHOST yourself (try /QUIT instead)": "You can't GHOST yourself (try /QUIT instead)",
   "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 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 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",
   "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 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 logged in to op on a channel": "You must be logged in to op on a channel",
-  "You must be logged in to register a channel": "You must be logged in to register a channel",
   "You must be the channel founder to op": "You must be the channel founder to op",
+  "You must specify an account": "You must specify an account",
+  "You must wait an additional %v before making another request": "You must wait an additional %v before making another request",
   "You need to either supply a passphrase or be connected via TLS with a client cert": "You need to either supply a passphrase or be connected via TLS with a client cert",
   "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",
@@ -176,9 +214,14 @@
   "You're not logged into an account": "You're not logged into an account",
   "You're not on that channel": "You're not on that channel",
   "You're now logged in as %s": "You're now logged in as %s",
+  "Your current nickname enforcement is: %s": "Your current nickname enforcement is: %s",
   "Your host is %[1]s, running version %[2]s": "Your host is %[1]s, running version %[2]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. 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",
   "can speak these languages": "can speak these languages",
+  "channels formed": "channels formed",
   "has client certificate fingerprint %s": "has client certificate fingerprint %s",
   "is a $bBot$b on %s": "is a $bBot$b on %s",
   "is an unknown mode character to me": "is an unknown mode character to me",

languages/example-nickserv.lang.json

@@ -1,13 +1,14 @@
 {
   "NickServ lets you register and login to an account.\n\nTo see in-depth help for a specific NickServ command, try:\n    $b/NS HELP <command>$b\n\nHere are the commands you can use:\n%s": "NickServ lets you register and login to an account.\n\nTo see in-depth help for a specific NickServ command, try:\n    $b/NS HELP <command>$b\n\nHere are the commands you can use:\n%s",
   "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 lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none'    [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n              or else they will be renamed]\n3. 'strict'  [you must already be authenticated to use the nick]\n4. 'default' [use the server default]\nWith no arguments, queries your current enforcement status.": "Syntax: $bENFORCE [method]$b\n\nENFORCE lets you specify a custom enforcement mechanism for your registered\nnicknames. Your options are:\n1. 'none'    [no enforcement, overriding the server default]\n2. 'timeout' [anyone using the nick must authenticate before a deadline,\n              or else they will be renamed]\n3. 'strict'  [you must already be authenticated to use the nick]\n4. 'default' [use the server default]\nWith no arguments, queries your current enforcement status.",
   "Syntax: $bGHOST <nickname>$b\n\nGHOST disconnects the given user from the network if they're logged in with the\nsame user account, letting you reclaim your nickname.": "Syntax: $bGHOST <nickname>$b\n\nGHOST disconnects the given user from the network if they're logged in with the\nsame user account, letting you reclaim your nickname.",
   "Syntax: $bGROUP$b\n\nGROUP links your current nickname with your logged-in account, preventing other\nusers from changing to it (or forcing them to rename).": "Syntax: $bGROUP$b\n\nGROUP links your current nickname with your logged-in account, preventing other\nusers from changing to it (or forcing them to rename).",
-  "Syntax: $bHELP [command]$b\n\nHELP returns information on the given command.": "Syntax: $bHELP [command]$b\n\nHELP returns information on the given command.",
   "Syntax: $bIDENTIFY <username> [password]$b\n\nIDENTIFY lets you login to the given username using either password auth, or\ncertfp (your client certificate) if a password is not given.": "Syntax: $bIDENTIFY <username> [password]$b\n\nIDENTIFY lets you login to the given username using either password auth, or\ncertfp (your client certificate) if a password is not given.",
   "Syntax: $bINFO [username]$b\n\nINFO gives you information about the given (or your own) user account.": "Syntax: $bINFO [username]$b\n\nINFO gives you information about the given (or your own) user account.",
+  "Syntax: $bPASSWD <current> <new> <new_again>$b\nOr:     $bPASSWD <username> <new>$b\n\nPASSWD lets you change your account password. You must supply your current\npassword and confirm the new one by typing it twice. If you're an IRC operator\nwith the correct permissions, you can use PASSWD to reset someone else's\npassword by supplying their username and then the desired password.": "Syntax: $bPASSWD <current> <new> <new_again>$b\nOr:     $bPASSWD <username> <new>$b\n\nPASSWD lets you change your account password. You must supply your current\npassword and confirm the new one by typing it twice. If you're an IRC operator\nwith the correct permissions, you can use PASSWD to reset someone else's\npassword by supplying their username and then the desired password.",
   "Syntax: $bREGISTER <username> <email> [password]$b\n\nREGISTER lets you register a user account. If the server allows anonymous\nregistration, you can send an asterisk (*) as the email address.\n\nIf the password is left out, your account will be registered to your TLS client\ncertificate (and you will need to use that certificate to login in future).": "Syntax: $bREGISTER <username> <email> [password]$b\n\nREGISTER lets you register a user account. If the server allows anonymous\nregistration, you can send an asterisk (*) as the email address.\n\nIf the password is left out, your account will be registered to your TLS client\ncertificate (and you will need to use that certificate to login in future).",
-  "Syntax: $bSADROP <nickname>$b\n\nSADROP foribly de-links the given nickname from the attached user account.": "Syntax: $bSADROP <nickname>$b\n\nSADROP foribly de-links the given nickname from the attached user account.",
-  "Syntax: $bUNREGISTER [username]$b\n\nUNREGISTER lets you delete your user account (or the given one, if you're an\nIRC operator with the correct permissions).": "Syntax: $bUNREGISTER [username]$b\n\nUNREGISTER lets you delete your user account (or the given one, if you're an\nIRC operator with the correct permissions).",
+  "Syntax: $bSADROP <nickname>$b\n\nSADROP forcibly de-links the given nickname from the attached user account.": "Syntax: $bSADROP <nickname>$b\n\nSADROP forcibly de-links the given nickname from the attached user account.",
+  "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: $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."
 }

updatetranslations.py

@@ -54,8 +54,10 @@ if __name__ == '__main__':
                         if match not in irc_strings:
                             irc_strings.append(match)
 
-        print("irc strings:")
-        print(json.dumps({k:k for k in irc_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+        print("irc strings:", len(irc_strings))
+        with open(os.path.join(arguments['<languages-dir>'], 'example-irc.lang.json'), 'w') as f:
+            f.write(json.dumps({k:k for k in irc_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+            f.write('\n')
 
         # help entries
         help_strings = []
@@ -71,10 +73,10 @@ if __name__ == '__main__':
                         if '\n' in match and match not in help_strings:
                             help_strings.append(match)
 
-        print()
-
-        print("help strings:")
-        print(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+        print("help strings:", len(help_strings))
+        with open(os.path.join(arguments['<languages-dir>'], 'example-help.lang.json'), 'w') as f:
+            f.write(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+            f.write('\n')
 
         # nickserv help entries
         help_strings = []
@@ -90,7 +92,45 @@ if __name__ == '__main__':
                         if '\n' in match and match not in help_strings:
                             help_strings.append(match)
 
-        print()
+        print("nickserv help strings:", len(help_strings))
+        with open(os.path.join(arguments['<languages-dir>'], 'example-nickserv.lang.json'), 'w') as f:
+            f.write(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+            f.write('\n')
+
+        # chanserv help entries
+        help_strings = []
+
+        for subdir, dirs, files in os.walk(arguments['<irc-dir>']):
+            for fname in files:
+                filepath = subdir + os.sep + fname
+                if fname == 'chanserv.go':
+                    content = open(filepath, 'r', encoding='UTF-8').read()
+
+                    matches = re.findall(r'\`([^\`]+)\`', content)
+                    for match in matches:
+                        if '\n' in match and match not in help_strings:
+                            help_strings.append(match)
+
+        print("chanserv help strings:", len(help_strings))
+        with open(os.path.join(arguments['<languages-dir>'], 'example-chanserv.lang.json'), 'w') as f:
+            f.write(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+            f.write('\n')
+
+        # hostserv help entries
+        help_strings = []
+
+        for subdir, dirs, files in os.walk(arguments['<irc-dir>']):
+            for fname in files:
+                filepath = subdir + os.sep + fname
+                if fname == 'hostserv.go':
+                    content = open(filepath, 'r', encoding='UTF-8').read()
+
+                    matches = re.findall(r'\`([^\`]+)\`', content)
+                    for match in matches:
+                        if '\n' in match and match not in help_strings:
+                            help_strings.append(match)
 
-        print("nickserv help strings:")
-        print(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+        print("hostserv help strings:", len(help_strings))
+        with open(os.path.join(arguments['<languages-dir>'], 'example-hostserv.lang.json'), 'w') as f:
+            f.write(json.dumps({k:k for k in help_strings}, sort_keys=True, indent=2, separators=(',', ': ')))
+            f.write('\n')