Commits October 2009

commits@gajim.org

6 participants
172 discussions

gajim: updated brazilian translation
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset 1cfbaf5d1844 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1cfbaf5d1844 description: updated brazilian translation diffstat: po/pt_BR.po | 531 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 254 insertions(+), 277 deletions(-) diffs (truncated from 1609 to 300 lines): diff -r be5323dd50a7 -r 1cfbaf5d1844 po/pt_BR.po --- a/po/pt_BR.po Fri Oct 30 09:51:16 2009 +0100 +++ b/po/pt_BR.po Fri Oct 30 20:01:36 2009 +0100 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-28 22:17+0100\n" -"PO-Revision-Date: 2009-09-23 09:56-0300\n" +"POT-Creation-Date: 2009-10-30 19:59+0100\n" +"PO-Revision-Date: 2009-10-30 08:09-0300\n" "Last-Translator: Djavan Fagundes <dnoway(a)gmail.com>\n" "Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" "MIME-Version: 1.0\n" @@ -110,9 +110,8 @@ "SHA1 fingerprint do certificado:\n" #: ../data/glade/account_creation_wizard_window.glade.h:11 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Usar aut_enticação de proxy" +msgstr "Autenticação anôn_ima" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" @@ -134,7 +133,7 @@ #: ../data/glade/account_modification_window.glade.h:20 #: ../data/glade/accounts_window.glade.h:25 msgid "If checked, Gajim will remember the password for this account" -msgstr "Se marcado, o Gajim lembrará a senha para esta conta" +msgstr "Se marcado, o Gajim irá memorizar a senha para esta conta" #: ../data/glade/account_creation_wizard_window.glade.h:17 #: ../data/glade/account_modification_window.glade.h:26 @@ -314,7 +313,7 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"Se marcado, o Gajim transmitirá também alguns outros IP's exceto o seu, " +"Se marcado, o Gajim irá transmitir também alguns outros IP's exceto o seu, " "então a transferência de arquivo tem grandes possibilidades de executar " "corretamente." @@ -324,7 +323,7 @@ "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" msgstr "" -"Se marcado, o Gajim enviará pacotes keep-alive para prevenir timeout na " +"Se marcado, o Gajim irá enviar pacotes keep-alive para prevenir timeout na " "conexão, evitando-a cair" #: ../data/glade/account_modification_window.glade.h:22 @@ -332,7 +331,7 @@ "If checked, Gajim will store the password in ~/.gajim/config with 'read' " "permission only for you" msgstr "" -"Se checado, o Gajim gravará sua senha em ~/.gajim/config com permissão de " +"Se checado, o Gajim irá gravar sua senha em ~/.gajim/config com permissão de " "'leitura' somente para você" #: ../data/glade/account_modification_window.glade.h:23 @@ -341,8 +340,8 @@ "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" msgstr "" -"Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber " -"usando esta conta" +"Se marcado, o Gajim, quando carregado, irá conectar automaticamente ao " +"jabber usando esta conta" #: ../data/glade/account_modification_window.glade.h:24 #: ../data/glade/accounts_window.glade.h:28 @@ -488,9 +487,8 @@ msgstr "Contas" #: ../data/glade/accounts_window.glade.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "Usar aut_enticação de proxy" +msgstr "Autenticação anônima" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -748,7 +746,7 @@ #: ../data/glade/advanced_menuitem_menu.glade.h:7 msgid "Show _XML Console" -msgstr "Mostrar console _XML" +msgstr "Exibir console _XML" #: ../data/glade/advanced_menuitem_menu.glade.h:8 msgid "Update MOTD..." @@ -903,7 +901,7 @@ #: ../data/glade/advanced_notifications_window.glade.h:36 msgid "_Show event in systray" -msgstr "_Mostrar evento na bandeja do sistema" +msgstr "_Exibir evento na bandeja do sistema" #: ../data/glade/advanced_notifications_window.glade.h:37 msgid "and I " @@ -1071,9 +1069,8 @@ msgstr "Atribuir chave Open_PGP..." #: ../data/glade/contact_context_menu.glade.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Executar comando..." +msgstr "E_xecutar comando..." #: ../data/glade/contact_context_menu.glade.h:5 msgid "Edit _Groups..." @@ -1240,7 +1237,7 @@ #: ../data/glade/filetransfers.glade.h:10 msgid "Shows a list of file transfers between you and others" -msgstr "Mostrar uma lista de transferências de arquivos entre você e os outros" +msgstr "Exibe uma lista de transferências de arquivos entre você e os outros" #: ../data/glade/filetransfers.glade.h:11 msgid "" @@ -1252,7 +1249,7 @@ #: ../data/glade/filetransfers.glade.h:12 msgid "When a file transfer is complete show a popup notification" -msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar" +msgstr "Exibir um alerta visual quanto uma transferência de arquivo terminar" #: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792 msgid "_Continue" @@ -1493,7 +1490,7 @@ "All Chat Histories" msgstr "" "Digite o JID ou o nome do contato\n" -"Históricos de conferências\n" +"Históricos das salas\n" "Todos os históricos de conversa" #: ../data/glade/history_window.glade.h:5 @@ -1834,27 +1831,27 @@ #: ../data/glade/preferences_window.glade.h:41 msgid "Display _activity of contacts in roster" -msgstr "Mostrar a_tividade dos contatos na lista" +msgstr "Exibir a_tividade dos contatos na lista" #: ../data/glade/preferences_window.glade.h:42 msgid "Display _extra email details" -msgstr "Mostrar detalhes _extras dos emails" +msgstr "Exibir detalhes _extras dos emails" #: ../data/glade/preferences_window.glade.h:43 msgid "Display _tunes of contacts in roster" -msgstr "Mostrar sin_tonia dos contatos na lista" +msgstr "Exibir sin_tonia dos contatos na lista" #: ../data/glade/preferences_window.glade.h:44 msgid "Display a_vatars of contacts in roster" -msgstr "Mostrar a_vatar dos contatos na lista" +msgstr "Exibir a_vatar dos contatos na lista" #: ../data/glade/preferences_window.glade.h:45 msgid "Display m_ood of contacts in roster" -msgstr "Mostrar hum_or dos contatos na lista" +msgstr "Exibir hum_or dos contatos na lista" #: ../data/glade/preferences_window.glade.h:46 msgid "Display status _messages of contacts in roster" -msgstr "Mostrar _mensagem de status da lista de contato" +msgstr "Exibir _mensagem de status da lista de contato" #: ../data/glade/preferences_window.glade.h:47 msgid "" @@ -1924,7 +1921,7 @@ "If checked, Gajim will display avatars of contacts in roster window and in " "group chats" msgstr "" -"Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na " +"Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na " "conferência" #: ../data/glade/preferences_window.glade.h:57 @@ -1939,18 +1936,18 @@ msgid "" "If checked, Gajim will display the activity of contacts in the roster window" msgstr "" -"Se marcado, Gajim irá mostrar a atividade dos contatos na janela da lista" +"Se marcado, Gajim irá exibir a atividade dos contatos na janela da lista" #: ../data/glade/preferences_window.glade.h:59 msgid "" "If checked, Gajim will display the mood of contacts in the roster window" -msgstr "Se marcado, Gajim mostrará o humor dos contatos na janela da lista" +msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista" #: ../data/glade/preferences_window.glade.h:60 msgid "" "If checked, Gajim will display the tunes of contacts in the roster window" msgstr "" -"Se marcado, o Gajim irá mostrar a sintonia dos contatos na janela da lista" +"Se marcado, o Gajim irá exibir a sintonia dos contatos na janela da lista" #: ../data/glade/preferences_window.glade.h:61 msgid "" @@ -2069,7 +2066,7 @@ "Notify me about it\n" "Show only in roster" msgstr "" -"Mostrar em um pop-up\n" +"Exibir em um pop-up\n" "Notificar-me sobre isto\n" "Mostra apenas na lista" @@ -2079,7 +2076,7 @@ #: ../data/glade/preferences_window.glade.h:84 msgid "Show systray:" -msgstr "Mostrar na bandeja do sistema:" +msgstr "Exibir na bandeja do sistema:" #: ../data/glade/preferences_window.glade.h:85 msgid "Sign _in" @@ -2095,7 +2092,7 @@ "Gajim will just display the raw message text." msgstr "" "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se " -"marcado, o Gajim apenas mostrará as mensagens em texto puro." +"marcado, o Gajim apenas exibirá as mensagens em texto puro." #: ../data/glade/preferences_window.glade.h:88 msgid "Sort contacts by status" @@ -2163,7 +2160,7 @@ #: ../data/glade/preferences_window.glade.h:104 msgid "_Display chat state notifications:" -msgstr "_Mostrar notificações de status de conversa:" +msgstr "_Exibir notificações de status de conversa:" #: ../data/glade/preferences_window.glade.h:105 msgid "_Emoticons:" @@ -2434,7 +2431,7 @@ msgstr "Prefixo" #: ../data/glade/profile_window.glade.h:25 -#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327 +#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:325 msgid "Role:" msgstr "Cargo:" @@ -2504,24 +2501,25 @@ "someone(a)somewhere.com would like you to add some contacts in " "your roster." msgstr "" +"alguem(a)algumacoisa.com gostaria que você adicionasse alguns " +"contatos em sua lista de contatos." #: ../data/glade/roster_item_exchange_window.glade.h:2 msgid "Message Body <currently unused, so it's hidden by default>" msgstr "" +"Corpo da mensagem <atualmente sem uso, então será escondida por padrão>" #: ../data/glade/roster_item_exchange_window.glade.h:3 msgid "Roster Item Exchange" -msgstr "" +msgstr "Troca de itens na lista de contatos" #: ../data/glade/roster_item_exchange_window.glade.h:4 -#, fuzzy msgid "gtk-cancel" -msgstr "gtk-close" +msgstr "gtk-cancel" #: ../data/glade/roster_item_exchange_window.glade.h:5 -#, fuzzy msgid "gtk-ok" -msgstr "gtk-close" +msgstr "gtk-ok" #: ../data/glade/roster_window.glade.h:1 msgid "Add _Contact..." @@ -2553,7 +2551,7 @@ #: ../data/glade/roster_window.glade.h:10 msgid "Show Trans_ports" -msgstr "Mostrar trans_portes" +msgstr "Exibir trans_portes" #: ../data/glade/roster_window.glade.h:11 msgid "Show _Offline Contacts" @@ -2562,7 +2560,7 @@ #: ../data/glade/roster_window.glade.h:12 #: ../data/glade/systray_context_menu.glade.h:4 msgid "Show _Roster" -msgstr "Mostrar _lista" +msgstr "Exibir _lista" #: ../data/glade/roster_window.glade.h:13 msgid "_Accounts" @@ -2735,7 +2733,7 @@

