Merge pull request #1538 from slingamn/strings

update strings

languages/example/chanserv.lang.json

@@ -9,7 +9,7 @@
   "$bLIST$b searches the list of registered channels.": "$bLIST$b searches the list of registered channels.",
   "$bOP$b makes the given user (or yourself) a channel admin.": "$bOP$b makes the given user (or yourself) a channel admin.",
   "$bPURGE$b blacklists a channel from the server.": "$bPURGE$b blacklists a channel from the server.",
-  "$bQUERY-CUTOFF$b\n'query-cutoff' lets you restrict how much channel history can be retrieved\nby unprivileged users. Your options are:\n1. 'none'               [no restrictions]\n2. 'registration-time'  [users can view history from after their account was\n                         registered, plus a grace period]\n3. 'join-time'          [users can biew history from after they joined the\n                         channel; note that history will be effectively\n                         unavailable to clients that are not always-on]\n4. 'default'            [use the server default]": "$bQUERY-CUTOFF$b\n'query-cutoff' lets you restrict how much channel history can be retrieved\nby unprivileged users. Your options are:\n1. 'none'               [no restrictions]\n2. 'registration-time'  [users can view history from after their account was\n                         registered, plus a grace period]\n3. 'join-time'          [users can biew history from after they joined the\n                         channel; note that history will be effectively\n                         unavailable to clients that are not always-on]\n4. 'default'            [use the server default]",
+  "$bQUERY-CUTOFF$b\n'query-cutoff' lets you restrict how much channel history can be retrieved\nby unprivileged users. Your options are:\n1. 'none'               [no restrictions]\n2. 'registration-time'  [users can view history from after their account was\n                         registered, plus a grace period]\n3. 'join-time'          [users can view history from after they joined the\n                         channel; note that history will be effectively\n                         unavailable to clients that are not always-on]\n4. 'default'            [use the server default]": "$bQUERY-CUTOFF$b\n'query-cutoff' lets you restrict how much channel history can be retrieved\nby unprivileged users. Your options are:\n1. 'none'               [no restrictions]\n2. 'registration-time'  [users can view history from after their account was\n                         registered, plus a grace period]\n3. 'join-time'          [users can view history from after they joined the\n                         channel; note that history will be effectively\n                         unavailable to clients that are not always-on]\n4. 'default'            [use the server default]",
   "$bREGISTER$b lets you own a given channel.": "$bREGISTER$b lets you own a given channel.",
   "$bSET$b modifies a channel's settings": "$bSET$b modifies a channel's settings",
   "$bTRANSFER$b transfers ownership of a channel to another user.": "$bTRANSFER$b transfers ownership of a channel to another user.",
@@ -17,7 +17,7 @@
   "ChanServ lets you register and manage channels.": "ChanServ lets you register and manage channels.",
   "Syntax $bSET #channel <setting> <value>$b\n\nSET modifies a channel's settings. The following settings are available:": "Syntax $bSET #channel <setting> <value>$b\n\nSET modifies a channel's settings. The following settings are available:",
   "Syntax: $INFO #channel$b\n\nINFO displays info about a registered channel.": "Syntax: $INFO #channel$b\n\nINFO displays info about a registered channel.",
-  "Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.": "Syntax: $bAMODE #channel [mode change] [account]$b\n\nAMODE lists or modifies persistent mode settings that affect channel members.\nFor example, $bAMODE #channel +o dan$b grants the the holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.",
+  "Syntax: $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 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 holder of the \"dan\"\naccount the +o operator mode every time they join #channel. To list current\naccounts and modes, use $bAMODE #channel$b. Note that users are always\nreferenced by their registered account names, not their nicknames.",
   "Syntax: $bCLEAR #channel target$b\n\nCLEAR removes users or settings from a channel. Specifically:\n\n$bCLEAR #channel users$b kicks all users except for you.\n$bCLEAR #channel access$b resets all stored bans, invites, ban exceptions,\nand persistent user-mode grants made with CS AMODE.": "Syntax: $bCLEAR #channel target$b\n\nCLEAR removes users or settings from a channel. Specifically:\n\n$bCLEAR #channel users$b kicks all users except for you.\n$bCLEAR #channel access$b resets all stored bans, invites, ban exceptions,\nand persistent user-mode grants made with CS AMODE.",
   "Syntax: $bDEOP #channel [nickname]$b\n\nDEOP removes the given nickname, or yourself, the channel admin. You can only use\nthis command if you're the founder of the channel.": "Syntax: $bDEOP #channel [nickname]$b\n\nDEOP removes the given nickname, or yourself, the channel admin. You can only use\nthis command if you're the founder of the channel.",
   "Syntax: $bGET #channel <setting>$b\n\nGET queries the current values of the channel settings. For more information\non the settings and their possible values, see HELP SET.": "Syntax: $bGET #channel <setting>$b\n\nGET queries the current values of the channel settings. For more information\non the settings and their possible values, see HELP SET.",

