diff options
| author | mathieui <mathieui@mathieui.net> | 2014-11-13 23:36:12 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2014-11-13 23:36:12 +0100 |
| commit | d2bbbbffb9dc770c3a8c41efdbe723632f03fdf5 (patch) | |
| tree | 23b6dce4c57510fe370547d978ea8acc89ee00ca /src | |
| parent | c2f9ffff33c28a6860094d0e115f83cb1dab3be7 (diff) | |
| parent | a400bfc1e91d7b459cb2e442bd5dd0b40138d3a7 (diff) | |
| download | poezio-d2bbbbffb9dc770c3a8c41efdbe723632f03fdf5.tar.gz poezio-d2bbbbffb9dc770c3a8c41efdbe723632f03fdf5.tar.bz2 poezio-d2bbbbffb9dc770c3a8c41efdbe723632f03fdf5.tar.xz poezio-d2bbbbffb9dc770c3a8c41efdbe723632f03fdf5.zip | |
Merge branch 'master' of git.poez.io:poezio into slix
Diffstat (limited to 'src')
| -rw-r--r-- | src/tabs/conversationtab.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tabs/conversationtab.py b/src/tabs/conversationtab.py index 3d5769f7..52c503d7 100644 --- a/src/tabs/conversationtab.py +++ b/src/tabs/conversationtab.py @@ -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): """ |