1 0

gajim: remove hack I did for #5366, It was most probably due to ...
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset be5323dd50a7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be5323dd50a7 description: remove hack I did for #5366, It was most probably due to #5375. see #5366, #5375 diffstat: src/message_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 43346fd87f43 -r be5323dd50a7 src/message_window.py --- a/src/message_window.py Fri Oct 30 09:44:40 2009 +0100 +++ b/src/message_window.py Fri Oct 30 09:51:16 2009 +0100 @@ -764,9 +764,6 @@ old_ctrl.set_control_active(False) new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) - if not new_ctrl: - # This event is sometimes exposed without any reason. see #5366 - return new_ctrl.set_control_active(True) self.show_title(control = new_ctrl)

1 0

gajim: prevent traceback when changing resource of a control whe...
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset 43346fd87f43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=43346fd87f43 description: prevent traceback when changing resource of a control when there is no event for the account at all. Fixes #5375 diffstat: src/common/events.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r fcac6594004e -r 43346fd87f43 src/common/events.py --- a/src/common/events.py Thu Oct 29 16:46:36 2009 +0100 +++ b/src/common/events.py Fri Oct 30 09:44:40 2009 +0100 @@ -162,6 +162,8 @@ del self._events[account][jid] def change_jid(self, account, old_jid, new_jid): + if account not in self._events: + return if old_jid not in self._events[account]: return if new_jid in self._events[account]:

1 0

gajim: connect some missing handlers in chat control context men...
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset fcac6594004e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fcac6594004e description: connect some missing handlers in chat control context menu. Fixes #5369 diffstat: src/gui_menu_builder.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (52 lines): diff -r b68c166e4e36 -r fcac6594004e src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 29 11:35:22 2009 +0100 +++ b/src/gui_menu_builder.py Thu Oct 29 16:46:36 2009 +0100 @@ -240,6 +240,12 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) + if control: + convert_to_gc_menuitem.connect('activate', + control._on_convert_to_gc_menuitem_activate) + else: + items_to_hide.append(convert_to_gc_menuitem) + if _('Not in Roster') not in contact.get_shown_groups(): # contact is in normal group edit_groups_menuitem.connect('activate', roster.on_edit_groups, [(contact, @@ -262,7 +268,7 @@ # Unsensitive many items when account is offline if gajim.account_is_disconnected(account): for widget in (start_chat_menuitem, rename_menuitem, - edit_groups_menuitem, send_file_menuitem): + edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem): widget.set_sensitive(False) if not show_start_chat: @@ -284,6 +290,8 @@ toggle_gpg_menuitem.set_sensitive(control.gpg_is_active or \ not e2e_is_active) toggle_gpg_menuitem.set_active(control.gpg_is_active) + toggle_gpg_menuitem.connect('activate', + control._on_toggle_gpg_menuitem_activate) # disable esessions if we or the other client don't support them # XXX: Once we have fallback to disco, remove notexistant check @@ -296,6 +304,8 @@ toggle_e2e_menuitem.set_active(e2e_is_active) toggle_e2e_menuitem.set_sensitive(e2e_is_active or \ not control.gpg_is_active) + toggle_e2e_menuitem.connect('activate', + control._on_toggle_e2e_menuitem_activate) if not show_buttonbar_items: items_to_hide += [history_menuitem, send_file_menuitem, @@ -313,7 +323,7 @@ for item in (send_custom_status_menuitem, send_single_message_menuitem, invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem, unignore_menuitem, set_custom_avatar_menuitem, subscription_menuitem, - manage_contact_menuitem): + manage_contact_menuitem, convert_to_gc_menuitems): item.set_no_show_all(True) item.hide()

1 0