languages/example/help.lang.json

@@ -4,7 +4,6 @@
   "== Server Notice Masks ==\n\nOragono supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  j  |  Local channel actions.\n  k  |  Local kills.\n  n  |  Local nick changes.\n  o  |  Local oper actions.\n  q  |  Local quits.\n  t  |  Local /STATS usage.\n  u  |  Local client account actions.\n  x  |  Local X-lines (DLINE/KLINE/etc).\n  v  |  Local vhost changes.\n\nTo set a snomask, do this with your nickname:\n\n  /MODE <nick> +s <chars>\n\nFor instance, this would set the kill, oper, account and xline snomasks on dan:\n\n  /MODE dan +s koux": "== Server Notice Masks ==\n\nOragono supports the following server notice masks for operators:\n\n  a  |  Local announcements.\n  c  |  Local client connections.\n  j  |  Local channel actions.\n  k  |  Local kills.\n  n  |  Local nick changes.\n  o  |  Local oper actions.\n  q  |  Local quits.\n  t  |  Local /STATS usage.\n  u  |  Local client account actions.\n  x  |  Local X-lines (DLINE/KLINE/etc).\n  v  |  Local vhost changes.\n\nTo set a snomask, do this with your nickname:\n\n  /MODE <nick> +s <chars>\n\nFor instance, this would set the kill, oper, account and xline snomasks on dan:\n\n  /MODE dan +s koux",
   "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users.\n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  CTCP messages to the user are blocked.": "== User Modes ==\n\nOragono supports the following user modes:\n\n  +a  |  User is marked as being away. This mode is set with the /AWAY command.\n  +i  |  User is marked as invisible (their channels are hidden from whois replies).\n  +o  |  User is an IRC operator.\n  +R  |  User only accepts messages from other registered users.\n  +s  |  Server Notice Masks (see help with /HELPOP snomasks).\n  +Z  |  User is connected via TLS.\n  +B  |  User is a bot.\n  +E  |  User can receive roleplaying commands.\n  +T  |  CTCP messages to the user are blocked.",
   "@+client-only-tags TAGMSG <target>{,<target>}\n\nSends the given client-only tags to the given targets as a TAGMSG. See the IRCv3\nspecs for more info: http://ircv3.net/specs/core/message-tags-3.3.html": "@+client-only-tags TAGMSG <target>{,<target>}\n\nSends the given client-only tags to the given targets as a TAGMSG. See the IRCv3\nspecs for more info: http://ircv3.net/specs/core/message-tags-3.3.html",
-  "ACC LS\nACC REGISTER <accountname> [callback_namespace:]<callback> [cred_type] :<credential>\nACC VERIFY <accountname> <auth_code>\n\nUsed in account registration. See the relevant specs for more info:\nhttps://oragono.io/specs.html": "ACC LS\nACC REGISTER <accountname> [callback_namespace:]<callback> [cred_type] :<credential>\nACC VERIFY <accountname> <auth_code>\n\nUsed in account registration. See the relevant specs for more info:\nhttps://oragono.io/specs.html",
   "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.": "AMBIANCE <target> <text to be sent>\n\nThe AMBIANCE command is used to send a scene notification to the given target.",
   "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.",
