diff --git a/plugins/Admin/plugin.py b/plugins/Admin/plugin.py index 2c3c9d3bf..64afafb37 100644 --- a/plugins/Admin/plugin.py +++ b/plugins/Admin/plugin.py @@ -265,7 +265,7 @@ class Admin(callbacks.Plugin): """ # Ok, the concepts that are important with capabilities: # - ### 1) No user should be able to elevate his privilege to owner. + ### 1) No user should be able to elevate their privilege to owner. ### 2) Admin users are *not* superior to #channel.ops, and don't ### have God-like powers over channels. ### 3) We assume that Admin users are two things: non-malicious and diff --git a/plugins/Misc/locales/de.po b/plugins/Misc/locales/de.po index b22b7afac..4bf12785d 100644 --- a/plugins/Misc/locales/de.po +++ b/plugins/Misc/locales/de.po @@ -244,7 +244,7 @@ msgstr "" "Sagt den Inhalt von . Benutze verschachtelte Befehle um nutzen daraus zu ziehen." #: plugin.py:483 -msgid "Dude, just give the command. No need for the tell." +msgid "Hey, just give the command. No need for the tell." msgstr "Junge, gib mir einfach den Befehl." #: plugin.py:488 diff --git a/plugins/Misc/locales/fi.po b/plugins/Misc/locales/fi.po index dc4ecbc8e..4ac84cb59 100644 --- a/plugins/Misc/locales/fi.po +++ b/plugins/Misc/locales/fi.po @@ -291,7 +291,7 @@ msgstr "" " " #: plugin.py:513 -msgid "Dude, just give the command. No need for the tell." +msgid "Hey, just give the command. No need for the tell." msgstr "Keikari, anna vain komento. Ei tarvitse kertoa." #: plugin.py:518 diff --git a/plugins/Misc/locales/fr.po b/plugins/Misc/locales/fr.po index 7e7fef419..25fc049dc 100644 --- a/plugins/Misc/locales/fr.po +++ b/plugins/Misc/locales/fr.po @@ -248,8 +248,8 @@ msgstr "" "Dit le au . Utile si vous utilisez des commandes imbriquées." #: plugin.py:513 -msgid "Dude, just give the command. No need for the tell." -msgstr "Mec, contentes-toi de me donner la commande. Pas besoin d'utiliser 'tell'." +msgid "Hey, just give the command. No need for the tell." +msgstr "Oh, contentes-toi de me donner la commande. Pas besoin d'utiliser 'tell'." #: plugin.py:518 msgid "You just told me, why should I tell myself?" diff --git a/plugins/Misc/locales/hu.po b/plugins/Misc/locales/hu.po index 962322137..ee90efb8b 100644 --- a/plugins/Misc/locales/hu.po +++ b/plugins/Misc/locales/hu.po @@ -242,7 +242,7 @@ msgid "" msgstr " Megmondja -nek szöveget. Itt az előnyödre használhatod a beágyazott parancsokat." #: plugin.py:483 -msgid "Dude, just give the command. No need for the tell." +msgid "Hey, just give the command. No need for the tell." msgstr "Haver, csak add meg a parancsot. Nem kell mondani." #: plugin.py:488 diff --git a/plugins/Misc/locales/it.po b/plugins/Misc/locales/it.po index c1d8f6066..58926f539 100644 --- a/plugins/Misc/locales/it.po +++ b/plugins/Misc/locales/it.po @@ -281,7 +281,7 @@ msgstr "" " " #: plugin.py:483 -msgid "Dude, just give the command. No need for the tell." +msgid "Hey, just give the command. No need for the tell." msgstr "Dammi il comando, non c'è bisogno di usare \"tell\"." #: plugin.py:488 diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py index 64e297bca..c3a1af668 100644 --- a/plugins/Misc/plugin.py +++ b/plugins/Misc/plugin.py @@ -509,7 +509,7 @@ class Misc(callbacks.Plugin): if target.lower() == 'me': target = msg.nick if ircutils.isChannel(target): - irc.error(_('Dude, just give the command. No need for the tell.')) + irc.error(_('Hey, just give the command. No need for the tell.')) return if not ircutils.isNick(target): irc.errorInvalid('nick', target) diff --git a/plugins/MoobotFactoids/test.py b/plugins/MoobotFactoids/test.py index ee8688153..be0ba98b7 100644 --- a/plugins/MoobotFactoids/test.py +++ b/plugins/MoobotFactoids/test.py @@ -329,7 +329,7 @@ class FactoidsTestCase(ChannelPluginTestCase): self.assertNoResponse(' ', 3) def testConfigShowFactoidIfOnlyOneMatch(self): - # man these are long + # these are long MFconf = conf.supybot.plugins.MoobotFactoids self.assertNotError('foo is bar') # Default to saying the factoid value diff --git a/plugins/User/locales/de.po b/plugins/User/locales/de.po index 20df76b49..c978cdb85 100644 --- a/plugins/User/locales/de.po +++ b/plugins/User/locales/de.po @@ -225,7 +225,7 @@ msgid "" " Removes the hostmask from the record of the user\n" " specified by . If the hostmask given is 'all' then all\n" " hostmasks will be removed. The may only be required if\n" -" the user is not recognized by his hostmask. This message must be\n" +" the user is not recognized by their hostmask. This message must be\n" " sent to the bot privately (not on a channel) since it may contain a\n" " password.\n" " " diff --git a/plugins/User/locales/fi.po b/plugins/User/locales/fi.po index b505811ed..03cba91b9 100644 --- a/plugins/User/locales/fi.po +++ b/plugins/User/locales/fi.po @@ -275,7 +275,7 @@ msgid "" " Removes the hostmask from the record of the user\n" " specified by . If the hostmask given is 'all' then all\n" " hostmasks will be removed. The may only be required if\n" -" the user is not recognized by his hostmask. This message must be\n" +" the user is not recognized by their hostmask. This message must be\n" " sent to the bot privately (not on a channel) since it may contain a\n" " password.\n" " " diff --git a/plugins/User/locales/fr.po b/plugins/User/locales/fr.po index 30e1b931f..2fa064ede 100644 --- a/plugins/User/locales/fr.po +++ b/plugins/User/locales/fr.po @@ -293,7 +293,7 @@ msgid "" " specified by . If the hostmask given is 'all' then all\n" " hostmasks will be removed. The may only be required " "if\n" -" the user is not recognized by his hostmask. This message must " +" the user is not recognized by their hostmask. This message must " "be\n" " sent to the bot privately (not on a channel) since it may " "contain a\n" diff --git a/plugins/User/locales/hu.po b/plugins/User/locales/hu.po index 21f0d8abb..ee9e8857f 100644 --- a/plugins/User/locales/hu.po +++ b/plugins/User/locales/hu.po @@ -198,7 +198,7 @@ msgid "" " Removes the hostmask from the record of the user\n" " specified by . If the hostmask given is 'all' then all\n" " hostmasks will be removed. The may only be required if\n" -" the user is not recognized by his hostmask. This message must be\n" +" the user is not recognized by their hostmask. This message must be\n" " sent to the bot privately (not on a channel) since it may contain a\n" " password.\n" " " diff --git a/plugins/User/locales/it.po b/plugins/User/locales/it.po index f22b9b18e..ba610e907 100644 --- a/plugins/User/locales/it.po +++ b/plugins/User/locales/it.po @@ -269,7 +269,7 @@ msgid "" " Removes the hostmask from the record of the user\n" " specified by . If the hostmask given is 'all' then all\n" " hostmasks will be removed. The may only be required if\n" -" the user is not recognized by his hostmask. This message must be\n" +" the user is not recognized by their hostmask. This message must be\n" " sent to the bot privately (not on a channel) since it may contain a\n" " password.\n" " " diff --git a/plugins/User/plugin.py b/plugins/User/plugin.py index ed8e40f26..48b461b6a 100644 --- a/plugins/User/plugin.py +++ b/plugins/User/plugin.py @@ -366,7 +366,7 @@ class User(callbacks.Plugin): Removes the hostmask from the record of the user specified by . If the hostmask given is 'all' then all hostmasks will be removed. The may only be required if - the user is not recognized by his hostmask. This message must be + the user is not recognized by their hostmask. This message must be sent to the bot privately (not on a channel) since it may contain a password. """ diff --git a/plugins/__init__.py b/plugins/__init__.py index 053e93ca8..7e33cdb4c 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -537,7 +537,7 @@ class PeriodicFileDownloader(object): downloaded every day, but no commands that use it are run in a week, the next time such a command is run, it'll be using a week-old file. If you don't want such behavior, you'll have to give an error mess age to the user - and tell him to call you back in the morning. + and tell them to call you back in the morning. 'function to run with downloaded file' is a function that will be passed a string *filename* of the downloaded file. This will be some random diff --git a/scripts/supybot b/scripts/supybot index f75cb6740..d1820480f 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -117,7 +117,7 @@ def main(): print 'Anyway, here\'s the exception: %s' % \ utils.gen.exnToString(e) except: - print 'Man, this really sucks. Not only did log.exception' + print 'Oh, this really sucks. Not only did log.exception' print 'raise an exception, but freaking-a, it was a string' print 'exception. People who raise string exceptions should' print 'die a slow, painful death.' @@ -168,7 +168,7 @@ if __name__ == '__main__': if os.name == 'posix': if (os.getuid() == 0 or os.geteuid() == 0) and not options.allowRoot: - sys.stderr.write('Dude, don\'t even try to run this as root.') + sys.stderr.write('Don\'t even try to run this as root.') sys.stderr.write(os.linesep) sys.exit(-1) diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard index 28c707929..50c7fee85 100644 --- a/scripts/supybot-wizard +++ b/scripts/supybot-wizard @@ -375,8 +375,8 @@ def main(): output("""Found %s (%s).""" % (serverString, ip)) output("""IRC Servers almost always accept connections on port - 6667. They can, however, accept connections anywhere their admin - feels like he wants to accept connections from.""") + 6667. They can, however, accept connections anywhere their admins + feel like they wants to accept connections from.""") if yn('Does this server require connection on a non-standard port?', default=False): port = 0 diff --git a/src/ircdb.py b/src/ircdb.py index 601ce52e6..174325500 100644 --- a/src/ircdb.py +++ b/src/ircdb.py @@ -1001,7 +1001,7 @@ def checkIgnored(hostmask, recipient='', users=users, channels=channels): # Owners shouldn't ever be ignored. return False elif user.ignore: - log.debug('Ignoring %s due to his IrcUser ignore flag.', hostmask) + log.debug('Ignoring %s due to their IrcUser ignore flag.', hostmask) return True except KeyError: # If there's no user... @@ -1130,7 +1130,7 @@ conf.registerGlobalValue(conf.supybot, 'capabilities', conf.registerGlobalValue(conf.supybot.capabilities, 'default', registry.Boolean(True, """Determines whether the bot by default will allow users to have a capability. If this is disabled, a user must explicitly - have the capability for whatever command he wishes to run.""")) + have the capability for whatever command they wish to run.""")) conf.registerGlobalValue(conf.supybot.capabilities, 'private', registry.SpaceSeparatedListOfStrings([], """Determines what capabilities the bot will never tell to a non-admin whether or not a user has them.""")) diff --git a/src/irclib.py b/src/irclib.py index 1d31faa20..41b9a849e 100644 --- a/src/irclib.py +++ b/src/irclib.py @@ -273,7 +273,7 @@ class ChannelState(utils.python.Object): """Changes the user oldNick to newNick; used for NICK changes.""" # Note that this doesn't have to have the sigil (@%+) that users # have to have for addUser; it just changes the name of the user - # without changing any of his categories. + # without changing any of their categories. for s in (self.users, self.ops, self.halfops, self.voices): if oldNick in s: s.remove(oldNick) diff --git a/src/ircmsgs.py b/src/ircmsgs.py index bee105bb3..051e92146 100644 --- a/src/ircmsgs.py +++ b/src/ircmsgs.py @@ -74,7 +74,7 @@ class IrcMsg(object): 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, he could do this: + 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 2cddd186e..51ef275d4 100644 --- a/src/schedule.py +++ b/src/schedule.py @@ -71,8 +71,8 @@ class Schedule(drivers.IrcDriver): self.events.clear() 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 him removing new events with - # his old id. + # one of the nuked events, we don't want him/her removing new events with + # his/her old id. def name(self): return 'Schedule'