gajim: switch from gtk.Tooltips to gtk.Tooltip. Fixes #3471
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset b68c166e4e36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b68c166e4e36 description: switch from gtk.Tooltips to gtk.Tooltip. Fixes #3471 diffstat: src/chat_control.py | 14 +++----------- src/dataforms_widget.py | 4 +--- src/dialogs.py | 6 +++--- src/groupchat_control.py | 8 ++------ src/vcard.py | 16 ++++++---------- 5 files changed, 15 insertions(+), 33 deletions(-) diffs (220 lines): diff -r 7208dbc6a0cb -r b68c166e4e36 src/chat_control.py --- a/src/chat_control.py Fri Oct 30 09:15:44 2009 +0100 +++ b/src/chat_control.py Thu Oct 29 11:35:22 2009 +0100 @@ -1235,7 +1235,6 @@ # Add lock image to show chat encryption self.lock_image = self.xml.get_widget('lock_image') - self.lock_tooltip = gtk.Tooltips() # Convert to GC icon img = self.xml.get_widget('convert_to_gc_button_image') @@ -1325,8 +1324,6 @@ self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and self.session.is_loggable(), True) - self.status_tooltip = gtk.Tooltips() - self.update_ui() # restore previous conversation self.restore_conversation() @@ -1604,7 +1601,6 @@ jid = contact.jid banner_name_label = self.xml.get_widget('banner_name_label') - banner_name_tooltip = gtk.Tooltips() name = contact.get_shown_name() if self.resource: @@ -1679,8 +1675,7 @@ status_text = '%s' % (font_attrs_small, status_text) else: status_text = '%s' % (font_attrs_small, status_escaped) - self.status_tooltip.set_tip(self.banner_status_label, - status) + self.banner_status_label.set_tooltip_text(status) self.banner_status_label.show() self.banner_status_label.set_no_show_all(False) else: @@ -1691,7 +1686,7 @@ self.banner_status_label.set_markup(status_text) # setup the label that holds name and jid banner_name_label.set_markup(label_text) - banner_name_tooltip.set_tip(banner_name_label, label_tooltip) + banner_name_label.set_tooltip_text(label_tooltip) def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: @@ -1768,7 +1763,7 @@ 'status': status_string, 'authenticated': authenticated_string, 'logged': logged_string} - self.lock_tooltip.set_tip(self.authentication_button, tooltip) + self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) self.lock_image.set_sensitive(enc_enabled) @@ -2171,9 +2166,6 @@ self.reset_kbd_mouse_timeout_vars() def shutdown(self): - # destroy banner tooltip - bug #pygtk for that! - self.status_tooltip.destroy() - # Send 'gone' chatstate self.send_chatstate('gone', self.contact) self.contact.chatstate = None diff -r 7208dbc6a0cb -r b68c166e4e36 src/dataforms_widget.py --- a/src/dataforms_widget.py Fri Oct 30 09:15:44 2009 +0100 +++ b/src/dataforms_widget.py Thu Oct 29 11:35:22 2009 +0100 @@ -283,8 +283,6 @@ self.set_col_spacings(12) self.set_row_spacings(6) - self.tooltips = gtk.Tooltips() - def decorate_with_tooltip(widget, field): ''' Adds a tooltip containing field's description to a widget. Creates EventBox if widget doesn't have its own gdk window. @@ -294,7 +292,7 @@ evbox = gtk.EventBox() evbox.add(widget) widget = evbox - self.tooltips.set_tip(widget, field.description) + widget.set_tooltip_text(field.description) return widget self._data_form = dataform diff -r 7208dbc6a0cb -r b68c166e4e36 src/dialogs.py --- a/src/dialogs.py Fri Oct 30 09:15:44 2009 +0100 +++ b/src/dialogs.py Thu Oct 29 11:35:22 2009 +0100 @@ -344,7 +344,7 @@ item = self.xml.get_widget(category + '_image') item.set_from_pixbuf( gtkgui_helpers.load_activity_icon(category).get_pixbuf()) - gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) + item.set_tooltip_text(pep.ACTIVITIES[category]['category']) vbox = self.xml.get_widget(category + '_vbox') vbox.set_border_width(5) @@ -477,7 +477,7 @@ self.mood_buttons[mood].set_mode(False) self.mood_buttons[mood].add(gtkgui_helpers.load_mood_icon(mood)) self.mood_buttons[mood].set_relief(gtk.RELIEF_NONE) - gtk.Tooltips().set_tip(self.mood_buttons[mood], pep.MOODS[mood]) + self.mood_buttons[mood].set_tooltip_text(pep.MOODS[mood]) self.mood_buttons[mood].connect('clicked', self.on_mood_button_clicked, mood) table.attach(self.mood_buttons[mood], x, x + 1, y, y + 1) @@ -650,7 +650,7 @@ else: img.set_from_pixbuf(gtkgui_helpers.load_activity_icon( self.pep_dict['activity']).get_pixbuf()) -# gtk.Tooltips().set_tip(item, pep.ACTIVITIES[category]['category']) +# item.set_tooltip_text(pep.ACTIVITIES[category]['category']) if self.pep_dict['activity_text']: label.set_text(self.pep_dict['activity_text']) else: diff -r 7208dbc6a0cb -r b68c166e4e36 src/groupchat_control.py --- a/src/groupchat_control.py Fri Oct 30 09:15:44 2009 +0100 +++ b/src/groupchat_control.py Thu Oct 29 11:35:22 2009 +0100 @@ -292,7 +292,6 @@ self.last_key_tabs = False self.subject = '' - self.subject_tooltip = gtk.Tooltips() self.tooltip = tooltips.GCTooltip() @@ -622,12 +621,12 @@ subject_text = '%s' % (font_attrs_small, subject) # tooltip must always hold ALL the subject - self.subject_tooltip.set_tip(self.event_box, self.subject) + self.event_box.set_tooltip_text(self.subject) self.banner_status_label.show() self.banner_status_label.set_no_show_all(False) else: subject_text = '' - self.subject_tooltip.disable() + self.event_box.set_has_tooltip(False) self.banner_status_label.hide() self.banner_status_label.set_no_show_all(True) @@ -1576,9 +1575,6 @@ del win._controls[self.account][self.contact.jid] def shutdown(self, status='offline'): - # destroy banner tooltip - bug #pygtk for that! - self.subject_tooltip.destroy() - # Preventing autorejoin from being activated self.autorejoin = False diff -r 7208dbc6a0cb -r b68c166e4e36 src/vcard.py --- a/src/vcard.py Fri Oct 30 09:15:44 2009 +0100 +++ b/src/vcard.py Thu Oct 29 11:35:22 2009 +0100 @@ -309,12 +309,10 @@ status_label.set_max_width_chars(15) status_label.set_text(stats) - tip = gtk.Tooltips() status_label_eventbox = self.xml.get_widget('status_label_eventbox') - tip.set_tip(status_label_eventbox, stats) + status_label_eventbox.set_tooltip_text(stats) def fill_jabber_page(self): - tooltips = gtk.Tooltips() self.xml.get_widget('nickname_label').set_markup( '' + self.contact.get_shown_name() + @@ -343,7 +341,7 @@ tt_text = _("You and the contact are interested in each other's presence information") else: # None tt_text = _("You are not interested in the contact's presence, and neither he/she is interested in yours") - tooltips.set_tip(eb, tt_text) + eb.set_tooltip_text(tt_text) uf_ask = helpers.get_uf_ask(self.contact.ask) ask_label.set_text(uf_ask) @@ -352,7 +350,7 @@ tt_text = _("You are waiting contact's answer about your subscription request") else: tt_text = _("There is no pending subscription request.") - tooltips.set_tip(eb, tt_text) + eb.set_tooltip_text(tt_text) resources = '%s (%s)' % (self.contact.resource, unicode( self.contact.priority)) @@ -425,7 +423,7 @@ self.xml.get_widget('resource_prio_label').set_text(resources) resource_prio_label_eventbox = self.xml.get_widget( 'resource_prio_label_eventbox') - tooltips.set_tip(resource_prio_label_eventbox, uf_resources) + resource_prio_label_eventbox.set_tooltip_text(uf_resources) self.fill_status_label() @@ -519,12 +517,10 @@ status_label.set_max_width_chars(15) status_label.set_text(stats) - tip = gtk.Tooltips() status_label_eventbox = self.xml.get_widget('status_label_eventbox') - tip.set_tip(status_label_eventbox, stats) + status_label_eventbox.set_tooltip_text(stats) def fill_contact_page(self): - tooltips = gtk.Tooltips() self.xml.get_widget('nickname_label').set_markup( '' + self.contact.get_shown_name() + @@ -545,7 +541,7 @@ self.xml.get_widget('resource_prio_label').set_text(resources) resource_prio_label_eventbox = self.xml.get_widget( 'resource_prio_label_eventbox') - tooltips.set_tip(resource_prio_label_eventbox, uf_resources) + resource_prio_label_eventbox.set_tooltip_text(uf_resources) self.fill_status_label()