@@ -60,7 +59,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> [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.": "UBAN <subcommand> [arguments]\n\nOragono's \"unified ban\" system. Accepts the following subcommands:\n\n1. UBAN ADD <target> [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.",
+  "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.",
   "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/irc.lang.json

@@ -6,6 +6,7 @@
   "$bWarning: unregistering this channel will remove all stored channel attributes.$b": "$bWarning: unregistering this channel will remove all stored channel attributes.$b",
   "$bWarning: you are about to empty this channel and remove it from the server.$b": "$bWarning: you are about to empty this channel and remove it from the server.$b",
   "$bWarning: you are about to transfer control of your channel to another user.$b": "$bWarning: you are about to transfer control of your channel to another user.$b",
+  "%[1]s - %[2]s - added by %[3]s - %[4]s": "%[1]s - %[2]s - added by %[3]s - %[4]s",
   "%[1]s [account: %[2]s] joined the channel": "%[1]s [account: %[2]s] joined the channel",
   "%[1]s changed nick to %[2]s": "%[1]s changed nick to %[2]s",
   "%[1]s invited you to channel %[2]s": "%[1]s invited you to channel %[2]s",
@@ -56,7 +57,6 @@
   "Authentication successful": "Authentication successful",
   "Autoreplay of missed messages is enabled": "Autoreplay of missed messages is enabled",
   "Bad or unauthorized PROXY command": "Bad or unauthorized PROXY command",
-  "Ban - %[1]s - added by %[2]s - %[3]s": "Ban - %[1]s - added by %[2]s - %[3]s",
   "Because your client is not always-on, auto-away is disabled": "Because your client is not always-on, auto-away is disabled",
   "CTCP messages are disabled over Tor": "CTCP messages are disabled over Tor",
   "Can't change modes for other users": "Can't change modes for other users",
@@ -93,7 +93,7 @@
   "Channel renamed": "Channel renamed",
   "Channel renamed: %s": "Channel renamed: %s",
   "Channels with persistent history cannot be renamed": "Channels with persistent history cannot be renamed",
-  "Client %[1]s is associated with IP %[2]s; you can ban this IP with /UBAN ADD": "Client %[1]s is associated with IP %[2]s; you can ban this IP with /UBAN ADD",
+  "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 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):",
@@ -174,8 +174,6 @@
   "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 %[1]s has %[2]d active connections out of a maximum of %[3]d": "IP %[1]s has %[2]d active connections out of a maximum of %[3]d",
-  "IP %[1]s has had %[2]d connection attempts in the past %[3]v, out of a maximum of %[4]d": "IP %[1]s has had %[2]d connection attempts in the past %[3]v, out of a maximum of %[4]d",
   "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",
@@ -218,6 +216,8 @@
   "Multiclient functionality is currently disabled for your account, but you can opt in": "Multiclient functionality is currently disabled for your account, but you can opt in",
   "Multiclient functionality is currently enabled for your account": "Multiclient functionality is currently enabled for your account",
   "Multiclient functionality is currently enabled for your account, but you can opt out": "Multiclient functionality is currently enabled for your account, but you can opt out",
+  "Network %[1]s has %[2]d active connections out of a maximum of %[3]d": "Network %[1]s has %[2]d active connections out of a maximum of %[3]d",
+  "Network %[1]s has had %[2]d connection attempts in the past %[3]v, out of a maximum of %[4]d": "Network %[1]s has had %[2]d connection attempts in the past %[3]v, out of a maximum of %[4]d",
   "Network service, for more info /msg %s HELP": "Network service, for more info /msg %s HELP",
   "Nickname %[1]s has %[2]d attached clients(s)": "Nickname %[1]s has %[2]d attached clients(s)",
   "Nickname is already in use": "Nickname is already in use",
@@ -248,7 +248,6 @@
   "Password incorrect": "Password incorrect",
   "Password was invalid": "Password was invalid",
   "Permission Denied": "Permission Denied",
-  "Permission Denied - You're not an IRC operator": "Permission Denied - You're not an IRC operator",
   "Please wait at least %v and try again": "Please wait at least %v and try again",
   "Purge reason: %s": "Purge reason: %s",
   "Purged at: %s": "Purged at: %s",
@@ -334,6 +333,7 @@
   "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 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.",
@@ -372,6 +372,7 @@
   "Warning: /JOIN 0 will remove you from all channels. To confirm, type: /JOIN 0 %s": "Warning: /JOIN 0 will remove you from all channels. To confirm, type: /JOIN 0 %s",
   "Warning: account %s currently has a persistent channel privilege granted with CS AMODE. If this mode is not removed, bans will not be respected": "Warning: account %s currently has a persistent channel privilege granted with CS AMODE. If this mode is not removed, bans will not be respected",
   "Warning: account %s is the channel founder and cannot be banned": "Warning: account %s is the channel founder and cannot be banned",
+  "Warning: banning this IP or a network that contains it may affect other users. Use /UBAN INFO on the candidate IP or network for more information.": "Warning: banning this IP or a network that contains it may affect other users. Use /UBAN INFO on the candidate IP or network for more information.",
   "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:",
@@ -391,6 +392,7 @@
   "You can't remove all your certificate fingerprints unless you add a password": "You can't remove all your certificate fingerprints unless you add a password",
   "You can't ungroup your primary nickname (try unregistering your account instead)": "You can't ungroup your primary nickname (try unregistering your account instead)",
   "You cannot relay messages to this channel": "You cannot relay messages to this channel",
+  "You don't have any stored privileges on that channel": "You don't have any stored privileges on that channel",
   "You don't have enough channel privileges": "You don't have enough channel privileges",
   "You don't own that nick": "You don't own that nick",
   "You have already registered or attempted to register": "You have already registered or attempted to register",
@@ -408,7 +410,6 @@
   "You must be connected with TLS and a client certificate to do this": "You must be connected with TLS and a client certificate to do this",
   "You must complete the connection before registering your account": "You must complete the connection before registering your account",
   "You must complete the connection before verifying your account": "You must complete the connection before verifying your account",
-  "You must have rehash permissions in order to execute DEBUG CRASHSERVER": "You must have rehash permissions in order to execute DEBUG CRASHSERVER",
   "You must log in with SASL to join this server": "You must log in with SASL to join this server",
   "You must specify an account": "You must specify an account",
   "You must use your account name as your nickname": "You must use your account name as your nickname",