From 0dc36d959868a4448873686e684cb86ecab2d425 Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Wed, 22 Oct 2014 19:10:40 +0200
Subject: Typo

---
 src/tabs/basetabs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tabs/basetabs.py b/src/tabs/basetabs.py
index 2f5db40a..fbf57dc2 100644
--- a/src/tabs/basetabs.py
+++ b/src/tabs/basetabs.py
@@ -833,7 +833,7 @@ class OneToOneTab(ChatTab):
             tail = None
         features_str = ', '.join(features)
         if tail and empty:
-            features_str += _(', or %s') % tail
+            features_str += _(', nor %s') % tail
         elif tail:
             features_str += _(' and %s') % tail
 
-- 
cgit v1.2.3