1 0

gajim: remove hack I did for #5366, It was most probably due to ...
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset 5d5f16e7d63b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5d5f16e7d63b description: remove hack I did for #5366, It was most probably due to #5375. see #5366, #5375 diffstat: src/message_window.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 7905d12c7bf0 -r 5d5f16e7d63b src/message_window.py --- a/src/message_window.py Fri Oct 30 09:44:40 2009 +0100 +++ b/src/message_window.py Fri Oct 30 09:51:16 2009 +0100 @@ -764,9 +764,6 @@ old_ctrl.set_control_active(False) new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) - if not new_ctrl: - # This event is sometimes exposed without any reason. see #5366 - return new_ctrl.set_control_active(True) self.show_title(control = new_ctrl)

1 0

gajim: prevent traceback when changing resource of a control whe...
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset 7905d12c7bf0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7905d12c7bf0 description: prevent traceback when changing resource of a control when there is no event for the account at all. Fixes #5375 diffstat: src/common/events.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r ab1f9ab7cc6c -r 7905d12c7bf0 src/common/events.py --- a/src/common/events.py Thu Oct 29 16:46:36 2009 +0100 +++ b/src/common/events.py Fri Oct 30 09:44:40 2009 +0100 @@ -163,6 +163,8 @@ del self._events[account][jid] def change_jid(self, account, old_jid, new_jid): + if account not in self._events: + return if old_jid not in self._events[account]: return if new_jid in self._events[account]:

