Merge branch 'master' of git.poez.io:poezio into slix

This commit is contained in:
mathieui 2014-11-13 23:36:12 +01:00
commit d2bbbbffb9
No known key found for this signature in database
GPG key ID: C59F84CEEFD616E3

View file

@ -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):
"""