Skip to content

Commit 8e11dc8

Browse files
committed
Use gender-neutral pronouns everywhere
1 parent 9ac4ee8 commit 8e11dc8

39 files changed

+90
-90
lines changed

ChangeLog

+4-4
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@
13951395

13961396
* Changed User.setpassword not to require the <old password> to
13971397
be correct if the requesting user has the owner capability (and
1398-
isn't the owner himself).
1398+
isn't the owner themself).
13991399

14001400
* Added ircutils.strip{Bold,Reverse,Underline,Formatting}, which
14011401
will remove the specified formatting or all forms of formatting
@@ -1582,7 +1582,7 @@
15821582
having the bot always attempt to parse a message as a command.
15831583

15841584
* Added conf.replyWhenAddressedByNick, a configuration variable
1585-
for having the bot *not* respond when addressed by his nick.
1585+
for having the bot *not* respond when addressed by its nick.
15861586

15871587
* Added conf.replyWithNickPrefix, a configuration variable for
15881588
having the bot not prefix the nick of the person giving a command
@@ -1933,14 +1933,14 @@
19331933
* Fixed imports in the DCC plugin.
19341934

19351935
* Fixed a bug where the bot would not reply to nick-addressed
1936-
messages on a channel if his nick wasn't entirely lowercased.
1936+
messages on a channel if its nick wasn't entirely lowercased.
19371937

19381938
* Fixed the Relay plugin to relay topic changes; an oversight not
19391939
caught earlier because supybot has for a long time managed our
19401940
topics.
19411941

19421942
* Fixed a bug in the Services plugin where the bot would ghost
1943-
himself if his nick didn't match in case the nick given.
1943+
itself if its nick didn't match in case the nick given.
19441944

19451945
* Added the ability for PrivmsgCommandAndRegexp to have regexps
19461946
that are called *after* callbacks.addressed has been called on the

docs/ADVANCED_PLUGIN_CONFIG.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ realize what the code is actually doing. Here it is:
8080

8181
def configure(advanced):
8282
# This will be called by supybot to configure this module. advanced is
83-
# a bool that specifies whether the user identified himself as an advanced
83+
# a bool that specifies whether the user identified themself as an advanced
8484
# user or not. You should effect your configuration by manipulating the
8585
# registry as appropriate.
8686
from supybot.questions import expect, anything, something, yn

docs/CAPABILITIES.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ an individual channel!
6767
So when a user 'foo' sends a command 'bar' to the bot on channel '#baz', first
6868
the bot checks to see if the user has the anticapability for the command by
6969
itself, '-bar'. If so, it errors right then and there, telling the user that
70-
he lacks the 'bar' capability. If the user doesn't have that anticapability,
70+
they lack the 'bar' capability. If the user doesn't have that anticapability,
7171
then the bot checks to see if the user issued the command over a channel, and
7272
if so, checks to see if the user has the antichannelcapability for that
73-
command, '#baz,-bar'. If so, again, he tells the user that he lacks the 'bar'
73+
command, '#baz,-bar'. If so, again, it tells the user that they lack the 'bar'
7474
capability. If neither of these anticapabilities are present, then the bot
7575
just responds to the user like normal.
7676

@@ -94,7 +94,7 @@ reserved for people with the next capability.
9494
People who are to administer channels with the bot should have the
9595
'#channel,op' capability--whatever channel they are to administrate, they
9696
should have that channel capability for 'op'. For example, since I want
97-
inkedmn to be an administrator in #supybot, I'll give him the '#supybot,op'
97+
inkedmn to be an administrator in #supybot, I'll give them the '#supybot,op'
9898
capability. This is in addition to his 'admin' capability, since the 'admin'
9999
capability doesn't give the person having it control over channels.
100100
'#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
131131
esotery of bot control, in addition to giving a bot owner absolutely
132132
finegrained control over what users are allowed to do with the bot.
133133
Additionally, defaults can be set by the bot owner for both individual channels
134-
and for the bot as a whole, letting an end-user set the policy he wants the bot
135-
to follow for users that haven't yet registered in his user database. It's
134+
and for the bot as a whole, letting an end-user set the policy they want the
135+
bot to follow for users that haven't yet registered in its user database. It's
136136
really a revolution!

docs/CONFIGURATION.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ configuration and user/channel/ignore database configuration.
188188

189189
Just edit the interesting files and then give the bot the ``config
190190
reload`` command and it'll work as expected. Do note, however, that
191-
Supybot flushes his configuration files and database to disk every hour
191+
Supybot flushes its configuration files and database to disk every hour
192192
or so, and if this happens after you've edited your configuration files
193193
but before you reload your changes, you could lose the changes you made.
194194
To prevent this, set the `supybot.flush` value to 'Off' while editing

docs/GETTING_STARTED.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ bot that you just made to join your channel? Try this in the channel::
3737
supybot: list
3838

3939
Replacing 'supybot' with the actual name you picked for your bot, of course.
40-
Your bot should reply with a list of the plugins he currently has loaded. At
40+
Your bot should reply with a list of the plugins it currently has loaded. At
4141
least `Admin`, `Channel`, `Config`, `Misc`, `Owner`, and `User` should be
4242
there; if you used supybot-wizard to create your configuration file you may
4343
have many more plugins loaded. The list command can also be used to list the

docs/PLUGIN_TUTORIAL.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ configure plugins. The wizard allows the bot owner to choose something
186186
different from the default plugin config values without having to do it through
187187
the bot (which is still not difficult, but not as easy as this). Also, note
188188
that the advanced argument allows you to differentiate whether or not the
189-
person configuring this plugin considers himself an advanced Supybot user. Our
189+
person configuring this plugin considers themself an advanced Supybot user. Our
190190
plugin has no advanced features, so we won't be using it.
191191

192192
So, what exactly do we do in this configure function for our plugin? Well, for

docs/STYLE.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ Style Guidelines
125125
doing isn't important for the user to pay attention to. A user who likes
126126
to keep up with things should enjoy watching our logging at the INFO
127127
level; it shouldn't be too low-level, but it should give enough
128-
information that it keeps him relatively interested at peak times.
128+
information that it keeps them relatively interested at peak times.
129129

130-
* WARNING: Appropriate to tell a user when we're doing something that he
130+
* WARNING: Appropriate to tell a user when we're doing something that they
131131
really ought to pay attention to. Users should see WARNING and think,
132-
"Hmm, should I tell the Supybot developers about this?" Later, he should
132+
"Hmm, should I tell the Supybot developers about this?" Later, they should
133133
decide not to, but it should give the user a moment to pause and think
134-
about what's actually happening with his bot.
134+
about what's actually happening with their bot.
135135

136136
* ERROR: Appropriate to tell a user when something has gone wrong.
137137
Uncaught exceptions are ERRORs. Conditions that we absolutely want to

locales/de.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ msgstr ""
424424
#: ../src/conf.py:417
425425
msgid ""
426426
"Determines whether the bot will unidentify\n"
427-
" someone when that person changes his or her nick. Setting this to True\n"
427+
" someone when that person changes their nick. Setting this to True\n"
428428
" will cause the bot to track such changes. It defaults to False for a\n"
429429
" little greater security."
430430
msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
721721
msgid ""
722722
"Determines how many commands users are\n"
723723
" allowed per minute. If a user sends more than this many commands in any\n"
724-
" 60 second period, he or she will be ignored for\n"
724+
" 60 second period, they will be ignored for\n"
725725
" supybot.abuse.flood.command.punishment seconds."
726726
msgstr ""
727727

@@ -741,7 +741,7 @@ msgstr ""
741741
msgid ""
742742
"Determines how many invalid commands users\n"
743743
" are allowed per minute. If a user sends more than this many invalid\n"
744-
" commands in any 60 second period, he or she will be ignored for\n"
744+
" commands in any 60 second period, they will be ignored for\n"
745745
" supybot.abuse.flood.command.invalid.punishment seconds. Typically, this\n"
746746
" value is lower than supybot.abuse.flood.command.maximum, since it's far\n"
747747
" less likely (and far more annoying) for users to flood with invalid\n"

locales/fi.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ msgstr ""
691691
#: src/conf.py:489
692692
msgid ""
693693
"Determines whether the bot will unidentify\n"
694-
" someone when that person changes his or her nick. Setting this to True\n"
694+
" someone when that person changes their nick. Setting this to True\n"
695695
" will cause the bot to track such changes. It defaults to False for a\n"
696696
" little greater security."
697697
msgstr ""

locales/fr.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ msgid ""
33
msgstr ""
44
"Project-Id-Version: Limnoria\n"
55
"POT-Creation-Date: 2014-01-23 10:36+CET\n"
6-
"PO-Revision-Date: 2014-01-23 10:39+0100\n"
6+
"PO-Revision-Date: 2014-07-05 00:13+0200\n"
77
"Last-Translator: \n"
88
"Language-Team: French <[email protected]>\n"
99
"Language: fr\n"
@@ -640,7 +640,7 @@ msgstr ""
640640
#: src/conf.py:472
641641
msgid ""
642642
"Determines whether the bot will unidentify\n"
643-
" someone when that person changes his or her nick. Setting this to True\n"
643+
" someone when that person changes their nick. Setting this to True\n"
644644
" will cause the bot to track such changes. It defaults to False for a\n"
645645
" little greater security."
646646
msgstr ""
@@ -1086,7 +1086,7 @@ msgid ""
10861086
"Determines how many commands users are\n"
10871087
" allowed per minute. If a user sends more than this many commands in "
10881088
"any\n"
1089-
" 60 second period, he or she will be ignored for\n"
1089+
" 60 second period, they will be ignored for\n"
10901090
" supybot.abuse.flood.command.punishment seconds."
10911091
msgstr ""
10921092
"Détermine le nombre maximum de commandes qu'une personne peut envoyer en "
@@ -1112,7 +1112,7 @@ msgstr ""
11121112
msgid ""
11131113
"Determines how many invalid commands users\n"
11141114
" are allowed per minute. If a user sends more than this many invalid\n"
1115-
" commands in any 60 second period, he or she will be ignored for\n"
1115+
" commands in any 60 second period, they will be ignored for\n"
11161116
" supybot.abuse.flood.command.invalid.punishment seconds. Typically, "
11171117
"this\n"
11181118
" value is lower than supybot.abuse.flood.command.maximum, since it's far\n"

locales/it.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Supybot-fr\n"
44
"POT-Creation-Date: 2011-02-26 09:49+CET\n"
5-
"PO-Revision-Date: 2012-06-09 21:49+0200\n"
5+
"PO-Revision-Date: 2014-07-05 00:13+0200\n"
66
"Last-Translator: skizzhg <[email protected]>\n"
77
"Language-Team: Italian <[email protected]>\n"
88
"Language: it\n"
@@ -494,7 +494,7 @@ msgstr ""
494494
#: src/conf.py:437
495495
msgid ""
496496
"Determines whether the bot will unidentify\n"
497-
" someone when that person changes his or her nick. Setting this to True\n"
497+
" someone when that person changes their nick. Setting this to True\n"
498498
" will cause the bot to track such changes. It defaults to False for a\n"
499499
" little greater security."
500500
msgstr ""
@@ -876,7 +876,7 @@ msgstr "Determina se il bot si difenderà dall'uso di troppi comandi alla volta
876876
msgid ""
877877
"Determines how many commands users are\n"
878878
" allowed per minute. If a user sends more than this many commands in any\n"
879-
" 60 second period, he or she will be ignored for\n"
879+
" 60 second period, they will be ignored for\n"
880880
" supybot.abuse.flood.command.punishment seconds."
881881
msgstr ""
882882
"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
899899
msgid ""
900900
"Determines how many invalid commands users\n"
901901
" are allowed per minute. If a user sends more than this many invalid\n"
902-
" commands in any 60 second period, he or she will be ignored for\n"
902+
" commands in any 60 second period, they will be ignored for\n"
903903
" supybot.abuse.flood.command.invalid.punishment seconds. Typically, this\n"
904904
" value is lower than supybot.abuse.flood.command.maximum, since it's far\n"
905905
" less likely (and far more annoying) for users to flood with invalid\n"

locales/messages.pot

+1-1
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ msgstr ""
502502
#: src/conf.py:489
503503
msgid ""
504504
"Determines whether the bot will unidentify\n"
505-
" someone when that person changes his or her nick. Setting this to True\n"
505+
" someone when that person changes their nick. Setting this to True\n"
506506
" will cause the bot to track such changes. It defaults to False for a\n"
507507
" little greater security."
508508
msgstr ""

plugins/Herald/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def configure(advanced):
5454
between heralds.""")))
5555
conf.registerChannelValue(Herald.throttle, 'afterPart',
5656
registry.NonNegativeInteger(0, _("""Determines the minimum number of seconds
57-
after parting that the bot will not herald the person when he or she
58-
rejoins.""")))
57+
after parting that the bot will not herald the person when they
58+
rejoin.""")))
5959
conf.registerChannelValue(Herald.throttle, 'afterSplit',
6060
registry.NonNegativeInteger(60, _("""Determines the minimum number of seconds
6161
after a netsplit that the bot will not herald the users that split.""")))