1 0

gajim: updated Russian, Ukrainian and Serbian translations
by Yann Leboulanger 30 Oct '09

30 Oct '09

changeset 7208dbc6a0cb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7208dbc6a0cb description: updated Russian, Ukrainian and Serbian translations diffstat: po/ru.po | 272 ++++++++++++++++----------------- po/sr.po | 468 ++++++++++++++++++++++++--------------------------------- po/sr(a)Latn.po | 478 +++++++++++++++++++++++++---------------------------------- po/uk.po | 121 ++++++-------- 4 files changed, 593 insertions(+), 746 deletions(-) diffs (truncated from 4168 to 300 lines): diff -r 4a3e8303cbd1 -r 7208dbc6a0cb po/ru.po --- a/po/ru.po Thu Oct 29 10:40:50 2009 +0100 +++ b/po/ru.po Fri Oct 30 09:15:44 2009 +0100 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-28 22:17+0100\n" -"PO-Revision-Date: 2009-08-20 00:02+0200\n" +"POT-Creation-Date: 2009-10-29 10:48+0100\n" +"PO-Revision-Date: 2009-10-30 01:02+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Русский <ru(a)li.org>\n" "MIME-Version: 1.0\n" @@ -112,9 +112,8 @@ "Отпечаток SHA1 сертификата:\n" #: ../data/glade/account_creation_wizard_window.glade.h:11 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Использовать прокси аут_ентификацию" +msgstr "Анонимная аут_ентификация" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" @@ -491,9 +490,8 @@ msgstr "Учётные записи" #: ../data/glade/accounts_window.glade.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "Использовать прокси аут_ентификацию" +msgstr "Анонимная аутентификация" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -1075,9 +1073,8 @@ msgstr "Назначить ключ Open_PGP" #: ../data/glade/contact_context_menu.glade.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Выполнить команду..." +msgstr "В_ыполнить команду..." #: ../data/glade/contact_context_menu.glade.h:5 msgid "Edit _Groups..." @@ -1506,9 +1503,8 @@ msgstr "_История сообщения" #: ../data/glade/join_groupchat_window.glade.h:2 -#, fuzzy msgid "Bookmark this room" -msgstr "Добавить комнату в закладки (Ctrl+B)" +msgstr "Добавить комнату в закладки" #: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972 msgid "Join Group Chat" @@ -1892,7 +1888,7 @@ "If checked, Gajim will allow others to detect the operation system you are " "using" msgstr "" -"Если отмечено, то Gajim будет разрешать определять операционную систему " +"Если отмечено, то Gajim будет разрешать определять операционную систему, " "которую вы используете" #: ../data/glade/preferences_window.glade.h:53 @@ -2268,9 +2264,8 @@ msgstr "всем" #: ../data/glade/privacy_list_window.glade.h:7 -#, fuzzy msgid "All (including subscription)" -msgstr "всем с подпиской" +msgstr "Все (включая подписку)" #: ../data/glade/privacy_list_window.glade.h:8 msgid "Allow" @@ -2502,14 +2497,18 @@ "someone(a)somewhere.com would like you to add some contacts in " "your roster." msgstr "" +"someone(a)somewhere.com хочет добавить несколько контактов в ваш " +"список контактов." #: ../data/glade/roster_item_exchange_window.glade.h:2 msgid "Message Body <currently unused, so it's hidden by default>" msgstr "" +"Тело сообщения <в данное время не используется, поэтому по умолчанию не " +"отображается>" #: ../data/glade/roster_item_exchange_window.glade.h:3 msgid "Roster Item Exchange" -msgstr "" +msgstr "Обмен контактами" #: ../data/glade/roster_item_exchange_window.glade.h:4 msgid "gtk-cancel" @@ -2917,9 +2916,9 @@ msgstr "Скрытый" #: ../src/atom_window.py:110 -#, fuzzy, python-format +#, python-format msgid "You have received new entries (and %(count)d not displayed):" -msgstr "Получена новая запись:" +msgstr "Вы получили новые записи (и %(count)d не отображается):" #. the next script, executed in the "po" directory, #. generates the following list. @@ -3397,53 +3396,48 @@ #: ../src/common/config.py:88 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'." msgstr "" -"Когда показывать иконку в системном лотке. Возможные значения 'never', " +"Когда показывать иконку в системном лотке. Возможные значения 'never', " "'on_event', 'always'." #: ../src/common/config.py:93 -#, fuzzy msgid "Incoming nickname color." -msgstr "Неверное имя пользователя" +msgstr "Цвет ника собеседника." #: ../src/common/config.py:94 msgid "Outgoing nickname color." -msgstr "" +msgstr "Цвет вашего ника." #: ../src/common/config.py:95 msgid "Incoming text color." -msgstr "" +msgstr "Цвет входящих сообщений." #: ../src/common/config.py:96 msgid "Outgoing text color." -msgstr "" +msgstr "Цвет исходящих сообщений." #: ../src/common/config.py:97 -#, fuzzy msgid "Status message text color." -msgstr "текст сообщения о статусе" +msgstr "Цвет сообщения о статусе." #: ../src/common/config.py:100 -#, fuzzy msgid "Incoming nickname font." -msgstr "Неверное имя пользователя" +msgstr "Шрифт ника собеседника." #: ../src/common/config.py:101 -#, fuzzy msgid "Outgoing nickname font." -msgstr "Смена ника" +msgstr "Шрифт вашего ника." #: ../src/common/config.py:102 msgid "Incoming text font." -msgstr "" +msgstr "Шрифт входящих сообщений." #: ../src/common/config.py:103 msgid "Outgoing text font." -msgstr "" +msgstr "Шрифт исходящих сообщений." #: ../src/common/config.py:104 -#, fuzzy msgid "Status message text font." -msgstr "текст сообщения о статусе" +msgstr "Шрифт сообщения о статусе" #: ../src/common/config.py:105 msgid "" @@ -3557,17 +3551,22 @@ #: ../src/common/config.py:168 msgid "How many lines to request to server when entering a groupchat." -msgstr "" +msgstr "Количество строк истории сообщений, запрашиваемых при входе в комнату." #: ../src/common/config.py:169 msgid "How many minutes back to request logs when a entering a groupchat." msgstr "" +"За какой период (минут назад) запрашивать историю сообщений при входе в " +"комнату." #: ../src/common/config.py:170 msgid "" "How many seconds to wait before trying to autorejoin to a conference you are " "being disconnected from. Set to 0 to disable autorejoining." msgstr "" +"Время ожидания в секундах перед попыткой снова автоматически войти в " +"комнату, от которой вы были отключены. Чтобы отключить автоматический вход в " +"этом случае, установите значение 0." #: ../src/common/config.py:172 msgid "" @@ -3887,7 +3886,7 @@ "List of colors, separated by \":\", that will be used to color nicknames in " "group chats." msgstr "" -"Список цветов, разделенных «:» которые будут использоваться для раскраски " +"Список цветов, разделенных «:», которые будут использоваться для раскраски " "ников в комнатах." #: ../src/common/config.py:255 @@ -3905,21 +3904,19 @@ "строка означает, что сообщение не будет показываться вообще." #: ../src/common/config.py:257 -#, fuzzy msgid "" "Should we show the confirm block contact dialog or not? Empty string means " "we never show the dialog." msgstr "" -"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая " +"Следует ли показывать диалог подтверждения блокировки контакта? Пустая " "строка означает, что сообщение не будет показываться вообще." #: ../src/common/config.py:258 -#, fuzzy msgid "" "Should we show the confirm custom status dialog or not? Empty string means " "we never show the dialog." msgstr "" -"Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая " +"Следует ли показывать диалог подтверждения блокировки контакта? Пустая " "строка означает, что сообщение не будет показываться вообще." #: ../src/common/config.py:259 @@ -3942,12 +3939,11 @@ "хранения паролей учетных записей." #: ../src/common/config.py:261 -#, fuzzy msgid "" "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store " "account passwords." msgstr "" -"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для " +"Если активно, Gajim будет использовать (если возможно) KDE Wallet для " "хранения паролей учетных записей." #: ../src/common/config.py:262 @@ -4030,12 +4026,17 @@ #: ../src/common/config.py:273 msgid "If True, completion in groupchats will be like a shell auto-completion" msgstr "" +"Если Активно, автодополнение ников в конференциях будет работать как " +"автодополнение в командной оболочке" #: ../src/common/config.py:274 msgid "" "When is self contact row displayed. Can be \"always\", \"when_other_resource" "\" or \"never\"" msgstr "" +"В каких случаях показывать список своих собственных контактов. Может " +"принимать значения «always» (всегда), «when_other_resource» (если другой " +"ресурс) и «never» (никогда)." #: ../src/common/config.py:286 msgid "" @@ -4061,12 +4062,15 @@ msgid "" "If True, Contacts requesting authorization will be automatically accepted." msgstr "" +"Если активно, контакты, запрашивающие авторизацию, будут автоматически её " +"получать." #: ../src/common/config.py:298 -#, fuzzy msgid "" "If False, this account will be disabled and will not appear in roster window." -msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы." +msgstr "" +"Если неактивно, эта учетная запись будет отключена и не будет отображаться в " +"окне ростера." #: ../src/common/config.py:301 msgid "" @@ -4389,7 +4393,7 @@ #: ../src/common/connection_handlers.py:2296 #, python-format msgid "Maximum number of users for %s has been reached" -msgstr "" +msgstr "Было достигнуто максимальное количество пользователей %s" #: ../src/common/connection_handlers.py:2304 #, python-format @@ -4733,27 +4737,25 @@ #: ../src/common/connection.py:1383 #, python-format msgid "Sent contact: \"%s\" (%s)" -msgstr "" +msgstr "Контакт для отправки: «%s» (%s)" #: ../src/common/connection.py:1386 -#, fuzzy

