From 53b901cf4ed68a4da3573fd6b8be081ed0f88836 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 2 Jan 2007 12:17:51 +0000 Subject: [PATCH] [Yavor Doganov] some typoe in strings and comments --- data/glade/account_modification_window.glade | 2 +- data/glade/adhoc_commands_window.glade | 2 +- data/glade/advanced_notifications_window.glade | 6 +++--- data/glade/filetransfers.glade | 2 +- src/chat_control.py | 2 +- src/common/config.py | 4 ++-- src/common/helpers.py | 2 +- src/common/optparser.py | 2 +- src/config.py | 4 ++-- src/dialogs.py | 2 +- src/filetransfers_window.py | 4 ++-- src/gajim-remote.py | 2 +- src/gajim.py | 2 +- src/roster_window.py | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/data/glade/account_modification_window.glade b/data/glade/account_modification_window.glade index 9f7ee26cf..322948c61 100644 --- a/data/glade/account_modification_window.glade +++ b/data/glade/account_modification_window.glade @@ -440,7 +440,7 @@ True True - Autoreconnect when connection is lost + Auto-reconnect when connection is lost True GTK_RELIEF_NORMAL True diff --git a/data/glade/adhoc_commands_window.glade b/data/glade/adhoc_commands_window.glade index befdf8e17..023510500 100644 --- a/data/glade/adhoc_commands_window.glade +++ b/data/glade/adhoc_commands_window.glade @@ -542,7 +542,7 @@ True - <b>An error has occured:</b> + <b>An error has occurred:</b> False True GTK_JUSTIFY_LEFT diff --git a/data/glade/advanced_notifications_window.glade b/data/glade/advanced_notifications_window.glade index b2f18e4f5..46c78b20c 100644 --- a/data/glade/advanced_notifications_window.glade +++ b/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 Transfert Started -File Transfert Finished +File Transfer Request +File Transfer Started +File Transfer Finished False True diff --git a/data/glade/filetransfers.glade b/data/glade/filetransfers.glade index 09c5914a4..b01b19185 100644 --- a/data/glade/filetransfers.glade +++ b/data/glade/filetransfers.glade @@ -81,7 +81,7 @@ True False - Removes completed, canceled and failed file transfers from the list + Removes completed, cancelled and failed file transfers from the list True True GTK_RELIEF_NORMAL diff --git a/src/chat_control.py b/src/chat_control.py index c54ccfb00..26abcbbbe 100644 --- a/src/chat_control.py +++ b/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'} ################################################################################ diff --git a/src/common/config.py b/src/common/config.py index 8512916d8..28cce2f4f 100644 --- a/src/common/config.py +++ b/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.')], } diff --git a/src/common/helpers.py b/src/common/helpers.py index 6ba74a1ef..d574bc009 100644 --- a/src/common/helpers.py +++ b/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') diff --git a/src/common/optparser.py b/src/common/optparser.py index 53146de05..409e96d68 100644 --- a/src/common/optparser.py +++ b/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 diff --git a/src/config.py b/src/config.py index 848273359..343f6d2b9 100644 --- a/src/config.py +++ b/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 = '%s\n\n%s' % (_('An error occured during ' + finish_text = '%s\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 diff --git a/src/dialogs.py b/src/dialogs.py index e635a7624..8df969489 100644 --- a/src/dialogs.py +++ b/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.''' diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index 0f76315c4..3c9330b08 100644 --- a/src/filetransfers_window.py +++ b/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() diff --git a/src/gajim-remote.py b/src/gajim-remote.py index 7254ba051..0ec843bab 100755 --- a/src/gajim-remote.py +++ b/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': [ diff --git a/src/gajim.py b/src/gajim.py index 006d19aad..957b86646 100755 --- a/src/gajim.py +++ b/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): diff --git a/src/roster_window.py b/src/roster_window.py index 68085188e..5e7671813 100644 --- a/src/roster_window.py +++ b/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)