plugins/Herald/locales/fi.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: \n"
88
"POT-Creation-Date: 2011-02-26 09:49+CET\n"
9-
"PO-Revision-Date: 2011-06-27 12:56+0200\n"
9+
"PO-Revision-Date: 2014-07-05 00:07+0200\n"
1010
"Last-Translator: Mikaela Suomalainen <[email protected]>\n"
1111
"Language-Team: \n"
1212
"MIME-Version: 1.0\n"
@@ -43,8 +43,8 @@ msgstr ""
4343
#: config.py:56
4444
msgid ""
4545
"Determines the minimum number of seconds\n"
46-
" after parting that the bot will not herald the person when he or she\n"
47-
" rejoins."
46+
" after parting that the bot will not herald the person when they\n"
47+
" rejoin."
4848
msgstr ""
4949
"Määrittää minimi määrän sekunteja, jolloin\n"
5050
" henkilön poistumisen jälkeen botti ei toimi airueena, kun hän\n"

plugins/Herald/locales/fr.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Limnoria\n"
44
"POT-Creation-Date: 2010-10-17 15:21+CEST\n"
5-
"PO-Revision-Date: \n"
5+
"PO-Revision-Date: 2014-07-05 00:11+0200\n"
66
"Last-Translator: Valentin Lorentz <[email protected]>\n"
77
"Language-Team: Limnoria <[email protected]>\n"
88
"Language: \n"
@@ -35,8 +35,8 @@ msgstr "Détermine le nombre minimum de secondes entre deux annonces."
3535
#: config.py:56
3636
msgid ""
3737
"Determines the minimum number of seconds\n"
38-
" after parting that the bot will not herald the person when he or she\n"
39-
" rejoins."
38+
" after parting that the bot will not herald the person when they\n"
39+
" rejoin."
4040
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."
4141