1 0

gajim: connect some missing handlers in chat control context men...
by Yann Leboulanger 29 Oct '09

29 Oct '09

changeset ab1f9ab7cc6c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab1f9ab7cc6c description: connect some missing handlers in chat control context menu. Fixes #5369 diffstat: src/gui_menu_builder.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diffs (52 lines): diff -r 36de72f22c46 -r ab1f9ab7cc6c src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 29 15:00:48 2009 +0100 +++ b/src/gui_menu_builder.py Thu Oct 29 16:46:36 2009 +0100 @@ -240,6 +240,12 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) + if control: + convert_to_gc_menuitem.connect('activate', + control._on_convert_to_gc_menuitem_activate) + else: + items_to_hide.append(convert_to_gc_menuitem) + if _('Not in Roster') not in contact.get_shown_groups(): # contact is in normal group edit_groups_menuitem.connect('activate', roster.on_edit_groups, [(contact, @@ -262,7 +268,7 @@ # Unsensitive many items when account is offline if gajim.account_is_disconnected(account): for widget in (start_chat_menuitem, rename_menuitem, - edit_groups_menuitem, send_file_menuitem): + edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem): widget.set_sensitive(False) if not show_start_chat: @@ -284,6 +290,8 @@ toggle_gpg_menuitem.set_sensitive(control.gpg_is_active or \ not e2e_is_active) toggle_gpg_menuitem.set_active(control.gpg_is_active) + toggle_gpg_menuitem.connect('activate', + control._on_toggle_gpg_menuitem_activate) # disable esessions if we or the other client don't support them # XXX: Once we have fallback to disco, remove notexistant check @@ -296,6 +304,8 @@ toggle_e2e_menuitem.set_active(e2e_is_active) toggle_e2e_menuitem.set_sensitive(e2e_is_active or \ not control.gpg_is_active) + toggle_e2e_menuitem.connect('activate', + control._on_toggle_e2e_menuitem_activate) if not show_buttonbar_items: items_to_hide += [history_menuitem, send_file_menuitem, @@ -313,7 +323,7 @@ for item in (send_custom_status_menuitem, send_single_message_menuitem, invite_menuitem, block_menuitem, unblock_menuitem, ignore_menuitem, unignore_menuitem, set_custom_avatar_menuitem, subscription_menuitem, - manage_contact_menuitem): + manage_contact_menuitem, convert_to_gc_menuitems): item.set_no_show_all(True) item.hide()

