[Yavor Doganov] some typoe in strings and comments

data/glade/account_modification_window.glade

@@ -440,7 +440,7 @@
 		<widget class="GtkCheckButton" id="autoreconnect_checkbutton">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Autoreconnect when connection is lost</property>
+		  <property name="label" translatable="yes">Auto-reconnect when connection is lost</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>

data/glade/adhoc_commands_window.glade

@@ -542,7 +542,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label257">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;An error has occured:&lt;/b&gt;</property>
+		  <property name="label" translatable="yes">&lt;b&gt;An error has occurred:&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>

data/glade/advanced_notifications_window.glade

@@ -282,9 +282,9 @@ Contact Disconnected
 Contact Change Status 
 Group Chat Message Highlight 
 Group Chat Message Received 
-File Transfert Resquest 
+File Transfer Request 
-File Transfert Started 
+File Transfer Started 
-File Transfert Finished</property>
+File Transfer Finished</property>
 		      <property name="add_tearoffs">False</property>
 		      <property name="focus_on_click">True</property>
 		      <signal name="changed" handler="on_event_combobox_changed" last_modification_time="Sun, 09 Jul 2006 01:54:11 GMT"/>

data/glade/filetransfers.glade

@@ -81,7 +81,7 @@
 	    <widget class="GtkButton" id="cleanup_button">
 	      <property name="visible">True</property>
 	      <property name="sensitive">False</property>
-	      <property name="tooltip" translatable="yes">Removes completed, canceled and failed file transfers from the list</property>
+	      <property name="tooltip" translatable="yes">Removes completed, cancelled and failed file transfers from the list</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>

src/chat_control.py

@@ -49,7 +49,7 @@ except:
 ##!/bin/sh
 #LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #echo "{_('en'):'en'",$LANG"}"
-langs = {_('English'): 'en', _('Bulgarian'): 'bg', _('Briton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basc'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norvegian b'): 'nb', _('Dutch'): 'nl', _('Norvegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
+langs = {_('English'): 'en', _('Bulgarian'): 'bg', _('Briton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basc'): 'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian b'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl', _('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
 
 
 ################################################################################

src/common/config.py

@@ -216,11 +216,11 @@ class Config:
 		'hide_chat_banner': [opt_bool, False, _('Hides the banner in two persons chat window')],
 		'hide_groupchat_occupants_list': [opt_bool, False, _('Hides the group chat occupants list in group chat window.')],
 		'chat_merge_consecutive_nickname': [opt_bool, False, _('In a chat, show the nickname at the beginning of a line only when it\'s not the same person talking than in previous message.')],
-		'chat_merge_consecutive_nickname_indent': [opt_str, '  ', _('Indentation when using merge consecutive nickame.')],
+		'chat_merge_consecutive_nickname_indent': [opt_str, '  ', _('Indentation when using merge consecutive nickname.')],
 		'gc_nicknames_colors': [ opt_str, '#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a', _('List of colors that will be used to color nicknames in group chats.'), True ],
 		'ctrl_tab_go_to_next_composing': [opt_bool, True, _('Ctrl-Tab go to next composing tab when none is unread.')],
 		'confirm_metacontacts': [ opt_str, '', _('Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog.')],
-		'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFULL, when you are logged in with a negative priority, you will NOT receive any message from your server.')],
+		'enable_negative_priority': [ opt_bool, False, _('If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server.')],
 		'use_gnomekeyring': [opt_bool, True, _('If True, Gajim will use Gnome Keyring (if available) to store account passwords.')],
 		'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')],
 	}

src/common/helpers.py

@@ -349,7 +349,7 @@ def get_uf_chatstate(chatstate):
 	elif chatstate == 'composing':
 		return _('is composing a message...')
 	elif chatstate == 'paused':
-		#paused means he or she was compoing but has stopped for a while
+		#paused means he or she was composing but has stopped for a while
 		return _('paused composing a message')
 	elif chatstate == 'gone':
 		return _('has closed the chat window or tab')

src/common/optparser.py

@@ -299,7 +299,7 @@ class OptionsParser:
 
 	def update_config_to_01014(self):
 		'''apply indeces to the logs database'''
-		print _('migrating logs database to indeces')
+		print _('migrating logs database to indices')
 		con = sqlite.connect(logger.LOG_DB_PATH) 
 		cur = con.cursor()
 		# apply indeces

src/config.py

@@ -2336,7 +2336,7 @@ class GroupchatConfigWindow(DataFormWindow):
 		self.room_jid = room_jid
 		self.remove_button = {}
 		self.affiliation_treeview = {}
-		self.list_init = {} # list at the begining
+		self.list_init = {} # list at the beginning
 		ui_list = {'outcast': _('Ban List'),
 			'member': _('Member List'),
 			'owner': _('Owner List'),
@@ -3121,7 +3121,7 @@ class AccountCreationWizardWindow:
 		self.show_vcard_checkbutton.hide()
 		img = self.xml.get_widget('finish_image')
 		img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
-		finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occured during '
+		finish_text = '<big><b>%s</b></big>\n\n%s' % (_('An error occurred during '
 			'account creation') , reason)
 		self.finish_label.set_markup(finish_text)
 		self.notebook.set_current_page(3) # show finish page

src/dialogs.py

@@ -908,7 +908,7 @@ class BindPortError(HigDialog):
 	def __init__(self, port):
 		ErrorDialog(_('Unable to bind to port %s.') % port,
 			_('Maybe you have another running instance of Gajim. '
-			'File Transfer will be canceled.'))
+			'File Transfer will be cancelled.'))
 
 class ConfirmationDialog(HigDialog):
 	'''HIG compliant confirmation dialog.'''

src/filetransfers_window.py

@@ -201,7 +201,7 @@ class FileTransfersWindow:
 		has been canceled'''
 		self.window.present()
 		self.window.window.focus()
-		dialogs.InformationDialog(_('File transfer canceled'), _('Connection with peer cannot be established.'))
+		dialogs.InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.'))
 		self.tree.get_selection().unselect_all()
 
 	def show_send_error(self, file_props):
@@ -209,7 +209,7 @@ class FileTransfersWindow:
 		has been canceled'''
 		self.window.present()
 		self.window.window.focus()
-		dialogs.InformationDialog(_('File transfer canceled'),
+		dialogs.InformationDialog(_('File transfer cancelled'),
 _('Connection with peer cannot be established.'))
 		self.tree.get_selection().unselect_all()
 

src/gajim-remote.py

@@ -210,7 +210,7 @@ class GajimRemote:
 				],				
 
 			'get_unread_msgs_number': [
-				_('Returns number of unreaded messages'),
+				_('Returns number of unread messages'),
 					[ ]
 				],
 			'start_chat': [

src/gajim.py

@@ -119,7 +119,7 @@ try:
 	import gtk
 except RuntimeError, msg:
 	if str(msg) == 'could not open display':
-		print >> sys.stderr, _('Gajim needs Xserver to run. Quiting...')
+		print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
 		sys.exit()
 pritext = ''
 if gtk.pygtk_version < (2, 6, 0):

src/roster_window.py

@@ -3988,7 +3988,7 @@ class RosterWindow:
 		pritext = _('You are about to create a metacontact. Are you sure you want'
 			' to continue?')
 		sectext = _('Metacontacts are a way to regroup several contacts in one '
-			'line. Generaly it is used when the same person has several Jabber '
+			'line. Generally it is used when the same person has several Jabber '
 			'accounts or transport accounts.')
 		dlg = dialogs.ConfirmationDialogCheck(pritext, sectext,
 			_('Do _not ask me again'), on_response_ok = merge_contacts)