4242
#: config.py:60

plugins/Herald/locales/it.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ msgid ""
22
msgstr ""
33
"Project-Id-Version: Limnoria\n"
44
"POT-Creation-Date: 2011-02-26 09:49+CET\n"
5-
"PO-Revision-Date: 2012-07-24 18:47+0200\n"
5+
"PO-Revision-Date: 2014-07-05 00:06+0200\n"
66
"Last-Translator: skizzhg <[email protected]>\n"
77
"Language-Team: Italian <[email protected]>\n"
88
"Language: it\n"
@@ -38,8 +38,8 @@ msgstr ""
3838
#: config.py:56
3939
msgid ""
4040
"Determines the minimum number of seconds\n"
41-
" after parting that the bot will not herald the person when he or she\n"
42-
" rejoins."
41+
" after parting that the bot will not herald the person when they\n"
42+
" rejoin."
4343
msgstr ""
4444
"Determina il numero minimo di secondi dall'uscita di un utente in cui\n"
4545
" il bot non invierà l'annuncio al suo rientro."

plugins/Herald/messages.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ msgstr ""
3737
#: config.py:56
3838
msgid ""
3939
"Determines the minimum number of seconds\n"
40-
" after parting that the bot will not herald the person when he or she\n"
41-
" rejoins."
40+
" after parting that the bot will not herald the person when they\n"
41+
" rejoin."
4242
msgstr ""
4343