1 0

gajim: use correct function for plural forms translation
by Yann Leboulanger 29 Oct '09

29 Oct '09

changeset 36de72f22c46 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=36de72f22c46 description: use correct function for plural forms translation diffstat: src/atom_window.py | 8 +++++--- src/conversation_textview.py | 9 ++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diffs (52 lines): diff -r cebed529e847 -r 36de72f22c46 src/atom_window.py --- a/src/atom_window.py Thu Oct 29 11:55:05 2009 +0100 +++ b/src/atom_window.py Thu Oct 29 15:00:48 2009 +0100 @@ -27,6 +27,7 @@ import gtkgui_helpers from common import helpers +from common import i18n class AtomWindow: window = None @@ -106,9 +107,10 @@ changed...''' count = len(self.__class__.entries) if count>0: - self.new_entry_label.set_text( - _('You have received new entries (and %(count)d not displayed):') %\ - {'count': count}) + self.new_entry_label.set_text(i18n.ngettext( + 'You have received new entries (and %d not displayed):', + 'You have received new entries (and %d not displayed):', count, + count, count)) self.next_button.set_sensitive(True) else: self.new_entry_label.set_text(_('You have received new entry:')) diff -r cebed529e847 -r 36de72f22c46 src/conversation_textview.py --- a/src/conversation_textview.py Thu Oct 29 11:55:05 2009 +0100 +++ b/src/conversation_textview.py Thu Oct 29 15:00:48 2009 +0100 @@ -43,6 +43,7 @@ from common import gajim from common import helpers from common import latex +from common import i18n from calendar import timegm from common.fuzzyclock import FuzzyClock @@ -1270,12 +1271,10 @@ int(timegm(tim)) / 86400 if diff_day == 0: day_str = '' - elif diff_day == 1: - day_str = _('Yesterday') else: - #the number is >= 2 - # %i is day in year (1-365), %d (1-31) we want %i - day_str = _('%i days ago') % diff_day + #%i is day in year (1-365) + day_str = i18n.ngettext('Yesterday', '%i days ago', diff_day, + replace_plural=diff_day) if day_str: format += day_str + ' ' timestamp_str = gajim.config.get('time_stamp')

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2009