From 8e11dc8b28014d9476f63c235b25997a6ee33619 Mon Sep 17 00:00:00 2001 From: nyuszika7h Date: Sun, 13 Jul 2014 17:23:11 +0200 Subject: [PATCH] Use gender-neutral pronouns everywhere --- ChangeLog | 8 ++++---- docs/ADVANCED_PLUGIN_CONFIG.rst | 2 +- docs/CAPABILITIES.rst | 10 +++++----- docs/CONFIGURATION.rst | 2 +- docs/GETTING_STARTED.rst | 2 +- docs/PLUGIN_TUTORIAL.rst | 2 +- docs/STYLE.rst | 8 ++++---- locales/de.po | 6 +++--- locales/fi.po | 2 +- locales/fr.po | 8 ++++---- locales/it.po | 8 ++++---- locales/messages.pot | 2 +- plugins/Herald/config.py | 4 ++-- plugins/Herald/locales/fi.po | 6 +++--- plugins/Herald/locales/fr.po | 6 +++--- plugins/Herald/locales/it.po | 6 +++--- plugins/Herald/messages.pot | 4 ++-- plugins/Relay/locales/fi.po | 10 +++++----- plugins/Relay/locales/fr.po | 8 ++++---- plugins/Relay/locales/it.po | 8 ++++---- plugins/Relay/messages.pot | 8 ++++---- plugins/Relay/plugin.py | 6 +++--- plugins/Topic/locales/fi.po | 2 +- plugins/Topic/locales/fr.po | 4 ++-- plugins/Topic/locales/it.po | 4 ++-- plugins/Topic/messages.pot | 2 +- plugins/Topic/plugin.py | 2 +- plugins/User/locales/de.po | 2 +- plugins/User/locales/fi.po | 2 +- plugins/User/locales/fr.po | 4 ++-- plugins/User/locales/hu.po | 4 ++-- plugins/User/locales/it.po | 4 ++-- plugins/User/messages.pot | 2 +- plugins/User/plugin.py | 2 +- sandbox/Debug/config.py | 2 +- scripts/supybot-wizard | 10 +++++----- src/conf.py | 2 +- src/ircmsgs.py | 4 ++-- src/schedule.py | 2 +- 39 files changed, 90 insertions(+), 90 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ec9a5604..3b26666c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1395,7 +1395,7 @@ * Changed User.setpassword not to require the to be correct if the requesting user has the owner capability (and - isn't the owner himself). + isn't the owner themself). * Added ircutils.strip{Bold,Reverse,Underline,Formatting}, which will remove the specified formatting or all forms of formatting @@ -1582,7 +1582,7 @@ having the bot always attempt to parse a message as a command. * Added conf.replyWhenAddressedByNick, a configuration variable - for having the bot *not* respond when addressed by his nick. + for having the bot *not* respond when addressed by its nick. * Added conf.replyWithNickPrefix, a configuration variable for having the bot not prefix the nick of the person giving a command @@ -1933,14 +1933,14 @@ * Fixed imports in the DCC plugin. * Fixed a bug where the bot would not reply to nick-addressed - messages on a channel if his nick wasn't entirely lowercased. + messages on a channel if its nick wasn't entirely lowercased. * Fixed the Relay plugin to relay topic changes; an oversight not caught earlier because supybot has for a long time managed our topics. * Fixed a bug in the Services plugin where the bot would ghost - himself if his nick didn't match in case the nick given. + itself if its nick didn't match in case the nick given. * Added the ability for PrivmsgCommandAndRegexp to have regexps that are called *after* callbacks.addressed has been called on the diff --git a/docs/ADVANCED_PLUGIN_CONFIG.rst b/docs/ADVANCED_PLUGIN_CONFIG.rst index e81285583..011f98cd1 100644 --- a/docs/ADVANCED_PLUGIN_CONFIG.rst +++ b/docs/ADVANCED_PLUGIN_CONFIG.rst @@ -80,7 +80,7 @@ realize what the code is actually doing. Here it is: def configure(advanced): # This will be called by supybot to configure this module. advanced is - # a bool that specifies whether the user identified himself as an advanced + # a bool that specifies whether the user identified themself as an advanced # user or not. You should effect your configuration by manipulating the # registry as appropriate. from supybot.questions import expect, anything, something, yn diff --git a/docs/CAPABILITIES.rst b/docs/CAPABILITIES.rst index 6a6b2c59b..5db7a7935 100644 --- a/docs/CAPABILITIES.rst +++ b/docs/CAPABILITIES.rst @@ -67,10 +67,10 @@ an individual channel! So when a user 'foo' sends a command 'bar' to the bot on channel '#baz', first the bot checks to see if the user has the anticapability for the command by itself, '-bar'. If so, it errors right then and there, telling the user that -he lacks the 'bar' capability. If the user doesn't have that anticapability, +they lack the 'bar' capability. If the user doesn't have that anticapability, then the bot checks to see if the user issued the command over a channel, and if so, checks to see if the user has the antichannelcapability for that -command, '#baz,-bar'. If so, again, he tells the user that he lacks the 'bar' +command, '#baz,-bar'. If so, again, it tells the user that they lack the 'bar' capability. If neither of these anticapabilities are present, then the bot just responds to the user like normal. @@ -94,7 +94,7 @@ reserved for people with the next capability. People who are to administer channels with the bot should have the '#channel,op' capability--whatever channel they are to administrate, they should have that channel capability for 'op'. For example, since I want -inkedmn to be an administrator in #supybot, I'll give him the '#supybot,op' +inkedmn to be an administrator in #supybot, I'll give them the '#supybot,op' capability. This is in addition to his 'admin' capability, since the 'admin' capability doesn't give the person having it control over channels. '#channel,op' is used for such things as giving/receiving ops, kickbanning @@ -131,6 +131,6 @@ From an user's perspective, capabilities remove a lot of the mystery and esotery of bot control, in addition to giving a bot owner absolutely finegrained control over what users are allowed to do with the bot. Additionally, defaults can be set by the bot owner for both individual channels -and for the bot as a whole, letting an end-user set the policy he wants the bot -to follow for users that haven't yet registered in his user database. It's +and for the bot as a whole, letting an end-user set the policy they want the +bot to follow for users that haven't yet registered in its user database. It's really a revolution! diff --git a/docs/CONFIGURATION.rst b/docs/CONFIGURATION.rst index 9eeff4288..3e6334b33 100644 --- a/docs/CONFIGURATION.rst +++ b/docs/CONFIGURATION.rst @@ -188,7 +188,7 @@ configuration and user/channel/ignore database configuration. Just edit the interesting files and then give the bot the ``config reload`` command and it'll work as expected. Do note, however, that -Supybot flushes his configuration files and database to disk every hour +Supybot flushes its configuration files and database to disk every hour or so, and if this happens after you've edited your configuration files but before you reload your changes, you could lose the changes you made. To prevent this, set the `supybot.flush` value to 'Off' while editing diff --git a/docs/GETTING_STARTED.rst b/docs/GETTING_STARTED.rst index a0c7fedd3..1a9b28d6b 100644 --- a/docs/GETTING_STARTED.rst +++ b/docs/GETTING_STARTED.rst @@ -37,7 +37,7 @@ bot that you just made to join your channel? Try this in the channel:: supybot: list Replacing 'supybot' with the actual name you picked for your bot, of course. -Your bot should reply with a list of the plugins he currently has loaded. At +Your bot should reply with a list of the plugins it currently has loaded. At least `Admin`, `Channel`, `Config`, `Misc`, `Owner`, and `User` should be there; if you used supybot-wizard to create your configuration file you may have many more plugins loaded. The list command can also be used to list the diff --git a/docs/PLUGIN_TUTORIAL.rst b/docs/PLUGIN_TUTORIAL.rst index 1911ae7e2..d4909524d 100644 --- a/docs/PLUGIN_TUTORIAL.rst +++ b/docs/PLUGIN_TUTORIAL.rst @@ -186,7 +186,7 @@ configure plugins. The wizard allows the bot owner to choose something different from the default plugin config values without having to do it through the bot (which is still not difficult, but not as easy as this). Also, note that the advanced argument allows you to differentiate whether or not the -person configuring this plugin considers himself an advanced Supybot user. Our +person configuring this plugin considers themself an advanced Supybot user. Our plugin has no advanced features, so we won't be using it. So, what exactly do we do in this configure function for our plugin? Well, for diff --git a/docs/STYLE.rst b/docs/STYLE.rst index 6a21497c6..86e869bce 100644 --- a/docs/STYLE.rst +++ b/docs/STYLE.rst @@ -125,13 +125,13 @@ Style Guidelines doing isn't important for the user to pay attention to. A user who likes to keep up with things should enjoy watching our logging at the INFO level; it shouldn't be too low-level, but it should give enough - information that it keeps him relatively interested at peak times. + information that it keeps them relatively interested at peak times. - * WARNING: Appropriate to tell a user when we're doing something that he + * WARNING: Appropriate to tell a user when we're doing something that they really ought to pay attention to. Users should see WARNING and think, - "Hmm, should I tell the Supybot developers about this?" Later, he should + "Hmm, should I tell the Supybot developers about this?" Later, they should decide not to, but it should give the user a moment to pause and think - about what's actually happening with his bot. + about what's actually happening with their bot. * ERROR: Appropriate to tell a user when something has gone wrong. Uncaught exceptions are ERRORs. Conditions that we absolutely want to diff --git a/locales/de.po b/locales/de.po index a2b751c57..b9011e417 100644 --- a/locales/de.po +++ b/locales/de.po @@ -424,7 +424,7 @@ msgstr "" #: ../src/conf.py:417 msgid "" "Determines whether the bot will unidentify\n" -" someone when that person changes his or her nick. Setting this to True\n" +" someone when that person changes their nick. Setting this to True\n" " will cause the bot to track such changes. It defaults to False for a\n" " little greater security." msgstr "" @@ -721,7 +721,7 @@ msgstr "" msgid "" "Determines how many commands users are\n" " allowed per minute. If a user sends more than this many commands in any\n" -" 60 second period, he or she will be ignored for\n" +" 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.punishment seconds." msgstr "" @@ -741,7 +741,7 @@ msgstr "" msgid "" "Determines how many invalid commands users\n" " are allowed per minute. If a user sends more than this many invalid\n" -" commands in any 60 second period, he or she will be ignored for\n" +" commands in any 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.invalid.punishment seconds. Typically, this\n" " value is lower than supybot.abuse.flood.command.maximum, since it's far\n" " less likely (and far more annoying) for users to flood with invalid\n" diff --git a/locales/fi.po b/locales/fi.po index 5540ecc06..912447c1f 100644 --- a/locales/fi.po +++ b/locales/fi.po @@ -691,7 +691,7 @@ msgstr "" #: src/conf.py:489 msgid "" "Determines whether the bot will unidentify\n" -" someone when that person changes his or her nick. Setting this to True\n" +" someone when that person changes their nick. Setting this to True\n" " will cause the bot to track such changes. It defaults to False for a\n" " little greater security." msgstr "" diff --git a/locales/fr.po b/locales/fr.po index 9fe0f593e..7b5fc6d60 100644 --- a/locales/fr.po +++ b/locales/fr.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2014-01-23 10:36+CET\n" -"PO-Revision-Date: 2014-01-23 10:39+0100\n" +"PO-Revision-Date: 2014-07-05 00:13+0200\n" "Last-Translator: \n" "Language-Team: French \n" "Language: fr\n" @@ -640,7 +640,7 @@ msgstr "" #: src/conf.py:472 msgid "" "Determines whether the bot will unidentify\n" -" someone when that person changes his or her nick. Setting this to True\n" +" someone when that person changes their nick. Setting this to True\n" " will cause the bot to track such changes. It defaults to False for a\n" " little greater security." msgstr "" @@ -1086,7 +1086,7 @@ msgid "" "Determines how many commands users are\n" " allowed per minute. If a user sends more than this many commands in " "any\n" -" 60 second period, he or she will be ignored for\n" +" 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.punishment seconds." msgstr "" "Détermine le nombre maximum de commandes qu'une personne peut envoyer en " @@ -1112,7 +1112,7 @@ msgstr "" msgid "" "Determines how many invalid commands users\n" " are allowed per minute. If a user sends more than this many invalid\n" -" commands in any 60 second period, he or she will be ignored for\n" +" commands in any 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.invalid.punishment seconds. Typically, " "this\n" " value is lower than supybot.abuse.flood.command.maximum, since it's far\n" diff --git a/locales/it.po b/locales/it.po index c4e5eb139..53d67c77a 100644 --- a/locales/it.po +++ b/locales/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Supybot-fr\n" "POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2012-06-09 21:49+0200\n" +"PO-Revision-Date: 2014-07-05 00:13+0200\n" "Last-Translator: skizzhg \n" "Language-Team: Italian \n" "Language: it\n" @@ -494,7 +494,7 @@ msgstr "" #: src/conf.py:437 msgid "" "Determines whether the bot will unidentify\n" -" someone when that person changes his or her nick. Setting this to True\n" +" someone when that person changes their nick. Setting this to True\n" " will cause the bot to track such changes. It defaults to False for a\n" " little greater security." msgstr "" @@ -876,7 +876,7 @@ msgstr "Determina se il bot si difenderà dall'uso di troppi comandi alla volta msgid "" "Determines how many commands users are\n" " allowed per minute. If a user sends more than this many commands in any\n" -" 60 second period, he or she will be ignored for\n" +" 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.punishment seconds." msgstr "" "Determina quanti comandi al minuto permettere agli utenti. Se qualcuno supera\n" @@ -899,7 +899,7 @@ msgstr "Determina se il bot si difenderà dall'uso di troppi comandi non validi msgid "" "Determines how many invalid commands users\n" " are allowed per minute. If a user sends more than this many invalid\n" -" commands in any 60 second period, he or she will be ignored for\n" +" commands in any 60 second period, they will be ignored for\n" " supybot.abuse.flood.command.invalid.punishment seconds. Typically, this\n" " value is lower than supybot.abuse.flood.command.maximum, since it's far\n" " less likely (and far more annoying) for users to flood with invalid\n" diff --git a/locales/messages.pot b/locales/messages.pot index e5703fbcd..f390845cf 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -502,7 +502,7 @@ msgstr "" #: src/conf.py:489 msgid "" "Determines whether the bot will unidentify\n" -" someone when that person changes his or her nick. Setting this to True\n" +" someone when that person changes their nick. Setting this to True\n" " will cause the bot to track such changes. It defaults to False for a\n" " little greater security." msgstr "" diff --git a/plugins/Herald/config.py b/plugins/Herald/config.py index 79b98b9d2..a56ddd804 100644 --- a/plugins/Herald/config.py +++ b/plugins/Herald/config.py @@ -54,8 +54,8 @@ conf.registerChannelValue(Herald, 'throttle', between heralds."""))) conf.registerChannelValue(Herald.throttle, 'afterPart', registry.NonNegativeInteger(0, _("""Determines the minimum number of seconds - after parting that the bot will not herald the person when he or she - rejoins."""))) + after parting that the bot will not herald the person when they + rejoin."""))) conf.registerChannelValue(Herald.throttle, 'afterSplit', registry.NonNegativeInteger(60, _("""Determines the minimum number of seconds after a netsplit that the bot will not herald the users that split."""))) diff --git a/plugins/Herald/locales/fi.po b/plugins/Herald/locales/fi.po index ac8330d36..f7c469e22 100644 --- a/plugins/Herald/locales/fi.po +++ b/plugins/Herald/locales/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2011-06-27 12:56+0200\n" +"PO-Revision-Date: 2014-07-05 00:07+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -43,8 +43,8 @@ msgstr "" #: config.py:56 msgid "" "Determines the minimum number of seconds\n" -" after parting that the bot will not herald the person when he or she\n" -" rejoins." +" after parting that the bot will not herald the person when they\n" +" rejoin." msgstr "" "Määrittää minimi määrän sekunteja, jolloin\n" " henkilön poistumisen jälkeen botti ei toimi airueena, kun hän\n" diff --git a/plugins/Herald/locales/fr.po b/plugins/Herald/locales/fr.po index 05624111a..5fbdd4c0f 100644 --- a/plugins/Herald/locales/fr.po +++ b/plugins/Herald/locales/fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2010-10-17 15:21+CEST\n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2014-07-05 00:11+0200\n" "Last-Translator: Valentin Lorentz \n" "Language-Team: Limnoria \n" "Language: \n" @@ -35,8 +35,8 @@ msgstr "Détermine le nombre minimum de secondes entre deux annonces." #: config.py:56 msgid "" "Determines the minimum number of seconds\n" -" after parting that the bot will not herald the person when he or she\n" -" rejoins." +" after parting that the bot will not herald the person when they\n" +" rejoin." msgstr "Détermine le nombre minimum de secondes après qu'un utilisateur soit parti pour que le bot puisse l'annoncer à nouveau quand il revient." #: config.py:60 diff --git a/plugins/Herald/locales/it.po b/plugins/Herald/locales/it.po index c7764e5b0..475af833a 100644 --- a/plugins/Herald/locales/it.po +++ b/plugins/Herald/locales/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2012-07-24 18:47+0200\n" +"PO-Revision-Date: 2014-07-05 00:06+0200\n" "Last-Translator: skizzhg \n" "Language-Team: Italian \n" "Language: it\n" @@ -38,8 +38,8 @@ msgstr "" #: config.py:56 msgid "" "Determines the minimum number of seconds\n" -" after parting that the bot will not herald the person when he or she\n" -" rejoins." +" after parting that the bot will not herald the person when they\n" +" rejoin." msgstr "" "Determina il numero minimo di secondi dall'uscita di un utente in cui\n" " il bot non invierà l'annuncio al suo rientro." diff --git a/plugins/Herald/messages.pot b/plugins/Herald/messages.pot index 7e90c0914..4591c1999 100644 --- a/plugins/Herald/messages.pot +++ b/plugins/Herald/messages.pot @@ -37,8 +37,8 @@ msgstr "" #: config.py:56 msgid "" "Determines the minimum number of seconds\n" -" after parting that the bot will not herald the person when he or she\n" -" rejoins." +" after parting that the bot will not herald the person when they\n" +" rejoin." msgstr "" #: config.py:60 diff --git a/plugins/Relay/locales/fi.po b/plugins/Relay/locales/fi.po index db01c7631..c3767cf77 100644 --- a/plugins/Relay/locales/fi.po +++ b/plugins/Relay/locales/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2014-05-11 16:57+EEST\n" -"PO-Revision-Date: 2014-05-11 18:33+0200\n" +"PO-Revision-Date: 2014-07-05 00:09+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgid "Would you like to relay between any channels?" msgstr "Haluasitko botin välittävän joidenkin kanavien välillä?" #: config.py:40 -msgid "What channels? Separated them by spaces." +msgid "What channels? Separate them by spaces." msgstr "Minkä kanavien? Erota ne välilyönnillä." #: config.py:42 @@ -119,10 +119,10 @@ msgid "" "\n" " Starts relaying between the channel on all networks. If " "on a\n" -" network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he " +" network the bot isn't in , it'll join. This commands is\n" +" required even if the bot is in the channel on both networks; it " "won't\n" -" relay between those channels unless he's told to join both\n" +" relay between those channels unless it's told to join both\n" " channels. If is not given, starts relaying on the " "channel\n" " the message was sent in.\n" diff --git a/plugins/Relay/locales/fr.po b/plugins/Relay/locales/fr.po index 58207f48f..8d1f04461 100644 --- a/plugins/Relay/locales/fr.po +++ b/plugins/Relay/locales/fr.po @@ -16,7 +16,7 @@ msgid "Would you like to relay between any channels?" msgstr "Voulez-vous relayer entre des canaux ?" #: config.py:40 -msgid "What channels? Separated them by spaces." +msgid "What channels? Separate them by spaces." msgstr "Quels canaux ? Séparez-les par des espaces." #: config.py:42 @@ -107,10 +107,10 @@ msgid "" "\n" " Starts relaying between the channel on all networks. If " "on a\n" -" network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he " +" network the bot isn't in , it'll join. This commands is\n" +" required even if the bot is in the channel on both networks; it " "won't\n" -" relay between those channels unless he's told to join both\n" +" relay between those channels unless it's told to join both\n" " channels. If is not given, starts relaying on the " "channel\n" " the message was sent in.\n" diff --git a/plugins/Relay/locales/it.po b/plugins/Relay/locales/it.po index e09ed09d2..29eb1e804 100644 --- a/plugins/Relay/locales/it.po +++ b/plugins/Relay/locales/it.po @@ -16,7 +16,7 @@ msgid "Would you like to relay between any channels?" msgstr "Vuoi trasmettere messaggi tra canali diversi?" #: config.py:40 -msgid "What channels? Separated them by spaces." +msgid "What channels? Separate them by spaces." msgstr "Quali canali? Separali con spazi." #: config.py:42 @@ -109,10 +109,10 @@ msgid "" "\n" " Starts relaying between the channel on all networks. If " "on a\n" -" network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he " +" network the bot isn't in , it'll join. This commands is\n" +" required even if the bot is in the channel on both networks; it " "won't\n" -" relay between those channels unless he's told to join both\n" +" relay between those channels unless it's told to join both\n" " channels. If is not given, starts relaying on the " "channel\n" " the message was sent in.\n" diff --git a/plugins/Relay/messages.pot b/plugins/Relay/messages.pot index 70f97f24d..8b1fae402 100644 --- a/plugins/Relay/messages.pot +++ b/plugins/Relay/messages.pot @@ -20,7 +20,7 @@ msgid "Would you like to relay between any channels?" msgstr "" #: config.py:40 -msgid "What channels? Separated them by spaces." +msgid "What channels? Separate them by spaces." msgstr "" #: config.py:42 @@ -91,9 +91,9 @@ msgid "" "[]\n" "\n" " Starts relaying between the channel on all networks. If on a\n" -" network the bot isn't in , he'll join. This commands is\n" -" required even if the bot is in the channel on both networks; he won't\n" -" relay between those channels unless he's told to join both\n" +" network the bot isn't in , it'll join. This commands is\n" +" required even if the bot is in the channel on both networks; it won't\n" +" relay between those channels unless it's told to join both\n" " channels. If is not given, starts relaying on the channel\n" " the message was sent in.\n" " " diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py index d4eed7229..a3ccf4592 100644 --- a/plugins/Relay/plugin.py +++ b/plugins/Relay/plugin.py @@ -99,9 +99,9 @@ class Relay(callbacks.Plugin): """[] Starts relaying between the channel on all networks. If on a - network the bot isn't in , he'll join. This commands is - required even if the bot is in the channel on both networks; he won't - relay between those channels unless he's told to join both + network the bot isn't in , it'll join. This commands is + required even if the bot is in the channel on both networks; it won't + relay between those channels unless it's told to join both channels. If is not given, starts relaying on the channel the message was sent in. """ diff --git a/plugins/Topic/locales/fi.po b/plugins/Topic/locales/fi.po index b4161a705..b277d7635 100644 --- a/plugins/Topic/locales/fi.po +++ b/plugins/Topic/locales/fi.po @@ -133,7 +133,7 @@ msgid "" " The list of required capabilities is in requireManageCapability\n" " channel config.\n" "\n" -" Also allow if the user is a chanop. Since he can change the topic\n" +" Also allow if the user is a chanop. Since they can change the topic\n" " manually anyway.\n" " " msgstr "" diff --git a/plugins/Topic/locales/fr.po b/plugins/Topic/locales/fr.po index b4d38b792..bc9a4ea9e 100644 --- a/plugins/Topic/locales/fr.po +++ b/plugins/Topic/locales/fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2014-01-21 22:32+CET\n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2014-07-05 00:09+0200\n" "Last-Translator: \n" "Language-Team: Limnoria \n" "MIME-Version: 1.0\n" @@ -123,7 +123,7 @@ msgid "" " The list of required capabilities is in requireManageCapability\n" " channel config.\n" "\n" -" Also allow if the user is a chanop. Since he can change the topic\n" +" Also allow if the user is a chanop. Since they can change the topic\n" " manually anyway.\n" " " msgstr "." diff --git a/plugins/Topic/locales/it.po b/plugins/Topic/locales/it.po index 10139c9fc..cba9b8f2d 100644 --- a/plugins/Topic/locales/it.po +++ b/plugins/Topic/locales/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2011-07-20 17:27+0200\n" +"PO-Revision-Date: 2014-07-05 00:09+0200\n" "Last-Translator: skizzhg \n" "Language-Team: Italian \n" "Language: it\n" @@ -102,7 +102,7 @@ msgid "" " The list of required capabilities is in requireManageCapability\n" " channel config.\n" "\n" -" Also allow if the user is a chanop. Since he can change the topic\n" +" Also allow if the user is a chanop. Since they can change the topic\n" " manually anyway.\n" " " msgstr "" diff --git a/plugins/Topic/messages.pot b/plugins/Topic/messages.pot index 3123cd2d1..0d6597029 100644 --- a/plugins/Topic/messages.pot +++ b/plugins/Topic/messages.pot @@ -102,7 +102,7 @@ msgid "" " The list of required capabilities is in requireManageCapability\n" " channel config.\n" "\n" -" Also allow if the user is a chanop. Since he can change the topic\n" +" Also allow if the user is a chanop. Since they can change the topic\n" " manually anyway.\n" " " msgstr "" diff --git a/plugins/Topic/plugin.py b/plugins/Topic/plugin.py index 4804172fd..64869ea17 100644 --- a/plugins/Topic/plugin.py +++ b/plugins/Topic/plugin.py @@ -222,7 +222,7 @@ class Topic(callbacks.Plugin): The list of required capabilities is in requireManageCapability channel config. - Also allow if the user is a chanop. Since he can change the topic + Also allow if the user is a chanop. Since they can change the topic manually anyway. """ c = irc.state.channels[channel] diff --git a/plugins/User/locales/de.po b/plugins/User/locales/de.po index 14af6637b..5bb97a2b1 100644 --- a/plugins/User/locales/de.po +++ b/plugins/User/locales/de.po @@ -121,7 +121,7 @@ msgid "" " Sets the secure flag on the user of the person sending the message.\n" " Requires that the person's hostmask be in the list of hostmasks for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she can be\n" +" secure flag is set, the user *must* identify before they can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" " " diff --git a/plugins/User/locales/fi.po b/plugins/User/locales/fi.po index ce29cde1b..b76b1c221 100644 --- a/plugins/User/locales/fi.po +++ b/plugins/User/locales/fi.po @@ -176,7 +176,7 @@ msgid "" " Requires that the person's hostmask be in the list of hostmasks " "for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she " +" secure flag is set, the user *must* identify before they " "can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" diff --git a/plugins/User/locales/fr.po b/plugins/User/locales/fr.po index bbe910da0..51fe66dee 100644 --- a/plugins/User/locales/fr.po +++ b/plugins/User/locales/fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2014-01-22 07:53+CET\n" -"PO-Revision-Date: \n" +"PO-Revision-Date: 2014-07-05 00:10+0200\n" "Last-Translator: \n" "Language-Team: Limnoria \n" "MIME-Version: 1.0\n" @@ -158,7 +158,7 @@ msgid "" " Requires that the person's hostmask be in the list of hostmasks " "for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she " +" secure flag is set, the user *must* identify before they " "can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" diff --git a/plugins/User/locales/hu.po b/plugins/User/locales/hu.po index f16777a64..0521eb1dc 100644 --- a/plugins/User/locales/hu.po +++ b/plugins/User/locales/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria User\n" "POT-Creation-Date: 2011-12-23 13:11+CET\n" -"PO-Revision-Date: 2012-04-27 15:16+0200\n" +"PO-Revision-Date: 2014-07-05 00:10+0200\n" "Last-Translator: Mikaela Suomalainen \n" "Language-Team: \n" "Language: \n" @@ -109,7 +109,7 @@ msgid "" " Sets the secure flag on the user of the person sending the message.\n" " Requires that the person's hostmask be in the list of hostmasks for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she can be\n" +" secure flag is set, the user *must* identify before they can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" " " diff --git a/plugins/User/locales/it.po b/plugins/User/locales/it.po index ba610e907..b9c87e17d 100644 --- a/plugins/User/locales/it.po +++ b/plugins/User/locales/it.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Limnoria\n" "POT-Creation-Date: 2011-02-26 09:49+CET\n" -"PO-Revision-Date: 2012-01-02 20:43+0100\n" +"PO-Revision-Date: 2014-07-05 00:10+0200\n" "Last-Translator: skizzhg \n" "Language-Team: Italian \n" "Language: it\n" @@ -144,7 +144,7 @@ msgid "" " Sets the secure flag on the user of the person sending the message.\n" " Requires that the person's hostmask be in the list of hostmasks for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she can be\n" +" secure flag is set, the user *must* identify before they can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" " " diff --git a/plugins/User/messages.pot b/plugins/User/messages.pot index 040f796bc..4428a2d5b 100644 --- a/plugins/User/messages.pot +++ b/plugins/User/messages.pot @@ -119,7 +119,7 @@ msgid "" " Sets the secure flag on the user of the person sending the message.\n" " Requires that the person's hostmask be in the list of hostmasks for\n" " that user in addition to the password being correct. When the\n" -" secure flag is set, the user *must* identify before he or she can be\n" +" secure flag is set, the user *must* identify before they can be\n" " recognized. If a specific True/False value is not given, it\n" " inverts the current value.\n" " " diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py index 27046fd3b..d690c1eee 100644 --- a/plugins/User/plugin.py +++ b/plugins/User/plugin.py @@ -224,7 +224,7 @@ class User(callbacks.Plugin): Sets the secure flag on the user of the person sending the message. Requires that the person's hostmask be in the list of hostmasks for that user in addition to the password being correct. When the - secure flag is set, the user *must* identify before he or she can be + secure flag is set, the user *must* identify before they can be recognized. If a specific True/False value is not given, it inverts the current value. """ diff --git a/sandbox/Debug/config.py b/sandbox/Debug/config.py index 615ad006f..03d8ed180 100644 --- a/sandbox/Debug/config.py +++ b/sandbox/Debug/config.py @@ -32,7 +32,7 @@ import supybot.registry as registry def configure(advanced): # This will be called by supybot to configure this module. advanced is - # a bool that specifies whether the user identified himself as an advanced + # a bool that specifies whether the user identified themself as an advanced # user or not. You should effect your configuration by manipulating the # registry as appropriate. from supybot.questions import expect, anything, something, yn diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index d4bb34cff..59d20bb47 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -265,7 +265,7 @@ def main(): directories we need right here in this directory.""") # conf.supybot.directories.log - output("""Your bot will need to put his logs somewhere. Do you have + output("""Your bot will need to put its logs somewhere. Do you have any specific place you'd like them? If not, just press enter and we'll make a directory named "logs" right here.""") (logDir, basedir) = getDirectoryName('logs') @@ -280,11 +280,11 @@ def main(): conf.supybot.directories.data.setValue(dataDir) # conf.supybot.directories.conf - output("""Your bot must know where to find his configuration files. + output("""Your bot must know where to find its configuration files. It'll probably only make one or two, but it's gotta have some place to put them. Where should that place be? If you don't care, just press enter and we'll make a directory right here named "conf" where it'll - store his stuff. """) + store its stuff. """) (confDir, basedir) = getDirectoryName('conf', basedir=basedir) conf.supybot.directories.conf.setValue(confDir) @@ -292,12 +292,12 @@ def main(): output("""Your bot must know where to place backups of its conf and data files. Where should that place be? If you don't care, just press enter and we'll make a directory right here named "backup" where it'll - store his stuff.""") + store its stuff.""") (backupDir, basedir) = getDirectoryName('backup', basedir=basedir) conf.supybot.directories.backup.setValue(backupDir) # pluginDirs - output("""Your bot will also need to know where to find his plugins at. + output("""Your bot will also need to know where to find its plugins at. Of course, it already knows where the plugins that it came with are, but your own personal plugins that you write for will probably be somewhere else.""") diff --git a/src/conf.py b/src/conf.py index 5fd9a9006..b99feecf4 100644 --- a/src/conf.py +++ b/src/conf.py @@ -487,7 +487,7 @@ registerChannelValue(supybot.reply, 'requireChannelCommandsToBeSentInChannel', registerGlobalValue(supybot, 'followIdentificationThroughNickChanges', registry.Boolean(False, _("""Determines whether the bot will unidentify - someone when that person changes his or her nick. Setting this to True + someone when that person changes their nick. Setting this to True will cause the bot to track such changes. It defaults to False for a little greater security."""))) diff --git a/src/ircmsgs.py b/src/ircmsgs.py index a1254592f..9df9576ae 100644 --- a/src/ircmsgs.py +++ b/src/ircmsgs.py @@ -72,8 +72,8 @@ class IrcMsg(object): Since this class isn't to be modified, the constructor also accepts a 'msg' keyword argument representing a message from which to take all the attributes not provided otherwise as keyword arguments. So, for instance, - if a programmer wanted to take a PRIVMSG he'd gotten and simply redirect it - to a different source, they could do this: + if a programmer wanted to take a PRIVMSG they'd gotten and simply redirect + it to a different source, they could do this: IrcMsg(prefix='', args=(newSource, otherMsg.args[1]), msg=otherMsg) """ diff --git a/src/schedule.py b/src/schedule.py index 3249a8f2c..0749a8c5a 100644 --- a/src/schedule.py +++ b/src/schedule.py @@ -71,7 +71,7 @@ class Schedule(drivers.IrcDriver): self.schedule[:] = [] # We don't reset the counter here because if someone has held an id of # one of the nuked events, we don't want them removing new events with - # his/her old id. + # their old id. def name(self): return 'Schedule'