4444
#: config.py:60

plugins/Relay/locales/fi.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgid ""
66
msgstr ""
77
"Project-Id-Version: \n"
88
"POT-Creation-Date: 2014-05-11 16:57+EEST\n"
9-
"PO-Revision-Date: 2014-05-11 18:33+0200\n"
9+
"PO-Revision-Date: 2014-07-05 00:09+0200\n"
1010
"Last-Translator: Mikaela Suomalainen <[email protected]>\n"
1111
"Language-Team: \n"
1212
"MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgid "Would you like to relay between any channels?"
2020
msgstr "Haluasitko botin välittävän joidenkin kanavien välillä?"
2121

2222
#: config.py:40
23-
msgid "What channels? Separated them by spaces."
23+
msgid "What channels? Separate them by spaces."
2424
msgstr "Minkä kanavien? Erota ne välilyönnillä."
2525

2626
#: config.py:42
@@ -119,10 +119,10 @@ msgid ""
119119
"\n"
120120
" Starts relaying between the channel <channel> on all networks. If "
121121
"on a\n"
122-
" network the bot isn't in <channel>, he'll join. This commands is\n"
123-
" required even if the bot is in the channel on both networks; he "
122+
" network the bot isn't in <channel>, it'll join. This commands is\n"
123+
" required even if the bot is in the channel on both networks; it "
124124
"won't\n"
125-
" relay between those channels unless he's told to join both\n"
125+
" relay between those channels unless it's told to join both\n"
126126
" channels. If <channel> is not given, starts relaying on the "
127127
"channel\n"
128128
" the message was sent in.\n"

