Verified Commit d2bbbbff authored by mathieui's avatar mathieui

Merge branch 'master' of into slix

parents c2f9ffff a400bfc1
......@@ -381,7 +381,7 @@ class DynamicConversationTab(ConversationTab):
self.info_header = windows.DynamicConversationInfoWin()
ConversationTab.__init__(self, jid)
self.register_command('unlock', self.unlock_command,
shortdesc=_('Unlock the converstation from a particular resource.'))
shortdesc=_('Unlock the conversation from a particular resource.'))
def lock(self, resource):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment