Merge remote-tracking branch 'progval/testing' into testing

This commit is contained in:
Mika Suomalainen 2011-07-21 10:31:35 +03:00
commit ffbc082a32
4 changed files with 5 additions and 5 deletions

View File

@ -294,13 +294,13 @@ msgstr "verrouiller le topic"
msgid ""
"[<channel>]\n"
"\n"
" Unlocks the topic (sets the mode +t) in <channel>. <channel> is only\n"
" Unlocks the topic (sets the mode -t) in <channel>. <channel> is only\n"
" necessary if the message isn't sent in the channel itself.\n"
" "
msgstr ""
"[<canal>]\n"
"\n"
"Déverrouille le topic (défini le mode +t) sur le <canal>. <canal> n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même."
"Déverrouille le topic (défini le mode -t) sur le <canal>. <canal> n'est nécessaire que si le message n'est pas envoyé sur le canal lui-même."
#: plugin.py:496
msgid "unlock the topic"

View File

@ -272,7 +272,7 @@ msgstr ""
msgid ""
"[<channel>]\n"
"\n"
" Unlocks the topic (sets the mode +t) in <channel>. <channel> is only\n"
" Unlocks the topic (sets the mode -t) in <channel>. <channel> is only\n"
" necessary if the message isn't sent in the channel itself.\n"
" "
msgstr ""

View File

@ -485,7 +485,7 @@ class Topic(callbacks.Plugin):
def unlock(self, irc, msg, args, channel):
"""[<channel>]
Unlocks the topic (sets the mode +t) in <channel>. <channel> is only
Unlocks the topic (sets the mode -t) in <channel>. <channel> is only
necessary if the message isn't sent in the channel itself.
"""
if not self._checkManageCapabilities(irc, msg, channel):

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change
them once."""
version = '0.83.4.1+limnoria (2011-07-19T23:49:34+0200)'
version = '0.83.4.1+limnoria (2011-07-20T21:28:43+0200)'