Merge pull request #1890 from slingamn/translations

update translations

irc/accounts.go

@@ -1103,7 +1103,7 @@ func (am *AccountManager) NsSendpass(client *Client, accountName string) (err er
 
 	subject := fmt.Sprintf(client.t("Reset your password on %s"), am.server.name)
 	message := email.ComposeMail(config.Accounts.Registration.EmailVerification, account.Settings.Email, subject)
-	fmt.Fprintf(&message, client.t("We received a request to reset your password on %s for account: %s"), am.server.name, account.Name)
+	fmt.Fprintf(&message, client.t("We received a request to reset your password on %[1]s for account: %[2]s"), am.server.name, account.Name)
 	message.WriteString("\r\n")
 	fmt.Fprintf(&message, client.t("If you did not initiate this request, you can safely ignore this message."))
 	message.WriteString("\r\n")

irc/handlers.go

@@ -3560,7 +3560,7 @@ func zncHandler(server *Server, client *Client, msg ircmsg.Message, rb *Response
 func unknownCommandHandler(server *Server, client *Client, msg ircmsg.Message, rb *ResponseBuffer) bool {
 	var message string
 	if strings.HasPrefix(msg.Command, "/") {
-		message = fmt.Sprintf(client.t("Unknown command; if you are using /QUOTE, the correct syntax is /QUOTE %s, not /QUOTE %s"),
+		message = fmt.Sprintf(client.t("Unknown command; if you are using /QUOTE, the correct syntax is /QUOTE %[1]s, not /QUOTE %[2]s"),
 			strings.TrimPrefix(msg.Command, "/"), msg.Command)
 	} else {
 		message = client.t("Unknown command")

languages/example/chanserv.lang.json

@@ -23,7 +23,7 @@
   "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: $bHOWTOBAN #channel <nick>\n\nThe best way to ban a user from a channel will depend on how they are\nconnected to the server. $bHOWTOBAN$b suggests a ban command that will\n(ideally) prevent the user from returning to the channel.": "Syntax: $bHOWTOBAN #channel <nick>\n\nThe best way to ban a user from a channel will depend on how they are\nconnected to the server. $bHOWTOBAN$b suggests a ban command that will\n(ideally) prevent the user from returning to the channel.",
   "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.",
+  "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 a founder or in the AMODEs 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 a founder or in the AMODEs of the channel.",
   "Syntax: $bPURGE <ADD | DEL | LIST> #channel [code] [reason]$b\n\nPURGE ADD blacklists a channel from the server, making it impossible to join\nor otherwise interact with the channel. If the channel currently has members,\nthey will be kicked from it. PURGE may also be applied preemptively to\nchannels that do not currently have members. A purge can be undone with\nPURGE DEL. To list purged channels, use PURGE LIST.": "Syntax: $bPURGE <ADD | DEL | LIST> #channel [code] [reason]$b\n\nPURGE ADD blacklists a channel from the server, making it impossible to join\nor otherwise interact with the channel. If the channel currently has members,\nthey will be kicked from it. PURGE may also be applied preemptively to\nchannels that do not currently have members. A purge can be undone with\nPURGE DEL. To list purged channels, use PURGE LIST.",
   "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: $bTRANSFER [accept] #channel user [code]$b\n\nTRANSFER transfers ownership of a channel from one user to another.\nTo prevent accidental transfers, a verification code is required. For\nexample, $bTRANSFER #channel alice$b displays the required confirmation\ncode, then $bTRANSFER #channel alice 2930242125$b initiates the transfer.\nUnless you are an IRC operator with the correct permissions, alice must\nthen accept the transfer, which she can do with $bTRANSFER accept #channel$b.\nTo cancel a pending transfer, transfer the channel to yourself.": "Syntax: $bTRANSFER [accept] #channel user [code]$b\n\nTRANSFER transfers ownership of a channel from one user to another.\nTo prevent accidental transfers, a verification code is required. For\nexample, $bTRANSFER #channel alice$b displays the required confirmation\ncode, then $bTRANSFER #channel alice 2930242125$b initiates the transfer.\nUnless you are an IRC operator with the correct permissions, alice must\nthen accept the transfer, which she can do with $bTRANSFER accept #channel$b.\nTo cancel a pending transfer, transfer the channel to yourself.",

languages/example/help.lang.json

@@ -1,16 +1,15 @@
 {
   "= 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  +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         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         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\nErgo 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  +f  |  Users who are unable to join this channel (due to another mode) are forwarded\n         to the provided channel instead.\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         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\nErgo 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  +f  |  Users who are unable to join this channel (due to another mode) are forwarded\n         to the provided channel instead.\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         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",
+  "== Server Notice Masks ==\n\nErgo supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  d  |  Local client disconnects.\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\nErgo supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  d  |  Local client disconnects.\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  |  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.",
+  "== User Modes ==\n\nErgo 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\nErgo 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",
   "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.",
   "AUTHENTICATE\n\nUsed during SASL authentication. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/extensions/sasl-3.1.html": "AUTHENTICATE\n\nUsed during SASL authentication. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/extensions/sasl-3.1.html",
   "AWAY [message]\n\nIf [message] is sent, marks you away. If [message] is not sent, marks you no\nlonger away.": "AWAY [message]\n\nIf [message] is sent, marks you away. If [message] is not sent, marks you no\nlonger away.",
   "BATCH {+,-}reference-tag type [params...]\n\nBATCH initiates an IRCv3 client-to-server batch. You should never need to\nissue this command manually.": "BATCH {+,-}reference-tag type [params...]\n\nBATCH initiates an IRCv3 client-to-server batch. You should never need to\nissue this command manually.",
-  "BRB [message]\n\nDisconnects you from the server, while instructing the server to keep you\npresent for a short time window. During this window, you can either resume\nor reattach to your nickname. If [message] is sent, it is used as your away\nmessage (and as your quit message if you don't return in time).": "BRB [message]\n\nDisconnects you from the server, while instructing the server to keep you\npresent for a short time window. During this window, you can either resume\nor reattach to your nickname. If [message] is sent, it is used as your away\nmessage (and as your quit message if you don't return in time).",
   "CAP <subcommand> [:<capabilities>]\n\nUsed in capability negotiation. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/core/capability-negotiation-3.1.html\nhttp://ircv3.net/specs/core/capability-negotiation-3.2.html": "CAP <subcommand> [:<capabilities>]\n\nUsed in capability negotiation. See the IRCv3 specs for more info:\nhttp://ircv3.net/specs/core/capability-negotiation-3.1.html\nhttp://ircv3.net/specs/core/capability-negotiation-3.2.html",
-  "CHATHISTORY [params]\n\nCHATHISTORY is a history replay command associated with the IRCv3\nspecification draft/chathistory. See this document:\nhttps://github.com/ircv3/ircv3-specifications/pull/393": "CHATHISTORY [params]\n\nCHATHISTORY is a history replay command associated with the IRCv3\nspecification draft/chathistory. See this document:\nhttps://github.com/ircv3/ircv3-specifications/pull/393",
+  "CHATHISTORY [params]\n\nCHATHISTORY is a history replay command associated with the IRCv3\nchathistory extension. See this document:\nhttps://ircv3.net/specs/extensions/chathistory": "CHATHISTORY [params]\n\nCHATHISTORY is a history replay command associated with the IRCv3\nchathistory extension. See this document:\nhttps://ircv3.net/specs/extensions/chathistory",
   "DEBUG <option>\n\nProvides various debugging commands for the IRCd. <option> can be one of:\n\n* GCSTATS: Garbage control statistics.\n* NUMGOROUTINE: Number of goroutines in use.\n* STARTCPUPROFILE: Starts the CPU profiler.\n* STOPCPUPROFILE: Stops the CPU profiler.\n* PROFILEHEAP: Writes a memory profile.\n* CRASHSERVER: Crashes the server (for use in failover testing)": "DEBUG <option>\n\nProvides various debugging commands for the IRCd. <option> can be one of:\n\n* GCSTATS: Garbage control statistics.\n* NUMGOROUTINE: Number of goroutines in use.\n* STARTCPUPROFILE: Starts the CPU profiler.\n* STOPCPUPROFILE: Stops the CPU profiler.\n* PROFILEHEAP: Writes a memory profile.\n* CRASHSERVER: Crashes the server (for use in failover testing)",
   "DEFCON [level]\n\nThe DEFCON system can disable server features at runtime, to mitigate\nspam or other hostile activity. It has five levels, which are cumulative\n(i.e., level 3 includes all restrictions from level 4 and so on):\n\n5: Normal operation\n4: No new account or channel registrations; if Tor is enabled, no new\n   unauthenticated connections from Tor\n3: All users are +R; no changes to vhosts\n2: No new unauthenticated connections; all channels are +R\n1: No new connections except from localhost or other trusted IPs": "DEFCON [level]\n\nThe DEFCON system can disable server features at runtime, to mitigate\nspam or other hostile activity. It has five levels, which are cumulative\n(i.e., level 3 includes all restrictions from level 4 and so on):\n\n5: Normal operation\n4: No new account or channel registrations; if Tor is enabled, no new\n   unauthenticated connections from Tor\n3: All users are +R; no changes to vhosts\n2: No new unauthenticated connections; all channels are +R\n1: No new connections except from localhost or other trusted IPs",
   "DEOPER\n\nDEOPER removes the IRCop privileges granted to you by a successful /OPER.": "DEOPER\n\nDEOPER removes the IRCop privileges granted to you by a successful /OPER.",
@@ -48,9 +47,8 @@
   "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\nErgo 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://ergo.chat/specs.html": "RPL_ISUPPORT CASEMAPPING\n\nErgo 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://ergo.chat/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 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\nErgo 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\nErgo 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.": "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.",
@@ -59,7 +57,7 @@
   "SUMMON [parameters]\n\nThe SUMMON command is not implemented.": "SUMMON [parameters]\n\nThe SUMMON command is not implemented.",
   "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.",
-  "UBAN <subcommand> [arguments]\n\nOragono's \"unified ban\" system. Accepts the following subcommands:\n\n1. UBAN ADD <target> [REQUIRE-SASL] [DURATION <duration>] [REASON...]\n2. UBAN DEL <target>\n3. UBAN LIST\n4. UBAN INFO <target>\n\n<target> may be an IP, a CIDR, a nickmask with wildcards, or the name of an\naccount to suspend. Note that REQUIRE-SASL is only valid for IP and CIDR bans.": "UBAN <subcommand> [arguments]\n\nOragono's \"unified ban\" system. Accepts the following subcommands:\n\n1. UBAN ADD <target> [REQUIRE-SASL] [DURATION <duration>] [REASON...]\n2. UBAN DEL <target>\n3. UBAN LIST\n4. UBAN INFO <target>\n\n<target> may be an IP, a CIDR, a nickmask with wildcards, or the name of an\naccount to suspend. Note that REQUIRE-SASL is only valid for IP and CIDR bans.",
+  "UBAN <subcommand> [arguments]\n\nErgo's \"unified ban\" system. Accepts the following subcommands:\n\n1. UBAN ADD <target> [REQUIRE-SASL] [DURATION <duration>] [REASON...]\n2. UBAN DEL <target>\n3. UBAN LIST\n4. UBAN INFO <target>\n\n<target> may be an IP, a CIDR, a nickmask with wildcards, or the name of an\naccount to suspend. Note that REQUIRE-SASL is only valid for IP and CIDR bans.": "UBAN <subcommand> [arguments]\n\nErgo's \"unified ban\" system. Accepts the following subcommands:\n\n1. UBAN ADD <target> [REQUIRE-SASL] [DURATION <duration>] [REASON...]\n2. UBAN DEL <target>\n3. UBAN LIST\n4. UBAN INFO <target>\n\n<target> may be an IP, a CIDR, a nickmask with wildcards, or the name of an\naccount to suspend. Note that REQUIRE-SASL is only valid for IP and CIDR bans.",
   "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.*",

languages/example/hostserv.lang.json

@@ -4,13 +4,13 @@
   "$bON$b enables your vhost, if you have one approved.": "$bON$b enables your vhost, if you have one approved.",
   "$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.",
+  "$bSTATUS$b shows your vhost status.": "$bSTATUS$b shows your vhost status.",
   "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: $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: $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: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and whether it is enabled or\ndisabled. A server operator can view someone else's status.": "Syntax: $bSTATUS [user]$b\n\nSTATUS displays your current vhost, if any, and whether it is enabled or\ndisabled. A server operator can view someone else's status.",
   "^[0-9A-Za-z.\\-_/]+$": "^[0-9A-Za-z.\\-_/]+$"
 }

languages/example/irc.lang.json

@@ -15,11 +15,13 @@
   "%[1]s kicked %[2]s (%[3]s)": "%[1]s kicked %[2]s (%[3]s)",
   "%[1]s left the channel (%[2]s)": "%[1]s left the channel (%[2]s)",
   "%[1]s quit (%[2]s)": "%[1]s quit (%[2]s)",
+  "%[1]s sent you a TAGMSG": "%[1]s sent you a TAGMSG",
   "%[1]s set channel modes: %[2]s": "%[1]s set channel modes: %[2]s",
   "%[1]s set the channel topic to: %[2]s": "%[1]s set the channel topic to: %[2]s",
   "%s <subcommand> [params]": "%s <subcommand> [params]",
   "%s is banned from relaying to the channel": "%s is banned from relaying to the channel",
   "%s joined the channel": "%s joined the channel",
+  "%s sent a TAGMSG": "%s sent a TAGMSG",
   "*** $bChanServ LIST$b ***": "*** $bChanServ LIST$b ***",
   "*** $bEnd of %s HELP$b ***": "*** $bEnd of %s HELP$b ***",
   "*** $bEnd of ChanServ LIST$b ***": "*** $bEnd of ChanServ LIST$b ***",
@@ -69,10 +71,6 @@
   "Cancelled pending transfer of channel %s": "Cancelled pending transfer of channel %s",
   "Cannot join channel (+%s)": "Cannot join channel (+%s)",
   "Cannot rename channel": "Cannot rename channel",
-  "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 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 (+%s)": "Cannot send to channel (+%s)",
   "Certfp:      %s": "Certfp:      %s",
@@ -97,24 +95,23 @@
   "Channel renamed": "Channel renamed",
   "Channel renamed: %s": "Channel renamed: %s",
   "Channels with persistent history cannot be renamed": "Channels with persistent history cannot be renamed",
+  "Check your e-mail for instructions on how to confirm your change of address": "Check your e-mail for instructions on how to confirm your change of address",
   "Client %[1]s is associated with IP %[2]s": "Client %[1]s is associated with IP %[2]s",
-  "Client %[1]s is logged into account %[2]s and has %[3]d active clients (see /NICKSERV CLIENTS LIST %[4]s for more info": "Client %[1]s is logged into account %[2]s and has %[3]d active clients (see /NICKSERV CLIENTS LIST %[4]s for more info",
+  "Client %[1]s is logged into account %[2]s and has %[3]d active clients (see /NICKSERV CLIENTS LIST %[4]s for more info)": "Client %[1]s is logged into account %[2]s and has %[3]d active clients (see /NICKSERV CLIENTS LIST %[4]s for more info)",
   "Client %[1]s is unauthenticated and connected from %[2]s": "Client %[1]s is unauthenticated and connected from %[2]s",
   "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 dispatch registration e-mail": "Could not dispatch registration e-mail",
+  "Could not dispatch registration e-mail: %s": "Could not dispatch registration e-mail: %s",
   "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",
@@ -139,6 +136,8 @@
   "Device ID:   %s": "Device ID:   %s",
   "Direct messages from unregistered users are temporarily restricted": "Direct messages from unregistered users are temporarily restricted",
   "Disconnected %d client(s) associated with the account, using the following IPs:": "Disconnected %d client(s) associated with the account, using the following IPs:",
+  "E-mail verification is disabled": "E-mail verification is disabled",
+  "Email address: %s": "Email address: %s",
   "End of /HELPOP": "End of /HELPOP",
   "End of /INFO": "End of /INFO",
   "End of /WHOIS list": "End of /WHOIS list",
@@ -150,6 +149,7 @@
   "End of history playback": "End of history playback",
   "End of list": "End of list",
   "Enqueued account %s for message deletion": "Enqueued account %s for message deletion",
+  "Ergo is released under the MIT license.": "Ergo is released under the MIT license.",
   "Erroneous nickname": "Erroneous nickname",
   "Erroneous target": "Erroneous target",
   "Error deleting message: %v": "Error deleting message: %v",
@@ -178,11 +178,11 @@
   "Here are the commands you can use:": "Here are the commands you can use:",
   "Hostname:    %s": "Hostname:    %s",
   "I have %[1]d clients and %[2]d servers": "I have %[1]d clients and %[2]d servers",
-  "I'll be right back": "I'll be right back",
   "IP %s is exempt from connection limits": "IP %s is exempt from connection limits",
   "IP address:  %s": "IP address:  %s",
   "IRC Operators online": "IRC Operators online",
   "IRCv3 CAPs:  %s": "IRCv3 CAPs:  %s",
+  "If you did not initiate this request, you can safely ignore this message.": "If you did not initiate this request, you can safely ignore this message.",
   "Incorrect batch tag sent": "Incorrect batch tag sent",
   "Input line contained excess tag data": "Input line contained excess tag data",
   "Input line too long": "Input line too long",
@@ -246,10 +246,11 @@
   "No topic is set": "No topic is set",
   "Not enough parameters": "Not enough parameters",
   "Note that if the user is currently in the channel, you must /KICK them after you ban them": "Note that if the user is currently in the channel, you must /KICK them after you ban them",
+  "Note: try evaluating a wider IPv6 CIDR like %s/%d": "Note: try evaluating a wider IPv6 CIDR like %s/%d",
   "Only channel founders can change registered channels": "Only channel founders can change registered channels",
   "Only the channel founder can do this": "Only the channel founder can do this",
   "Oragono does not emulate the ZNC module %s": "Oragono does not emulate the ZNC module %s",
-  "Oragono is released under the MIT license.": "Oragono is released under the MIT license.",
+  "Otherwise, to reset your password, issue the following command (replace `new_password` with your desired password):": "Otherwise, to reset your password, issue the following command (replace `new_password` with your desired password):",
   "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",
@@ -275,8 +276,7 @@
   "Removed K-Line for %s": "Removed K-Line for %s",
   "Requesting the %s client capability is forbidden": "Requesting the %s client capability is forbidden",
   "Reset throttle for IP: %s": "Reset throttle for IP: %s",
-  "Resume may have lost some message history": "Resume may have lost some message history",
+  "Reset your password on %s": "Reset your password on %s",
-  "Resume may have lost up to %d seconds of history": "Resume may have lost up to %d seconds of history",
   "Roleplaying has been disabled by the server administrators": "Roleplaying has been disabled by the server administrators",
   "Rotated the cloak secret; you must rehash or restart the server for it to take effect": "Rotated the cloak secret; you must rehash or restart the server for it to take effect",
   "SASL authentication aborted": "SASL authentication aborted",
@@ -343,14 +343,14 @@
   "This channel has been purged by the server administrators and cannot be used": "This channel has been purged by the server administrators and cannot be used",
   "This command has been disabled by the server administrators": "This command has been disabled by the server administrators",
   "This feature has been disabled by the server administrators": "This feature has been disabled by the server administrators",
-  "This is Oragono version %s.": "This is Oragono version %s.",
+  "This is Ergo version %s.": "This is Ergo version %s.",
   "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",
+  "To confirm your change of e-mail address on %s, issue the following command:": "To confirm your change of e-mail address on %s, issue the following command:",
   "To confirm your channel transfer, type: /CS TRANSFER %[1]s %[2]s %[3]s": "To confirm your channel transfer, type: /CS TRANSFER %[1]s %[2]s %[3]s",
   "To confirm, run this command: %s": "To confirm, run this command: %s",
   "To see in-depth help for a specific command, try:": "To see in-depth help for a specific command, try:",
@@ -361,6 +361,7 @@
   "USERS has been disabled": "USERS has been disabled",
   "Unknown command": "Unknown command",
   "Unknown command. To see available commands, run: /%s HELP": "Unknown command. To see available commands, run: /%s HELP",
+  "Unknown command; if you are using /QUOTE, the correct syntax is /QUOTE %[1]s, not /QUOTE %[2]s": "Unknown command; if you are using /QUOTE, the correct syntax is /QUOTE %[1]s, not /QUOTE %[2]s",
   "Unknown subcommand": "Unknown subcommand",
   "Unrecognized DEBUG subcommand": "Unrecognized DEBUG subcommand",
   "Usage: REGISTER <passphrase> [email]": "Usage: REGISTER <passphrase> [email]",
@@ -372,6 +373,7 @@
   "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",
+  "Verify your change of e-mail address on %s": "Verify your change of e-mail address 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",
   "Warning: %d clients matched this rule, but were not killed due to being always-on:": "Warning: %d clients matched this rule, but were not killed due to being always-on:",
   "Warning: %s is not currently connected to the server. Using WHOWAS data, which may be inaccurate:": "Warning: %s is not currently connected to the server. Using WHOWAS data, which may be inaccurate:",
@@ -382,6 +384,7 @@
   "Warning: could not rename affected client: %v": "Warning: could not rename affected client: %v",
   "Warning: server.ip-cloaking.enabled-for-always-on is disabled. This reduces the precision of channel bans.": "Warning: server.ip-cloaking.enabled-for-always-on is disabled. This reduces the precision of channel bans.",
   "Warning: this ban will affect %d other users:": "Warning: this ban will affect %d other users:",
+  "We received a request to reset your password on %[1]s for account: %[2]s": "We received a request to reset your password on %[1]s for account: %[2]s",
   "Welcome to the %s IRC Network %s": "Welcome to the %s IRC Network %s",
   "You already have too many certificate fingerprints": "You already have too many certificate fingerprints",
   "You are banned from this server (%s)": "You are banned from this server (%s)",
@@ -408,10 +411,12 @@
   "You have been marked as being away": "You have been marked as being away",
   "You have been offered ownership of channel %[1]s. To accept, /CS TRANSFER ACCEPT %[1]s": "You have been offered ownership of channel %[1]s. To accept, /CS TRANSFER ACCEPT %[1]s",
   "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 no stored e-mail address": "You have no stored e-mail address",
   "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 may only register your nickname as your account name": "You may only register your nickname as your account name",
   "You must be a channel operator in the channel you are forwarding to": "You must be a channel operator in the channel you are forwarding to",
   "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",
@@ -424,7 +429,6 @@
   "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",
-  "You will not see JOINs and PARTs in /HISTORY output or in autoreplay": "You will not see JOINs and PARTs in /HISTORY output or in autoreplay",
   "You will receive %d lines of autoreplayed history": "You will receive %d lines of autoreplayed history",
   "You will receive the server default of %d lines of autoreplayed history": "You will receive the server default of %d lines of autoreplayed history",
   "You will see JOINs and PARTs in /HISTORY output and in autoreplay": "You will see JOINs and PARTs in /HISTORY output and in autoreplay",
@@ -437,12 +441,12 @@
   "You're now logged in as %s": "You're now logged in as %s",
   "Your account credentials are managed externally and cannot be changed here": "Your account credentials are managed externally and cannot be changed here",
   "Your account is not configured to receive autoreplayed missed messages": "Your account is not configured to receive autoreplayed missed messages",
-  "Your client does not support BRB": "Your client does not support BRB",
   "Your host is %[1]s, running version %[2]s": "Your host is %[1]s, running version %[2]s",
   "Your nickname must match your account name %s exactly to modify this setting. Try changing it with /NICK, or logging out and back in with the correct nickname.": "Your nickname must match your account name %s exactly to modify this setting. Try changing it with /NICK, or logging out and back in with the correct nickname.",
   "Your stored always-on setting is: %s": "Your stored always-on setting is: %s",
   "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 e-mail address is: %s": "Your stored e-mail address is: %s",
   "Your stored nickname enforcement setting is: %s": "Your stored nickname enforcement setting is: %s",
   "are supported by this server": "are supported by this server",
   "channels formed": "channels formed",
@@ -455,5 +459,6 @@
   "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"
+  "unregistered connections": "unregistered connections",
+  "was connecting from %s": "was connecting from %s"
 }

languages/example/nickserv.lang.json

@@ -7,6 +7,7 @@
   "$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.",
+  "$bEMAIL$b\n'email' controls the e-mail address associated with your account (if the\nserver operator allows it, this address can be used for password resets).\nAs an additional security measure, if you have a password set, you must\nprovide it as an additional argument to $bSET$b, for example,\nSET EMAIL test@example.com hunter2": "$bEMAIL$b\n'email' controls the e-mail address associated with your account (if the\nserver operator allows it, this address can be used for password resets).\nAs an additional security measure, if you have a password set, you must\nprovide it as an additional argument to $bSET$b, for example,\nSET EMAIL test@example.com hunter2",
   "$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]",
   "$bERASE$b erases all records of an account, allowing reuse.": "$bERASE$b erases all records of an account, allowing reuse.",
   "$bGET$b queries the current values of your account settings": "$bGET$b queries the current values of your account settings",
@@ -19,23 +20,29 @@
   "$bPASSWD$b lets you change your password.": "$bPASSWD$b lets you change your password.",
   "$bREGISTER$b lets you register a user account.": "$bREGISTER$b lets you register a user account.",
   "$bRENAME$b renames an account": "$bRENAME$b renames an account",
-  "$bREPLAY-JOINS$b\n'replay-joins' controls whether replayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'always', 'never', and the default\nof 'commands-only' (the messages will be replayed in /HISTORY output, but not\nduring autoreplay).": "$bREPLAY-JOINS$b\n'replay-joins' controls whether replayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'always', 'never', and the default\nof 'commands-only' (the messages will be replayed in /HISTORY output, but not\nduring autoreplay).",
+  "$bREPLAY-JOINS$b\n'replay-joins' controls whether replayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'always' and the default of\n'commands-only' (the messages will be replayed in CHATHISTORY output, but not\nduring autoreplay).": "$bREPLAY-JOINS$b\n'replay-joins' controls whether replayed channel history will include\nlines for join and part. This provides more information about the context of\nmessages, but may be spammy. Your options are 'always' and the default of\n'commands-only' (the messages will be replayed in CHATHISTORY output, but not\nduring autoreplay).",
+  "$bRESETPASS$b completes an email-based password reset": "$bRESETPASS$b completes an email-based password reset",
   "$bSADROP$b forcibly de-links the given nickname from its user account.": "$bSADROP$b forcibly de-links the given nickname from its user account.",
   "$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",
+  "$bSENDPASS$b initiates an email-based password reset": "$bSENDPASS$b initiates an email-based password reset",
   "$bSET$b modifies your account settings": "$bSET$b modifies your account settings",
   "$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.",
   "$bVERIFY$b lets you complete account registration.": "$bVERIFY$b lets you complete account registration.",
+  "An error occurred": "An error occurred",
+  "Code did not match": "Code did not match",
   "Insufficient privileges": "Insufficient privileges",
   "Invalid parameters": "Invalid parameters",
   "NickServ lets you register, log in to, and manage an account.": "NickServ lets you register, log in to, and manage an account.",
   "Password incorrect": "Password incorrect",
   "Passwords do not match": "Passwords do not match",
+  "Successfully reset account password": "Successfully reset account password",
+  "Successfully sent password reset email": "Successfully sent password reset email",
   "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: $bCERT <LIST | ADD | DEL> [account] [certfp]$b\n\nCERT examines or modifies the SHA-256 TLS certificate fingerprints that can\nbe used to log into an account. Specifically, $bCERT LIST$b lists the\nauthorized fingerprints, $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. See the operator manual\nfor instructions on how to compute the fingerprint.": "Syntax: $bCERT <LIST | ADD | DEL> [account] [certfp]$b\n\nCERT examines or modifies the SHA-256 TLS certificate fingerprints that can\nbe used to log into an account. Specifically, $bCERT LIST$b lists the\nauthorized fingerprints, $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. See the operator manual\nfor instructions on how to compute the fingerprint.",
-  "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: $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 clients currently attached\nto your nickname. An administrator can use this command to logout another\nuser'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 clients currently attached\nto your nickname. An administrator can use this command to logout another\nuser'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.",
@@ -48,13 +55,18 @@
   "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. To\nindicate an empty password, use * instead.": "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. To\nindicate an empty password, use * instead.",
   "Syntax: $bREGISTER <password> [email]$b\n\nREGISTER lets you register your current nickname as a user account. If the\nserver allows anonymous registration, you can omit the e-mail address.\n\nIf you are currently logged in with a TLS client certificate and wish to use\nit instead of a password to log in, send * as the password.": "Syntax: $bREGISTER <password> [email]$b\n\nREGISTER lets you register your current nickname as a user account. If the\nserver allows anonymous registration, you can omit the e-mail address.\n\nIf you are currently logged in with a TLS client certificate and wish to use\nit instead of a password to log in, send * as the password.",
   "Syntax: $bRENAME <account> <newname>$b\n\nRENAME allows a server administrator to change the name of an account.\nCurrently, you can only change the canonical casefolding of an account\n(e.g., you can change \"Alice\" to \"alice\", but not \"Alice\" to \"Amanda\").": "Syntax: $bRENAME <account> <newname>$b\n\nRENAME allows a server administrator to change the name of an account.\nCurrently, you can only change the canonical casefolding of an account\n(e.g., you can change \"Alice\" to \"alice\", but not \"Alice\" to \"Amanda\").",
+  "Syntax: $bRESETPASS <account> <code> <password>$b\n\nRESETPASS resets an account password, using a reset code that was emailed as\nthe result of a previous $bSENDPASS$b command.": "Syntax: $bRESETPASS <account> <code> <password>$b\n\nRESETPASS resets an account password, using a reset code that was emailed as\nthe result of a previous $bSENDPASS$b command.",
   "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: $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: $bSENDPASS <account>$b\n\nSENDPASS sends a password reset email to the email address associated with\nthe target account. The reset code in the email can then be used with the\n$bRESETPASS$b command.": "Syntax: $bSENDPASS <account>$b\n\nSENDPASS sends a password reset email to the email address associated with\nthe target account. The reset code in the email can then be used with the\n$bRESETPASS$b command.",
   "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 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: $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.",
+  "That account is not associated with an email address": "That account is not associated with an email address",
+  "Try again later": "Try again later",
+  "You must supply a password": "You must supply a password",
   "You're not logged into an account": "You're not logged into an account"
 }