Merge branch 'i18n' into l10n-fr

plugins/Channel/messages.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-10-16 10:17+CEST\n"
+"POT-Creation-Date: 2010-10-25 13:10+CEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -305,10 +305,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: plugin.py:409
-msgid "haveOp"
-msgstr ""
-
 #: plugin.py:409
 msgid "invite someone"
 msgstr ""

plugins/Channel/plugin.py

@@ -406,7 +406,7 @@ class Channel(callbacks.Plugin):
         nick = nick or msg.nick
         self._sendMsg(irc, ircmsgs.invite(nick, channel))
         self.invites[(irc.getRealIrc(), ircutils.toLower(nick))] = irc
-    invite = wrap(invite, ['op', (_('haveOp'), _('invite someone')),
+    invite = wrap(invite, ['op', ('haveOp', _('invite someone')),
                            additional('nick')])
 
     def do341(self, irc, msg):

plugins/Herald/config.py

@@ -30,7 +30,7 @@
 import supybot.conf as conf
 import supybot.registry as registry
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
-_ = PluginInternationalization('Heral')
+_ = PluginInternationalization('Herald')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is

plugins/Herald/plugin.py

@@ -41,7 +41,7 @@ import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 from supybot.utils.structures import TimeoutQueue
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
-_ = PluginInternationalization('Heral')
+_ = PluginInternationalization('Herald')
 
 filename = conf.supybot.directories.data.dirize('Herald.db')