plugins/Relay/locales/fr.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ msgid "Would you like to relay between any channels?"
1616
msgstr "Voulez-vous relayer entre des canaux ?"
1717

1818
#: config.py:40
19-
msgid "What channels? Separated them by spaces."
19+
msgid "What channels? Separate them by spaces."
2020
msgstr "Quels canaux ? Séparez-les par des espaces."
2121

2222
#: config.py:42
@@ -107,10 +107,10 @@ msgid ""
107107
"\n"
108108
" Starts relaying between the channel <channel> on all networks. If "
109109
"on a\n"
110-
" network the bot isn't in <channel>, he'll join. This commands is\n"
111-
" required even if the bot is in the channel on both networks; he "
110+
" network the bot isn't in <channel>, it'll join. This commands is\n"
111+
" required even if the bot is in the channel on both networks; it "
112112
"won't\n"
113-
" relay between those channels unless he's told to join both\n"
113+
" relay between those channels unless it's told to join both\n"
114114
" channels. If <channel> is not given, starts relaying on the "
115115
"channel\n"
116116
" the message was sent in.\n"

plugins/Relay/locales/it.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ msgid "Would you like to relay between any channels?"
1616
msgstr "Vuoi trasmettere messaggi tra canali diversi?"
1717

1818
#: config.py:40
19-
msgid "What channels? Separated them by spaces."
19+
msgid "What channels? Separate them by spaces."
2020
msgstr "Quali canali? Separali con spazi."
2121

2222
#: config.py:42
@@ -109,10 +109,10 @@ msgid ""
109109
"\n"
110110
" Starts relaying between the channel <channel> on all networks. If "
111111
"on a\n"
112-
" network the bot isn't in <channel>, he'll join. This commands is\n"
113-
" required even if the bot is in the channel on both networks; he "
112+
" network the bot isn't in <channel>, it'll join. This commands is\n"
113+
" required even if the bot is in the channel on both networks; it "
114114
"won't\n"
115-
" relay between those channels unless he's told to join both\n"
115+
" relay between those channels unless it's told to join both\n"
116116
" channels. If <channel> is not given, starts relaying on the "
117117
"channel\n"
118118
" the message was sent in.\n"

0 commit comments

Comments
 (0)