diff --git a/src/chat_control.py b/src/chat_control.py
index d350cc125..8a028e9ee 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -2343,7 +2343,7 @@ class ChatControl(ChatControlBase):
 				pending_how_many, timeout, self.account)
 		except exceptions.DatabaseMalformed:
 			dialogs.ErrorDialog(_('Database Error'),
-				_('The database file (%s) cannot be read. Try to repare it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
+				_('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
 			rows = []
 		local_old_kind = None
 		for row in rows: # row[0] time, row[1] has kind, row[2] the message
diff --git a/src/common/pep.py b/src/common/pep.py
index 24bd6ef35..689d9394e 100644
--- a/src/common/pep.py
+++ b/src/common/pep.py
@@ -35,7 +35,7 @@ MOODS = {
 	'contented':		_('Contented'),		'cranky':		_('Cranky'),
 	'curious':			_('Curious'),			'depressed':	_('Depressed'),
 	'disappointed':	_('Disappointed'),	'disgusted':	_('Disgusted'),
-	'distracted':		_('Distracted'),		'embarrassed':	_('Embarassed'),
+	'distracted':		_('Distracted'),		'embarrassed':	_('Embarrassed'),
 	'excited':			_('Excited'),			'flirtatious':	_('Flirtatious'),
 	'frustrated':		_('Frustrated'),		'grumpy':		_('Grumpy'),
 	'guilty':			_('Guilty'),			'happy':			_('Happy'),
diff --git a/src/features_window.py b/src/features_window.py
index bf0a0881b..5424e6004 100644
--- a/src/features_window.py
+++ b/src/features_window.py
@@ -57,7 +57,7 @@ class FeaturesWindow:
 				_('Requires python-avahi.'),
 				_('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
 			_('gajim-remote'): (self.dbus_available,
-				_('A script to controle Gajim via commandline.'),
+				_('A script to control Gajim via commandline.'),
 				_('Requires python-dbus.'),
 				_('Feature not available under Windows.')),
 			_('OpenGPG'): (self.gpg_available,
diff --git a/src/gajim.py b/src/gajim.py
index 1b0e734c6..d873dd25a 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -168,7 +168,7 @@ try:
 	from common import gajim
 except exceptions.DatabaseMalformed:
 	pritext = _('Database Error')
-	sectext = _('The database file (%s) cannot be read. Try to repare it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
+	sectext = _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
 else:
 	from common import dbus_support
 	if dbus_support.supported:
@@ -1293,7 +1293,8 @@ class Interface:
 		# Standard way, the message comes from the occupant who set the subject
 		text = None
 		if len(jids) > 1:
-			text = _('%s has set the subject to %s') % (jids[1], array[1])
+			text = _('%(jid)s has set the subject to %(subject)s') % {
+				'jid': jids[1], 'subject': array[1]}
 		# Workaround for psi bug http://flyspray.psi-im.org/task/595 , to be
 		# deleted one day. We can receive a subject with a body that contains
 		# "X has set the subject to Y" ...
diff --git a/src/roster_window.py b/src/roster_window.py
index 315c2b1c4..e4cf63c50 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -3924,7 +3924,7 @@ class RosterWindow:
 			# Popup dialog to confirm sending
 			prim_text = 'Send file?'
 			sec_text = i18n.ngettext('Do you want to send this file to %s:',
-				'Do you want to send those files to %s:', nb_uri) %\
+				'Do you want to send these files to %s:', nb_uri) %\
 				c_dest.get_shown_name()
 			for uri in uri_splitted:
 				path = helpers.get_file_path_from_dnd_dropped_uri(uri)