diff --git a/src/common/logger.py b/src/common/logger.py
index a1fbefa21..c7acf8ede 100644
--- a/src/common/logger.py
+++ b/src/common/logger.py
@@ -358,7 +358,7 @@ class Logger:
 		# 3 - 8 (we avoid the last 2 lines but we still return 5 asked)
 		self.cur.execute('''
 			SELECT time, kind, message FROM logs
-			WHERE (%s) AND kind IN	(%d, %d, %d, %d) AND time > %d
+			WHERE (%s) AND kind IN (%d, %d, %d, %d) AND time > %d
 			ORDER BY time DESC LIMIT %d OFFSET %d
 			''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV,
 				constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT,
diff --git a/src/dialogs.py b/src/dialogs.py
index b431322ca..7f9734b4d 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -568,30 +568,28 @@ class AboutDialog:
 		text = open('../COPYING').read()
 		dlg.set_license(text)
 		
-		#FIXME: do versions strings translatable after .10
-		#FIXME: use %s then
-		dlg.set_comments(_('A GTK+ jabber client') + '\nGTK+ Version: ' + \
-			self.tuple2str(gtk.gtk_version) + '\nPyGTK Version: ' + \
-			self.tuple2str(gtk.pygtk_version))
+		dlg.set_comments('%s\n%s : %s\n%s : %s' 
+			% (_('A GTK+ jabber client'), \
+			_('GTK+ Version'), self.tuple2str(gtk.gtk_version), \
+			_('PyGTK Version'), self.tuple2str(gtk.pygtk_version)))
 		dlg.set_website('http://www.gajim.org')
 
-		#FIXME: do current devs a translatable string
-		authors = [
-			'Current Developers:',
-			'Yann Le Boulanger <asterix@lagaule.org>',
-			'Dimitur Kirov <dkirov@gmail.com>',
-			'Travis Shirk <travis@pobox.com>',
-			'',
-			_('Past Developers:'),
-			'Nikos Kouremenos <kourem@gmail.com>',
-			'Vincent Hanquez <tab@snarc.org>',
-			'',
-			_('THANKS:'),
-		]
-
+		authors = []
+		authors_file = open('../AUTHORS').read()
+		authors_file = authors_file.split('\n')
+		for author in authors_file:
+			if author == 'CURRENT DEVELOPERS:':
+				authors.append(_('Current Developers:'))
+			elif author == 'PAST DEVELOPERS:':
+				authors.append('\n' +_('Past Developers:'))
+			elif author != '': # Real author line
+				authors.append(author)
+				
+		authors.append('\n' + _('THANKS:'))
+				
 		text = open('../THANKS').read()
 		text_splitted = text.split('\n')
-		text = '\n'.join(text_splitted[:-2]) # remove one english setence
+		text = '\n'.join(text_splitted[:-2]) # remove one english sentence
 		# and add it manually as translatable
 		text += '\n%s\n' % _('Last but not least, we would like to thank all '
 			'the package maintainers.')