Commits March 2009

commits@gajim.org

2 participants
55 discussions

[commit-gajim] r11162 - branches/gajim_0.12/src/common
by asterix＠gajim.org 13 Mar '09

13 Mar '09

Author: asterix Date: 2009-03-13 10:53:50 +0100 (Fri, 13 Mar 2009) New Revision: 11162 Modified: branches/gajim_0.12/src/common/connection.py Log: fix sending non-GPG-encrypted messages. Fixes #4902 Modified: branches/gajim_0.12/src/common/connection.py =================================================================== --- branches/gajim_0.12/src/common/connection.py 2009-03-11 19:14:32 UTC (rev 11161) +++ branches/gajim_0.12/src/common/connection.py 2009-03-13 09:53:50 UTC (rev 11162) @@ -1121,6 +1121,7 @@ fjid += '/' + resource msgtxt = msg msgenc = '' + error = None if session: fjid = str(session.jid) @@ -1153,24 +1154,29 @@ #encrypt msgenc, error = self.gpg.encrypt(msg, [keyID], False) return _on_encrypted(msgenc, error) + return self._on_message_encrypted((msgenc, error), type_, msg, msgtxt, + original_message, fjid, resource, jid, xhtml, subject, chatstate, + composing_xep, forward_from, delayed, session, form_node, user_nick, + keyID) def _on_message_encrypted(self, output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, composing_xep, forward_from, delayed, session, form_node, user_nick, keyID): msgenc, error = output - if not msgenc or error: - # Encryption failed, do not send message - tim = localtime() - self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) - return 3 + if keyID and self.USE_GPG: + if error or not msgenc: + # Encryption failed, do not send message + tim = localtime() + self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) + return 3 - msgtxt = '[This message is *encrypted* (See :XEP:`27`]' - lang = os.getenv('LANG') - if lang is not None and lang != 'en': # we're not english - # one in locale and one en - msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \ - ' (' + msgtxt + ')' + msgtxt = '[This message is *encrypted* (See :XEP:`27`]' + lang = os.getenv('LANG') + if lang is not None and lang != 'en': # we're not english + # one in locale and one en + msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \ + ' (' + msgtxt + ')' if type_ == 'chat': msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_,

1 0

[commit-gajim] r11161 - in branches/gajim_0.12/src: . common
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 20:14:32 +0100 (Wed, 11 Mar 2009) New Revision: 11161 Modified: branches/gajim_0.12/src/common/GnuPG.py branches/gajim_0.12/src/common/dataforms.py branches/gajim_0.12/src/common/helpers.py branches/gajim_0.12/src/config.py Log: import buxfixes from trunk: [11151] [11152] [11153] [11154] [11160] Fixes #4857 #4893 #4894 #4895 Modified: branches/gajim_0.12/src/common/GnuPG.py =================================================================== --- branches/gajim_0.12/src/common/GnuPG.py 2009-03-11 19:12:56 UTC (rev 11160) +++ branches/gajim_0.12/src/common/GnuPG.py 2009-03-11 19:14:32 UTC (rev 11161) @@ -111,7 +111,7 @@ # Encryption succeeded, even if there is output on stderr. Maybe # verbose is on error = '' - return self._stripHeaderFooter(output), error + return self._stripHeaderFooter(output), helpers.decode_string(error) def decrypt(self, str_, keyID): proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout']) Modified: branches/gajim_0.12/src/common/dataforms.py =================================================================== --- branches/gajim_0.12/src/common/dataforms.py 2009-03-11 19:12:56 UTC (rev 11160) +++ branches/gajim_0.12/src/common/dataforms.py 2009-03-11 19:14:32 UTC (rev 11161) @@ -146,7 +146,10 @@ def label(): '''Human-readable field name.''' def fget(self): - return self.getAttr('label') + l = self.getAttr('label') + if not l: + l = self.var + return l def fset(self, value): assert isinstance(value, basestring) self.setAttr('label', value) @@ -232,7 +235,10 @@ for element in self.getTags('option'): v = element.getTagData('value') if v is None: raise WrongFieldValue - options.append((element.getAttr('label'), v)) + l = element.getAttr('label') + if not l: + l = v + options.append((l, v)) return options def fset(self, values): fdel(self) Modified: branches/gajim_0.12/src/common/helpers.py =================================================================== --- branches/gajim_0.12/src/common/helpers.py 2009-03-11 19:12:56 UTC (rev 11160) +++ branches/gajim_0.12/src/common/helpers.py 2009-03-11 19:14:32 UTC (rev 11161) @@ -733,6 +733,9 @@ if kind == 'mail' and not uri.startswith('mailto:'): uri = 'mailto:' + uri + if kind == 'url' and uri.startswith('www.'): + uri = 'http://' + uri + if gajim.config.get('openwith') == 'gnome-open': command = 'gnome-open' elif gajim.config.get('openwith') == 'kfmclient exec': Modified: branches/gajim_0.12/src/config.py =================================================================== --- branches/gajim_0.12/src/config.py 2009-03-11 19:12:56 UTC (rev 11160) +++ branches/gajim_0.12/src/config.py 2009-03-11 19:14:32 UTC (rev 11161) @@ -536,8 +536,11 @@ self.window.hide() def get_per_account_option(self, opt): - '''Return the value of the option opt if it's the same in all accoutns + '''Return the value of the option opt if it's the same in all accounts else returns "mixed"''' + if len(gajim.connections) == 0: + # a non existant key return default value + return gajim.config.get_per('accounts', '__default__', opt) val = None for account in gajim.connections: v = gajim.config.get_per('accounts', account, opt)

1 0

[commit-gajim] r11160 - trunk/src/common
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 20:12:56 +0100 (Wed, 11 Mar 2009) New Revision: 11160 Modified: trunk/src/common/helpers.py Log: better way to add http://. see #4857 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2009-03-11 18:59:45 UTC (rev 11159) +++ trunk/src/common/helpers.py 2009-03-11 19:12:56 UTC (rev 11160) @@ -714,6 +714,9 @@ if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): uri = 'mailto:' + uri + if kind == 'url' and uri.startswith('www.'): + uri = 'http://' + uri + if gajim.config.get('openwith') == 'gnome-open': command = 'gnome-open' elif gajim.config.get('openwith') == 'kfmclient exec': @@ -726,8 +729,6 @@ elif gajim.config.get('openwith') == 'custom': if kind == 'url': command = gajim.config.get('custombrowser') - if uri.startswith('www.'): - uri = 'http://' + uri elif kind in ('mail', 'sth_at_sth'): command = gajim.config.get('custommailapp') if command == '': # if no app is configured

1 0

[commit-gajim] r11159 - branches/gajim_0.12/data/glade
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 19:59:45 +0100 (Wed, 11 Mar 2009) New Revision: 11159 Modified: branches/gajim_0.12/data/glade/preferences_window.glade Log: fix GTK warning with spinButton Modified: branches/gajim_0.12/data/glade/preferences_window.glade =================================================================== --- branches/gajim_0.12/data/glade/preferences_window.glade 2009-03-11 18:58:10 UTC (rev 11158) +++ branches/gajim_0.12/data/glade/preferences_window.glade 2009-03-11 18:59:45 UTC (rev 11159) @@ -211,55 +211,45 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="one_window_type_combobox"> - <property name="width_request">50</property> + <widget class="GtkLabel" id="label379"> <property name="visible">True</property> - <property name="items" translatable="yes">Detached roster with detached chats -Detached roster with single chat -Single window for everything -Detached roster with chat grouped by account -Detached roster with chat grouped by type</property> - <signal name="changed" handler="on_one_window_type_combo_changed"/> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Window behavior:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">one_window_type_combobox</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="speller_checkbutton"> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> - <property name="label" translatable="yes">_Highlight misspelled words</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_speller_checkbutton_toggled"/> + <widget class="GtkComboBox" id="emoticons_combobox"> + <property name="visible">True</property> + <signal name="changed" handler="on_emoticons_combobox_changed"/> </widget> <packing> + <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <widget class="GtkEventBox" id="eventbox5"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> + <child> + <widget class="GtkLabel" id="label381"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xpad">1</property> + <property name="label" translatable="yes">_Emoticons:</property> + <property name="use_underline">True</property> + </widget> + </child> </widget> <packing> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> @@ -281,46 +271,56 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox5"> + <widget class="GtkCheckButton" id="xhtml_checkbutton"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons</property> - <child> - <widget class="GtkLabel" id="label381"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Emoticons:</property> - <property name="use_underline">True</property> - </widget> - </child> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> </widget> <packing> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="emoticons_combobox"> - <property name="visible">True</property> - <signal name="changed" handler="on_emoticons_combobox_changed"/> + <widget class="GtkCheckButton" id="speller_checkbutton"> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> + <property name="label" translatable="yes">_Highlight misspelled words</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_speller_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label379"> + <widget class="GtkComboBox" id="one_window_type_combobox"> + <property name="width_request">50</property> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">1</property> - <property name="label" translatable="yes">_Window behavior:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">one_window_type_combobox</property> + <property name="items" translatable="yes">Detached roster with detached chats +Detached roster with single chat +Single window for everything +Detached roster with chat grouped by account +Detached roster with chat grouped by type</property> + <signal name="changed" handler="on_one_window_type_combo_changed"/> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -732,67 +732,67 @@ <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> + <widget class="GtkComboBox" id="displayed_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only Disabled</property> - <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/> + <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox9"> + <widget class="GtkEventBox" id="eventbox8"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Send chat state notifications:</property> + <property name="label" translatable="yes">_Display chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEventBox" id="eventbox8"> + <widget class="GtkEventBox" id="eventbox9"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows.</property> + <property name="tooltip" translatable="yes">Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party.</property> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Display chat state notifications:</property> + <property name="label" translatable="yes">_Send chat state notifications:</property> <property name="use_underline">True</property> </widget> </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkComboBox" id="displayed_chat_states_combobox"> + <widget class="GtkComboBox" id="outgoing_chat_states_combobox"> <property name="visible">True</property> <property name="items" translatable="yes">All chat states Composing only Disabled</property> - <signal name="changed" handler="on_displayed_chat_states_combobox_changed"/> + <signal name="changed" handler="on_outgoing_chat_states_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> </packing> </child> </widget> @@ -856,56 +856,65 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEntry" id="auto_xa_message_entry"> + <widget class="GtkCheckButton" id="auto_away_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message</property> - <signal name="changed" handler="on_auto_xa_message_entry_changed"/> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> + <property name="label" translatable="yes">_Away after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="auto_xa_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> + <property name="label" translatable="yes">_Not available after:</property> + <property name="use_underline">True</property> + <property name="response_id">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> + </widget> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="auto_away_message_entry"> + <widget class="GtkLabel" id="label77"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message</property> - <signal name="changed" handler="on_auto_away_message_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment34"> + <widget class="GtkLabel" id="label78"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="xscale">0</property> - <child> - <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> - <property name="width_request">50</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">20 1 1440 1 10 10</property> - <property name="climb_rate">1</property> - <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> - </widget> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">minutes</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> @@ -918,7 +927,7 @@ <property name="width_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment">12 1 720 1 10 10</property> + <property name="adjustment">10 1 720 1 10 0</property> <property name="climb_rate">1</property> <signal name="value_changed" handler="on_auto_away_time_spinbutton_value_changed"/> </widget> @@ -932,67 +941,58 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkAlignment" id="alignment34"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="xalign">1</property> + <property name="xscale">0</property> + <child> + <widget class="GtkSpinButton" id="auto_xa_time_spinbutton"> + <property name="width_request">50</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="adjustment">20 1 1440 1 10 0</property> + <property name="climb_rate">1</property> + <signal name="value_changed" handler="on_auto_xa_time_spinbutton_value_changed"/> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label77"> + <widget class="GtkEntry" id="auto_away_message_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">minutes</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message</property> + <signal name="changed" handler="on_auto_away_message_entry_changed"/> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkCheckButton" id="auto_xa_checkbutton"> + <widget class="GtkEntry" id="auto_xa_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Not Available when the computer has not been used even longer</property> - <property name="label" translatable="yes">_Not available after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_xa_checkbutton_toggled"/> + <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message</property> + <signal name="changed" handler="on_auto_xa_message_entry_changed"/> </widget> <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - <child> - <widget class="GtkCheckButton" id="auto_away_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will change status to Away when the computer is unused.</property> - <property name="label" translatable="yes">_Away after:</property> - <property name="use_underline">True</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_auto_away_checkbutton_toggled"/> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> </widget> @@ -1150,24 +1150,40 @@ <placeholder/> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow23"> + <widget class="GtkVButtonBox" id="vbuttonbox3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="spacing">5</property> + <property name="layout_style">GTK_BUTTONBOX_START</property> <child> - <widget class="GtkTextView" id="msg_textview"> + <widget class="GtkButton" id="new_msg_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="wrap_mode">GTK_WRAP_WORD</property> + <property name="can_default">True</property> + <property name="label">gtk-new</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_new_msg_button_clicked"/> </widget> </child> + <child> + <widget class="GtkButton" id="delete_msg_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-delete</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_delete_msg_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1190,40 +1206,24 @@ </widget> </child> <child> - <widget class="GtkVButtonBox" id="vbuttonbox3"> + <widget class="GtkScrolledWindow" id="scrolledwindow23"> <property name="visible">True</property> - <property name="spacing">5</property> - <property name="layout_style">GTK_BUTTONBOX_START</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> + <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkButton" id="new_msg_button"> + <widget class="GtkTextView" id="msg_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-new</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_new_msg_button_clicked"/> + <property name="border_width">3</property> + <property name="wrap_mode">GTK_WRAP_WORD</property> </widget> </child> - <child> - <widget class="GtkButton" id="delete_msg_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="label">gtk-delete</property> - <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_delete_msg_button_clicked"/> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -1289,14 +1289,15 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label4"> + <widget class="GtkFontButton" id="conversation_fontbutton"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Chat message:</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <signal name="font_set" handler="on_conversation_fontbutton_font_set"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> <child> @@ -1317,15 +1318,14 @@ </packing> </child> <child> - <widget class="GtkFontButton" id="conversation_fontbutton"> + <widget class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="response_id">0</property> - <signal name="font_set" handler="on_conversation_fontbutton_font_set"/> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">Chat message:</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> </widget> @@ -1375,43 +1375,35 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label249"> + <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">T_heme:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">theme_combobox</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="manage_theme_button"> - <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Configure color and font of the interface</property> - <property name="label" translatable="yes">Ma_nage...</property> + <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="label" translatable="yes">Use _transports icons</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <signal name="clicked" handler="on_manage_theme_button_clicked"/> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> </widget> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> <child> - <widget class="GtkComboBox" id="theme_combobox"> + <widget class="GtkComboBox" id="iconset_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_theme_combobox_changed"/> + <signal name="changed" handler="on_iconset_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -1430,37 +1422,45 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="iconset_combobox"> + <widget class="GtkComboBox" id="theme_combobox"> <property name="visible">True</property> - <signal name="changed" handler="on_iconset_combobox_changed"/> + <signal name="changed" handler="on_theme_combobox_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="transports_iconsets_checkbutton"> + <widget class="GtkButton" id="manage_theme_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> - <property name="label" translatable="yes">Use _transports icons</property> + <property name="tooltip" translatable="yes">Configure color and font of the interface</property> + <property name="label" translatable="yes">Ma_nage...</property> <property name="use_underline">True</property> <property name="response_id">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_transports_iconsets_checkbutton_toggled"/> + <signal name="clicked" handler="on_manage_theme_button_clicked"/> </widget> <packing> - <property name="left_attach">1</property> + <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> </packing> </child> + <child> + <widget class="GtkLabel" id="label249"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">T_heme:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">theme_combobox</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </widget> </child> </widget> @@ -1500,119 +1500,65 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkHBox" id="hbox3022"> + <widget class="GtkLabel" id="label72"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="label383"> - <property name="visible">True</property> - </widget> - <packing> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkButton" id="reset_colors_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="response_id">0</property> - <signal name="clicked" handler="on_reset_colors_button_clicked"/> - <child> - <widget class="GtkAlignment" id="alignment52"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <widget class="GtkHBox" id="hbox2936"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <widget class="GtkImage" id="image439"> - <property name="visible">True</property> - <property name="stock">gtk-revert-to-saved</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label217"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Reset to Default Colors</property> - <property name="use_underline">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Incoming message:</property> + <property name="use_underline">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">incoming_msg_colorbutton</property> </widget> <packing> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="url_msg_colorbutton"> + <widget class="GtkColorButton" id="incoming_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label371"> + <widget class="GtkLabel" id="label70"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_URL highlight:</property> + <property name="label" translatable="yes">_Outgoing message:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">url_msg_colorbutton</property> + <property name="justify">GTK_JUSTIFY_CENTER</property> + <property name="wrap">True</property> + <property name="mnemonic_widget">outgoing_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="status_msg_colorbutton"> + <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1634,66 +1580,120 @@ </packing> </child> <child> - <widget class="GtkColorButton" id="outgoing_msg_colorbutton"> + <widget class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label70"> + <widget class="GtkLabel" id="label371"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Outgoing message:</property> + <property name="label" translatable="yes">_URL highlight:</property> <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">outgoing_msg_colorbutton</property> + <property name="mnemonic_widget">url_msg_colorbutton</property> </widget> <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkColorButton" id="incoming_msg_colorbutton"> + <widget class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> <property name="response_id">0</property> - <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> + <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options"></property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label72"> + <widget class="GtkHBox" id="hbox3022"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Incoming message:</property> - <property name="use_underline">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</property> - <property name="wrap">True</property> - <property name="mnemonic_widget">incoming_msg_colorbutton</property> + <child> + <widget class="GtkLabel" id="label383"> + <property name="visible">True</property> + </widget> + <packing> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="reset_colors_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_reset_colors_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment52"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2936"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image439"> + <property name="visible">True</property> + <property name="stock">gtk-revert-to-saved</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label217"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Reset to Default Colors</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </widget> <packing> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> </packing> </child> </widget> @@ -1780,85 +1780,85 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label199"> + <widget class="GtkEntry" id="custom_file_manager_entry"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Browser:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_browser_entry</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_custom_file_manager_entry_changed"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label200"> + <widget class="GtkLabel" id="label355"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_Mail client:</property> + <property name="label" translatable="yes">_File manager:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_mail_client_entry</property> + <property name="mnemonic_widget">custom_file_manager_entry</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_mail_client_entry"> + <widget class="GtkEntry" id="custom_browser_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_mail_client_entry_changed"/> + <signal name="changed" handler="on_custom_browser_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_browser_entry"> + <widget class="GtkEntry" id="custom_mail_client_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_browser_entry_changed"/> + <signal name="changed" handler="on_custom_mail_client_entry_changed"/> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label355"> + <widget class="GtkLabel" id="label200"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">_File manager:</property> + <property name="label" translatable="yes">_Mail client:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">custom_file_manager_entry</property> + <property name="mnemonic_widget">custom_mail_client_entry</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkEntry" id="custom_file_manager_entry"> + <widget class="GtkLabel" id="label199"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="changed" handler="on_custom_file_manager_entry_changed"/> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Browser:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">custom_browser_entry</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1918,23 +1918,21 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="n_rows">3</property> - <property name="n_columns">1</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> <child> - <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> + <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> - <property name="label" translatable="yes">Log _encrypted chat session</property> + <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> + <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> + <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -1954,18 +1952,19 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton"> + <widget class="GtkCheckButton" id="log_encrypted_chats_checkbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will ignore incoming events from unauthorized contacts. Use with caution, because it blocks all messages from any contact that is not in the roster</property> - <property name="label" translatable="yes">_Ignore events from contacts not in the roster</property> + <property name="tooltip" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using E2E encryption the remote party has to agree on logging, else the messages will not be logged.</property> + <property name="label" translatable="yes">Log _encrypted chat session</property> <property name="use_underline">True</property> <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_ignore_events_from_unknown_contacts_checkbutton_toggled"/> + <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled"/> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> </widget>

1 0

[commit-gajim] r11158 - trunk/data/pixmaps
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 19:58:10 +0100 (Wed, 11 Mar 2009) New Revision: 11158 Modified: trunk/data/pixmaps/gajim.ico Log: get new .ico file from 0.12 branch Modified: trunk/data/pixmaps/gajim.ico =================================================================== (Binary files differ)

1 0

[commit-gajim] r11157 - trunk/src/common
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 18:48:34 +0100 (Wed, 11 Mar 2009) New Revision: 11157 Modified: trunk/src/common/helpers.py Log: [Florob] add http:// to URLs before giving them to gnome-open. Fixes #4857 Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2009-03-11 17:07:49 UTC (rev 11156) +++ trunk/src/common/helpers.py 2009-03-11 17:48:34 UTC (rev 11157) @@ -726,7 +726,9 @@ elif gajim.config.get('openwith') == 'custom': if kind == 'url': command = gajim.config.get('custombrowser') - if kind in ('mail', 'sth_at_sth'): + if uri.startswith('www.'): + uri = 'http://' + uri + elif kind in ('mail', 'sth_at_sth'): command = gajim.config.get('custommailapp') if command == '': # if no app is configured return

1 0

[commit-gajim] r11156 - www-website/locale/pt_BR/LC_MESSAGES
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 18:07:49 +0100 (Wed, 11 Mar 2009) New Revision: 11156 Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po Log: [Davidson Paulo] updated pt_BR translation of the website. Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pt_BR/LC_MESSAGES/msg.po 2009-03-11 17:00:28 UTC (rev 11155) +++ www-website/locale/pt_BR/LC_MESSAGES/msg.po 2009-03-11 17:07:49 UTC (rev 11156) @@ -3,8 +3,8 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-21 14:51+0100\n" -"PO-Revision-Date: 2007-11-16 17:05-0300\n" -"Last-Translator: Davidson Paulo <dpaulo(a)fedoraproject.org>\n" +"PO-Revision-Date: 2009-03-11 10:53-0300\n" +"Last-Translator: Davidson Paulo <davidsonpaulo(a)gmail.com>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,14 +126,13 @@ msgstr " Idioma:" #: Design.php:177 -msgid "" -" Site optimized for W3C Standards and realized with vim editor under GNU/" -"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" -msgstr "" -" Site otimizado para os padrões W3C e construído com o " -"editor Vim no GNU/Linux por Asterix (Jabber ID: asterx(a)jabber.lagaule.org)\n" +msgid " Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr " Site otimizado para os padrões W3C e construído com o editor Vim no GNU/Linux por Asterix (Jabber ID: asterx(a)jabber.lagaule.org)\n" -#: dev.php:5 downloads.php:5 index.php:7 screenshots.php:7 +#: dev.php:5 +#: downloads.php:5 +#: index.php:7 +#: screenshots.php:7 msgid "Gajim, a Jabber client" msgstr "Gajim, um cliente Jabber" @@ -155,9 +154,7 @@ #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " -msgstr "" -" Você também pode se inscrever na nossa lista de " -"discussão (baixo tráfego ): " +msgstr " Você também pode se inscrever na nossa lista de discussão (baixo tráfego ): " #: dev.php:19 msgid "or by visiting" @@ -167,9 +164,18 @@ msgid " List archives are available " msgstr " O histórico da lista está disponível " -#: dev.php:20 docs.php:51 docs.php:54 docs.php:57 docs.php:60 docs.php:72 -#: docs.php:78 downloads.php:146 downloads.php:157 downloads.php:195 -#: downloads.php:217 index.php:14 +#: dev.php:20 +#: docs.php:51 +#: docs.php:54 +#: docs.php:57 +#: docs.php:60 +#: docs.php:72 +#: docs.php:78 +#: downloads.php:146 +#: downloads.php:157 +#: downloads.php:195 +#: downloads.php:217 +#: index.php:14 msgid "here" msgstr "aqui" @@ -207,17 +213,11 @@ #: dev.php:38 msgid " You can help us make Gajim even better by:\n" -msgstr "" -" Você pode nos ajudam a tornar o Gajim cada vez melhor das seguintes " -"formas:\n" +msgstr " Você pode nos ajudam a tornar o Gajim cada vez melhor das seguintes formas:\n" #: dev.php:41 -msgid "" -" Coding: contact us on our mailing list or in our room gajim@conference." -"gajim.org \n" -msgstr "" -" Programando: entre em contato conosco em nossa lista de discussã" -"o ou em nossa sala gajim(a)conferecence.gajim.org \n" +msgid " Coding: contact us on our mailing list or in our room gajim(a)conference.gajim.org \n" +msgstr " Programando: entre em contato conosco em nossa lista de discussão ou em nossa sala gajim(a)conferecence.gajim.org \n" #: dev.php:44 msgid " Submitting a translation: see" @@ -229,8 +229,7 @@ #: dev.php:47 msgid " Bug reporting: in case you find a bug, do not hesitate to" -msgstr "" -" Reportando bugs: se você encontrar algum, não hesite em" +msgstr " Reportando bugs: se você encontrar algum, não hesite em" #: dev.php:47 msgid "report it" @@ -238,8 +237,7 @@ #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" -msgstr "" -" Doações: contate-me no Jabber (asterix(a)jabber.lagaule.org)" +msgstr " Doações: contate-me no Jabber (asterix(a)jabber.lagaule.org)" #: dev.php:55 msgid " Translations status" @@ -274,23 +272,18 @@ msgstr "download." #: docs.php:20 -#, fuzzy, c-format +#, c-format msgid " To get one of these versions, go to the %s page.\n" -msgstr "" -" Para obter uma dessas versões, vá até a pá" -"gina de" +msgstr " Para obter uma dessas versões, vá até a página de %s.\n" -#: docs.php:22 downloads.php:160 +#: docs.php:22 +#: downloads.php:160 msgid " Under GNU/Linux\n" msgstr " No GNU/Linux\n" #: docs.php:24 -msgid "" -" To run this version, you have to install some packages: python2.3 " -"python2.3-gtk2 and python2.3-glade2.\n" -msgstr "" -" Para executar essa versão, você precisa ter instalados " -"alguns pacotes: python2.3, python2.3-gtk2 e python2.3-glade2.\n" +msgid " To run this version, you have to install some packages: python2.3 python2.3-gtk2 and python2.3-glade2.\n" +msgstr " Para executar essa versão, você precisa ter instalados alguns pacotes: python2.3, python2.3-gtk2 e python2.3-glade2.\n" #: docs.php:25 msgid " (With Debian, just run:" @@ -301,36 +294,20 @@ msgstr " Note que o python2.4 pode ser usado no lugar do python2.3.\n" #: docs.php:29 -msgid "" -" To use the idle module, the trayicon one and the gtkspell one, you have " -"to compile them. For idle you may need libxss-dev (if you don't have " -"scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, " -"if you have gnome-python-extras." -msgstr "" -" Para usar os módulos idle (inatividade), trayicon (bandeja do " -"sistema) e gtkspell (correção ortográfica), você " -"precisará compilá-los. Para o idle precisará do pacote " -"libxss-dev (se você não tiver o scrnsaver.h) e, para o trayicon " -"e o gtkspell, você não previsa compilá-los caso tenha " -"instalado o pacote gnome-python-extras." +msgid " To use the idle module, the trayicon one and the gtkspell one, you have to compile them. For idle you may need libxss-dev (if you don't have scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, if you have gnome-python-extras." +msgstr " Para usar os módulos idle (inatividade), trayicon (bandeja do sistema) e gtkspell (correção ortográfica), você precisará compilá-los. Para o idle precisará do pacote libxss-dev (se você não tiver o scrnsaver.h) e, para o trayicon e o gtkspell, você não previsa compilá-los caso tenha instalado o pacote gnome-python-extras." #: docs.php:31 msgid " In order to compile them all type" msgstr " Para compilar todos eles, digite" #: docs.php:31 -msgid "" -"in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and " -"libgtk2.0-dev packages are needed)\n" -msgstr "" -"no diretório gajim (os pacotes python-dex, python-gtk2-dev, " -"libgtkspell-dev e libgtk2.0-dev são necessários\n" +msgid "in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and libgtk2.0-dev packages are needed)\n" +msgstr "no diretório gajim (os pacotes python-dex, python-gtk2-dev, libgtkspell-dev e libgtk2.0-dev são necessários\n" #: docs.php:34 msgid " You can install or run from source. To run from source" -msgstr "" -" Você pode instalar ou executar a partir do código-fonte. " -"Para executar a partir do código-fonte digite" +msgstr " Você pode instalar ou executar a partir do código-fonte. Para executar a partir do código-fonte digite" #: docs.php:35 msgid "in the gajim folder." @@ -357,9 +334,9 @@ msgstr " No Microsoft Windows\n" #: docs.php:47 -#, fuzzy, c-format +#, c-format msgid " In a first time, you have to install %s, %s, %s and %s.\n" -msgstr " Primeiramente, você precisa instalar" +msgstr " Primeiramente, você precisa instalar %s, %s, %s e %s.\n" #: docs.php:51 msgid " To get python, download the latest version" @@ -369,39 +346,36 @@ msgid "(Gajim works with python-2.4.x)" msgstr "(o Gajim funciona com o python-2.4.x)" -#: docs.php:51 docs.php:54 +#: docs.php:51 +#: docs.php:54 msgid "and install it.\n" msgstr "e instale.\n" #: docs.php:54 -msgid "" -" To get GTK+, download the latest version of the \"Runtime Environment" -"\"" -msgstr "" -" Para obter o GTK+, baixe a última versão do \"Runtime " -"Environment\"" +msgid " To get GTK+, download the latest version of the \"Runtime Environment\"" +msgstr " Para obter o GTK+, baixe a última versão do \"Runtime Environment\"" #: docs.php:57 msgid " To get pygtk, download latest version " msgstr " Para obter o pygtk, baixe a última versão" -#: docs.php:57 docs.php:60 +#: docs.php:57 +#: docs.php:60 msgid " and install it.\n" msgstr " e instale.\n" #: docs.php:60 msgid " At last, to get pywin32, download latest version " -msgstr "" -" Por fim, para obter o pywin32, baixe a última versão " +msgstr " Por fim, para obter o pywin32, baixe a última versão " #: docs.php:64 msgid "download Gajim" msgstr "baixar o Gajim" #: docs.php:65 -#, fuzzy, c-format +#, c-format msgid " You can now %s and double click on gajim.py in src folder.\n" -msgstr "e dar um duplo-clique em gajim.py na pasta src.\n" +msgstr " Você pode agora %s e dar um duplo-clique no arquivo gajim.py na pasta src.\n" #: docs.php:72 msgid " Please read" @@ -416,10 +390,9 @@ msgstr " Você pode entender como o Gajim funciona" #: docs.php:81 -#, fuzzy, c-format -msgid "" -" Gajim uses the %s library to do the interface with Jabber network.\n" -msgstr "para fazer a interface com a rede Jabber.\n" +#, c-format +msgid " Gajim uses the %s library to do the interface with Jabber network.\n" +msgstr " O Gajim usa a biblioteca %s para fazer a interface com a rede Jabber.\n" #: downloads.php:8 msgid " Latest version of Gajim is" @@ -427,9 +400,7 @@ #: downloads.php:11 msgid "If your distribution doesn't have the latest version " -msgstr "" -"Se a sua distribuiç´ Linux não possuir a última " -"versão " +msgstr "Se a sua distribuiç´ Linux não possuir a última versão " #: downloads.php:12 msgid "or the " @@ -449,9 +420,7 @@ #: downloads.php:21 msgid " A daily package from svn is also built. To use it, remove gajim" -msgstr "" -" Todo dia, um pacote é compilado a partir do repositório " -"SVN. para usá-lo, remova o Gajim" +msgstr " Todo dia, um pacote é compilado a partir do repositório SVN. para usá-lo, remova o Gajim" #: downloads.php:21 msgid "add this line to your" @@ -462,24 +431,24 @@ msgstr "e instale digitando" #: downloads.php:26 -msgid "" -"You can get the GPG key of this package by installing gajim-dev-keyring " -"package from the same repository. Just do" -msgstr "" -"Você pode obter a chave GPG desse pacote instalando o pacote gajim-dev-" -"keyring a partir do mesmo repositório. Apenas digite" +msgid "You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do" +msgstr "Você pode obter a chave GPG desse pacote instalando o pacote gajim-dev-keyring a partir do mesmo repositório. Apenas digite" -#: downloads.php:34 downloads.php:121 +#: downloads.php:34 +#: downloads.php:121 msgid "Soon available here." msgstr "Em breve." #: downloads.php:43 msgid " If you use Ubuntu universe repository do" -msgstr "" -" Se você usa o repositório \"universe\" do Ubuntu, execute: " +msgstr " Se você usa o repositório \"universe\" do Ubuntu, execute: " -#: downloads.php:51 downloads.php:58 downloads.php:65 downloads.php:88 -#: downloads.php:96 downloads.php:104 +#: downloads.php:51 +#: downloads.php:58 +#: downloads.php:65 +#: downloads.php:88 +#: downloads.php:96 +#: downloads.php:104 msgid " Just" msgstr " Apenas digite" @@ -497,30 +466,27 @@ #: downloads.php:72 msgid " openSuSE 11: " -msgstr "" +msgstr " openSuSE 11: " #: downloads.php:72 msgid "one click install" -msgstr "" +msgstr "instalação em um clique" #: downloads.php:74 msgid " openSuSE 10.x: " -msgstr "" +msgstr " openSuSE 10.x: " #: downloads.php:74 msgid "get it here" -msgstr "" +msgstr "pegue-o aqui" #: downloads.php:78 msgid " PLD\n" msgstr " PLD\n" #: downloads.php:81 -#, fuzzy msgid " Gajim is in the ac-main tree. So just " -msgstr "" -" O Gajim está disponível para o FreeBSD através dos " -"ports. Apenas digite " +msgstr " O Gajim está está na árvore ac-main, então basta digitar " #: downloads.php:85 msgid " SourceMage\n" @@ -532,9 +498,7 @@ #: downloads.php:112 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " -msgstr "" -" O Gajim está disponível para o FreeBSD através dos " -"ports. Apenas digite " +msgstr " O Gajim está disponível para o FreeBSD através dos ports. Apenas digite " #: downloads.php:114 msgid "Find out more" @@ -549,14 +513,12 @@ msgstr " Instalador para Windows\n" #: downloads.php:134 -#, fuzzy msgid " There is a " -msgstr " Aqui estão algumas" +msgstr " Existe um" #: downloads.php:134 -#, fuzzy msgid "Gajim installer" -msgstr "Instalador para Windows" +msgstr "Instalador do Gajim" #: downloads.php:143 msgid " Source\n" @@ -575,13 +537,8 @@ msgstr "em inglês" #: downloads.php:148 -msgid "" -"If you want to use the last unstable development version, then you should " -"checkout the subversion repository.\n" -msgstr "" -"Se você quiser usar a última versão instável de " -"desenvolvimento, precisará checar o repositório do " -"subversion.\n" +msgid "If you want to use the last unstable development version, then you should checkout the subversion repository.\n" +msgstr "Se você quiser usar a última versão instável de desenvolvimento, precisará checar o repositório do subversion.\n" #: downloads.php:154 msgid " Subversion\n" @@ -589,9 +546,7 @@ #: downloads.php:157 msgid " The subversion server is available at this address: " -msgstr "" -" O servidor subversion está disponível no seguinte " -"endereço: " +msgstr " O servidor subversion está disponível no seguinte endereço: " #: downloads.php:157 msgid "and viewable" @@ -599,16 +554,11 @@ #: downloads.php:162 msgid " In order to download Gajim sources, here is what you have to do:\n" -msgstr "" -" Para baixar o código-fonte do Gajim, faça o seguinte:\n" +msgstr " Para baixar o código-fonte do Gajim, faça o seguinte:\n" #: downloads.php:163 -msgid "" -" You first have to install subversion (apt-get install subversion " -"under Debian)\n" -msgstr "" -" Primeiramente você previsa instalar o subversion (apt-get " -"install subversion no Debian)\n" +msgid " You first have to install subversion (apt-get install subversion under Debian)\n" +msgstr " Primeiramente você previsa instalar o subversion (apt-get install subversion no Debian)\n" #: downloads.php:165 msgid " Then in a console, enter the following commands:\n" @@ -616,8 +566,7 @@ #: downloads.php:173 msgid " Install dependencies, and build Gajim. Please see the" -msgstr "" -" Instale as dependências e compile o Gajim. Por favor leia o arquivo " +msgstr " Instale as dependências e compile o Gajim. Por favor leia o arquivo " #: downloads.php:173 msgid "English" @@ -636,36 +585,20 @@ msgstr "e então" #: downloads.php:184 -msgid "" -" Once you have the repository, you can update it periodicaly so it matches " -"the latest version from the server with the following command:\n" -msgstr "" -" Uma vez que você tenha o repositório, poderá " -"atualizá-lo periodicamente, sincronizando a sua versão com a " -"versão do servidor com o seguinte comando:\n" +msgid " Once you have the repository, you can update it periodicaly so it matches the latest version from the server with the following command:\n" +msgstr " Uma vez que você tenha o repositório, poderá atualizá-lo periodicamente, sincronizando a sua versão com a versão do servidor com o seguinte comando:\n" #: downloads.php:193 msgid " Under Windows\n" msgstr " No Windows\n" #: downloads.php:195 -msgid "" -" You first have to install subversion for windows. In order to do that, " -"download the binary" -msgstr "" -" Primeiramente, você precisa instalar o Subversion para Windows. " -"Para isso, baixe o binário executável" +msgid " You first have to install subversion for windows. In order to do that, download the binary" +msgstr " Primeiramente, você precisa instalar o Subversion para Windows. Para isso, baixe o binário executável" #: downloads.php:197 -msgid "" -" Once subversion is installed, the commands are the same with those under " -"GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " -"them in an MS-DOS command line and you're done." -msgstr "" -" Uma vez que o Subversion esteja instalado, os comandos são os " -"mesmo da versão para GNU/Linux. A única diferença " -"é que você deverá rodar o launch.bat ao invés de " -"launch.sh. Entre com os comandos no prompt do MS-DOS e estará feito." +msgid " Once subversion is installed, the commands are the same with those under GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter them in an MS-DOS command line and you're done." +msgstr " Uma vez que o Subversion esteja instalado, os comandos são os mesmo da versão para GNU/Linux. A única diferença é que você deverá rodar o launch.bat ao invés de launch.sh. Entre com os comandos no prompt do MS-DOS e estará feito." #: downloads.php:199 msgid " You can also use a graphical program like" @@ -676,28 +609,20 @@ msgstr "para obter a última versão do Subversion.\n" #: downloads.php:201 -msgid "" -" To run Gajim, you need external libraries. You can find a tutorial on the " -"way to install them" -msgstr "" +msgid " To run Gajim, you need external libraries. You can find a tutorial on the way to install them" +msgstr " Para rodar o Gajim, você precisa de bibliotecas externas. Você pode encontrar um tutorial sobre como instala-las" #: downloads.php:201 msgid "On the Wiki" -msgstr "" +msgstr "No Wiki" #: downloads.php:206 msgid " Daily Snapshots\n" msgstr " Snapshots diários\n" #: downloads.php:209 -msgid "" -" Everyday on 01:00 (GMT+1 time) gz tarballs are produced from svn. You " -"can use them if svn is broken for you at the moment." -msgstr "" -"Todos os dias, à 01:00 (fuso horário GMT+1), os pacotes de " -"código-fonte gz são gerados a partir do svn. Você pode " -"usá-los se o svn não estiver funcionando pra você no " -"momento." +msgid " Everyday on 01:00 (GMT+1 time) gz tarballs are produced from svn. You can use them if svn is broken for you at the moment." +msgstr "Todos os dias, à 01:00 (fuso horário GMT+1), os pacotes de código-fonte gz são gerados a partir do svn. Você pode usá-los se o svn não estiver funcionando pra você no momento." #: downloads.php:209 msgid "Here to get them" @@ -716,41 +641,28 @@ msgstr "Olá! Seja bem-vindo ao website do projeto Gajim" #: index.php:14 -msgid "" -"The goal of Gajim is to provide a full featured and easy to use Jabber " -"client. Gajim works nicely with GNOME, but does not require it to run. It is " -"released under the GNU General Public License. If you find bugs or have " -"ideas how Gajim can be better please send tickets" -msgstr "" -"O objetivo do Gajim é fornecer um cliente Jabber completo e fá" -"cil de usar. O Gajim funciona muito bem com o GNOME, mas não precisa " -"dele para rodar. Ele é lançado sob a GNU General Public " -"License (GPL). Se você encontrar falhas ou tiver idéias de como " -"o Gajim pode ficar melhor, por favor, envie um tíquete" +msgid "The goal of Gajim is to provide a full featured and easy to use Jabber client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better please send tickets" +msgstr "O objetivo do Gajim é fornecer um cliente Jabber completo e fácil de usar. O Gajim funciona muito bem com o GNOME, mas não precisa dele para rodar. Ele é lançado sob a GNU General Public License (GPL). Se você encontrar falhas ou tiver idéias de como o Gajim pode ficar melhor, por favor, envie um tíquete" #: index.php:22 msgid "FEATURES:" msgstr "RECURSOS:" #: index.php:24 -#, fuzzy msgid "Tabbed chat window and single window modes" -msgstr "Janela de conversa com abas" +msgstr "Janelas de conversa individuais ou em abas" #: index.php:25 -msgid "" -"Group chat support (with MUC protocol), invitation, chat to groupchat " -"transformation, minimize groupchat to roster" -msgstr "" +msgid "Group chat support (with MUC protocol), invitation, chat to groupchat transformation, minimize groupchat to roster" +msgstr "Suporte a conversação em grupo (com o protocolo MUC), convite, transformação de conversação simples em conversação em grupo, recolher conversação em grupo para a lista" #: index.php:26 msgid "Emoticons, Avatars, PEP (user activity, mood and tune)" -msgstr "" +msgstr "Emoticons, Avatares, PEP (atividade de usuário, humor e sintonia)" #: index.php:27 -#, fuzzy msgid "File transfer, Room Bookmarks" -msgstr "Emoticons, Avatares, Transferência de arquivos, Salas Favoritas" +msgstr "Transferência de arquivos, Salas Favoritas" #: index.php:28 msgid "Metacontacts Support" @@ -758,29 +670,23 @@ #: index.php:29 msgid "Trayicon, Speller, extented chat history functionalities" -msgstr "" -"Ícone da bandeja, Corretor Ortográfico, funções " -"avançadas de histórico de conversas" +msgstr "Ícone da bandeja, Corretor Ortográfico, funções avançadas de histórico de conversas" #: index.php:30 -#, fuzzy msgid "TLS, GPG and End-To-End encryption support (with SSL legacy support)" -msgstr "Suporte a TLS e GPG (com suporte a SSL legado)" +msgstr "Suporte a TLS, GPG e criptografia end-to-end (com suporte a SSL legado)" #: index.php:31 msgid "Transport Registration support" msgstr "Suporte a Registro de Transporte" #: index.php:32 -#, fuzzy msgid "Service Discovery including Nodes, user search" -msgstr "Serviço de procura, incluindo Nós" +msgstr "Serviço de procura, incluindo Nós e usuários" #: index.php:33 msgid "Wikipedia, dictionary and search engine lookup" -msgstr "" -"Sistema de procura em mecanismos de busca, dicionários e Wikipé" -"dia" +msgstr "Sistema de procura em mecanismos de busca, dicionários e Wikipédia" #: index.php:34 msgid "Multiple accounts support" @@ -800,196 +706,184 @@ #: index.php:37 msgid "link local (bonjour / zeroconf)" -msgstr "" +msgstr "link local (bonjour / zeroconf)" #: index.php:38 -#, fuzzy -msgid "" -"Gajim is available in 24 languages: Basque, Belarusian, Brasilian, British, " -"Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, " -"Esperanto, French, Galician, German, Italian, Lithuanian, Norwegian " -"(Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian" -msgstr "" -"O Gajim est´ diponível em 26 idiomas: alemão, basco, " -"bielorusso, bretão, búlgaro, chinês (simplificado), " -"croata, eslovaco, espanhol, esperanto, francês, galego, grego, " -"holandês, inglês, inglês britânico, italiano, " -"lituânio, norueguês, polonês, português brasileiro, " -"português lusitano, russo, sérvio, sueco e tcheco" +msgid "Gajim is available in 24 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Italian, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian" +msgstr "O Gajim est´ diponível em 24 idiomas: alemão, basco, bielorusso, búlgaro, chinês (simplificado), croata, eslovaco, espanhol, esperanto, francês, galego, inglês, inglês britânico, italiano, lituânio, norueguês, polonês, português brasileiro, português lusitano, russo, sérvio, sueco, tcheco e ucraniano" #: index.php:48 msgid "NEWS" msgstr "NOTÍCIAS" -#: index.php:51 index.php:52 -#, fuzzy, c-format +#: index.php:51 +#: index.php:52 +#, c-format msgid "Gajim %s is here!" -msgstr "O Gajim 0.11 está aqui!" +msgstr "O Gajim %s está aqui!" #: index.php:53 -#, fuzzy, c-format +#, c-format msgid "Beta-release of Gajim %s" -msgstr "Pr´-lançamento do Gajim 0.11.2" +msgstr "Beta do Gajim %s" #: index.php:54 -#, fuzzy, c-format +#, c-format msgid "Alpha-release of Gajim %s" -msgstr "Pr´-lançamento do Gajim 0.11.2" +msgstr "Alpha do Gajim %s" #: index.php:57 -#, fuzzy msgid "21 December 2008" -msgstr "19 de Dezembro de 2006" +msgstr "21 de Dezembro de 2008" #: index.php:58 -#, fuzzy msgid "17 December 2008" -msgstr "19 de Dezembro de 2006" +msgstr "17 de Dezembro de 2008" #: index.php:59 -#, fuzzy msgid "12 November 2008" -msgstr "19 de Dezembro de 2006" +msgstr "12 de Novembro de 2008" #: index.php:60 msgid "12 August 2008" -msgstr "" +msgstr "12 de Agosto de 2008" -#: index.php:63 index.php:64 -#, fuzzy, c-format +#: index.php:63 +#: index.php:64 +#, c-format msgid "Version %s of Gajim has been released." -msgstr "A versão 0.11 do Gajim é lançada." +msgstr "A versão %s do Gajim é lançada." #: index.php:65 -#, fuzzy, c-format +#, c-format msgid "Version %s will arrive very soon." -msgstr "A versã 0.11.1 chegará em breve." +msgstr "A versã %s chegará muito em breve." #: index.php:66 -#, fuzzy, c-format +#, c-format msgid "Version %s will arrive soon." -msgstr "A versã 0.11.1 chegará em breve." +msgstr "A versã %s chegará em breve." -#: index.php:70 index.php:71 index.php:72 index.php:73 -#, fuzzy, c-format +#: index.php:70 +#: index.php:71 +#: index.php:72 +#: index.php:73 +#, c-format msgid "What's new since %s:" -msgstr "O que há de novo desde a versão " +msgstr "O que há de novo desde a versão %s:" #: index.php:77 msgid "Fix filetransfer" -msgstr "" +msgstr "Corrigida transferência de arquivos" #: index.php:78 -#, fuzzy msgid "Updated german translation" -msgstr "Nova tradução: sérvio" +msgstr "Atualizada tradução para o alemão" #: index.php:79 msgid "Fix click on notifications when text string is empty" -msgstr "" +msgstr "Corrigido clique em notificações contendo a string de texto vazia" #: index.php:80 msgid "Improve systray popup menu" -msgstr "" +msgstr "Melhorado menu popup da bandeja do sistema" #: index.php:84 msgid "Fix text rendering in notifications" -msgstr "" +msgstr "Corrigida renderização de texto nas notificações" #: index.php:85 -#, fuzzy msgid "Fix forward unread messages under Windows" -msgstr "Corrigidos os idiomas ociosos e nã-ASCII no Windows" +msgstr "Corrigido encaminhamento de mensagens não lidas no Windows" #: index.php:86 msgid "Better sessions support" -msgstr "" +msgstr "Melhor suporte a sessões" #: index.php:87 msgid "Better auto-away support" -msgstr "" +msgstr "Melhor suporte a ausência automática" #: index.php:88 msgid "Fix banshee support" -msgstr "" +msgstr "Corrigido suporte ao Banshee" #: index.php:89 -#, fuzzy msgid "Quodlibet support" -msgstr "Suporte a múltiplas contas" +msgstr "Suporte a quodlibet" #: index.php:90 msgid "Fix GSSAPI authentification" -msgstr "" +msgstr "Corrigida autenticação GSSAPI" #: index.php:91 -msgid "" -"Those translations have been temporarily removed because they are outdated: " -"Breton (br), Greek (el), Dutch (nl), Portugese (pt)." -msgstr "" +msgid "Those translations have been temporarily removed because they are outdated: Breton (br), Greek (el), Dutch (nl), Portugese (pt)." +msgstr "Aquelas traduções foram temporariamente removidas em função de estarem desatualizadas: bretão (br), grego (el), holandês (nl), português (pt)." -#: index.php:92 index.php:102 index.php:115 +#: index.php:92 +#: index.php:102 +#: index.php:115 msgid "Full ChangeLog" msgstr "Registro Completo das Alteraãões" -#: index.php:93 index.php:103 index.php:116 +#: index.php:93 +#: index.php:103 +#: index.php:116 msgid "Bugs/Annoyances closed" msgstr "Problemas resolvidos" #: index.php:97 msgid "Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism" -msgstr "" +msgstr "Melhorias de segurança: mecanismo Kerberos (GSSAPI) SASL Authentication" #: index.php:98 msgid "Improve GUI of some windows" -msgstr "" +msgstr "Melhorada interface de algumas janelas" #: index.php:99 msgid "Fix handling of invalid XML" -msgstr "" +msgstr "Corrigido tratamento de XML inválido" #: index.php:100 msgid "Fix freeze on connection" -msgstr "" +msgstr "Corrigido congelamento na conexão" #: index.php:101 -#, fuzzy msgid "Improved windows installer" -msgstr "Instalador para Windows" +msgstr "Instalador para Windows melhorado" -#: index.php:104 index.php:117 -#, fuzzy +#: index.php:104 +#: index.php:117 msgid "Known Bugs/Annoyances" -msgstr "Problemas resolvidos" +msgstr "Bugs conhecidos/Incômodos" #: index.php:108 -msgid "" -"Security improvements: End-to-End encryption, SSL certificat verification" -msgstr "" +msgid "Security improvements: End-to-End encryption, SSL certificat verification" +msgstr "Melhoramentos de segurança: criptografia end-to-end, verificação de certificado SSL" #: index.php:109 msgid "Ability to minimize groupchats in roster" -msgstr "" +msgstr "Habilidade de minimizar conversação de grupos na lista" #: index.php:110 msgid "Chat to groupchat transformation" -msgstr "" +msgstr "Transformação de conversação simples em conversação de grupo" #: index.php:111 msgid "Block/Unblock contacts directly from roster" -msgstr "" +msgstr "Bloquear/Desbloquear contatos diretamente da lista" #: index.php:112 msgid "Single window mode" -msgstr "" +msgstr "Modo de janela simples" #: index.php:113 msgid "PEP support (User activity, mood and tune)" -msgstr "" +msgstr "Suporte a PEP (atividade do usuário, humor e sintonia)" #: index.php:114 msgid "Much faster contact list" -msgstr "" +msgstr "Lista de contatos muito mais rápida" #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" @@ -998,25 +892,18 @@ #, fuzzy #~ msgid " A %s version is in test" #~ msgstr " A última versão do Gajim é a" - #~ msgid "and" #~ msgstr "e" - #~ msgid "gajim rpm" #~ msgstr "gajim," - #~ msgid "pydns rpm" #~ msgstr "pydns" - #~ msgid "python-sqlite2 rpm" #~ msgstr "python-sqlite" - #~ msgid " There is a Gajim installer " #~ msgstr " Há um instalador do Gajim " - #~ msgid "with GTK+ included" #~ msgstr "com GTK+ incluso" - #~ msgid "without GTK+" #~ msgstr "sem o GTK+" @@ -1024,13 +911,10 @@ #~ msgid " The tarball version of 0.12 beta-release is " #~ msgstr "" #~ " O pacote de código-fonte do pré-release 0.11.2 está" - #~ msgid " To run Gajim, you need" #~ msgstr " Para rodar o Gajim, você precisa" - #~ msgid "(Version 2.4 or higher, 2.5 is recommended)," #~ msgstr "(Versão 2.4 ou superior, 2.5 recomendada)," - #~ msgid "" #~ "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " #~ "gimp-win.sf.net will NOT work (libglade is missing)," @@ -1038,16 +922,12 @@ #~ "(Versão 2.6.x ou superior, 2.10.x recomendada) NOTA: O GTK+ " #~ "Runtime do gimp-win.sf.net NÃO VAI funcionar (está faltando " #~ "a libglade)," - #~ msgid "GTK Runtime Environment" #~ msgstr "GTK Runtime Environment" - #~ msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" #~ msgstr "PyGTK para Windows (PyGTK com pycairo e pygobject)" - #~ msgid "and at last" #~ msgstr "e, por último," - #~ msgid "by Mark Hammond." #~ msgstr "por Mark Hammond" @@ -1066,19 +946,14 @@ #, fuzzy #~ msgid "17 November 2007" #~ msgstr "19 de Dezembro de 2006" - #~ msgid "22 September 2007" #~ msgstr "22 de Setembro de 2007" - #~ msgid "09 September 2007" #~ msgstr "09 de Setembro de 2007" - #~ msgid "18 February 2007" #~ msgstr "18 de Fevereiro de 2007" - #~ msgid "07 February 2007" #~ msgstr "07 de Fevereiro de 2007" - #~ msgid "19 December 2006" #~ msgstr "19 de Dezembro de 2006" @@ -1089,88 +964,64 @@ #, fuzzy #~ msgid "What's new in it:" #~ msgstr "O que há de novo desde a versão " - #~ msgid "This is a bug-fix only release." #~ msgstr "Este lançamento só traz correç&otilde de bugs." - #~ msgid "This is a bug-fix only release. Nothing new" #~ msgstr "" #~ "Este lançamento só traz correç&otilde de bugs, nada " #~ "novo" - #~ msgid "Fix International Domain Name usage" #~ msgstr "" #~ "Corrigido uso de nome de dom&iaacute;nio internacional (Internacional " #~ "Domain Name)" - #~ msgid "Fixed avatars cache problems in group chats" #~ msgstr "" #~ "Corrigido problema com cache do avatar em salas de conferência" - #~ msgid "Support of XEP-0202 (Entity Time)" #~ msgstr "Suporte a XEP-0202 (horário de entidade)" - #~ msgid "Support of XEP-0199 (XMPP Ping)" #~ msgstr "Suporte a XEP-0199 (ping XMPP)" - #~ msgid "New translation: Serbian" #~ msgstr "Nova tradução: sérvio" - #~ msgid "Fix pubsub usage" #~ msgstr "Corrigido uso de \"pubsub\"" - #~ msgid "Support for link-local messaging via Zeroconf using Avahi" #~ msgstr "" #~ "Suporte para troca de mensagens link-local via Zeroconf usando o Avahi" - #~ msgid "Support for Network Manager" #~ msgstr "Suporte ao Network Manager" - #~ msgid "IPv6 support to connect to server" #~ msgstr "Suporte a IPv6 para conectar ao servidor" - #~ msgid "XHTML Support" #~ msgstr "Suporte a XHTML" - #~ msgid "Privacy Lists support" #~ msgstr "Suporte a Listas de Privacidade" - #~ msgid "Ad-Hoc commands" #~ msgstr "Comandos Ad-Hoc" - #~ msgid "GNOME Keyring support" #~ msgstr "Suporte ao Gnome Keyring" - #~ msgid " You need: " #~ msgstr " Você precisa dos seguinte pacotes RPM: " - #~ msgid "page.\n" #~ msgstr "pÃ¡gina.\n" - #~ msgid " You can now" #~ msgstr " Você pode agora" - #~ msgid " Gajim uses the" #~ msgstr " O Gajim usa a biblioteca" - #~ msgid " Use files available " #~ msgstr " Use os arquivos disponíveis " - #~ msgid " You can download the autopackage " #~ msgstr " Você pode baixar o autopackage " - #~ msgid "To use it: make it executable, run it and follow the instructions.\n" #~ msgstr "" #~ "Para usá-lo: transforme-no em executável, execute e siga as " #~ "instruções.\n" - #~ msgid "" #~ " If you got the installer without GTK, you will have to download the " #~ "latest version of the GTK+ Runtime Environment" #~ msgstr "" #~ " Se você pegou o instalador sem o GTK, será necessá" #~ "rio baixar a última versão do GTK+ Runtime Environment" - #~ msgid "" #~ "You can skip this, if you already have a GTK+ Runtime installed with " #~ "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work " @@ -1179,51 +1030,37 @@ #~ "Você pode ignorar isso caso já possua o GTK+ Runtime " #~ "Environment instalado com suporte a libglade; o GTK+ Runtime do gimp-win." #~ "sf.net NÃO funcionarÃ¡ (falta a libglade)" - #~ msgid "Group chat support (with MUC protocol)" #~ msgstr "Suporte a converência (com o protocolo MUC)" - #~ msgid " You can see how Gajim is structured" #~ msgstr " Você pode ver como o Gajim é estruturado" - #~ msgid "" #~ " You can install Gajim provided you have Fedora Extras repository by" #~ msgstr "" #~ " Você pode instalar o Gajim fornecido pelo repositório " #~ "Fedora Extras digitando" - #~ msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" #~ msgstr "" #~ "(Versão 2.10.x ou superior, PyGTK versão < 2.10 está " #~ "disponível" - #~ msgid "Gajim 0.11.1 is here!" #~ msgstr "O Gajim 0.11.1 est´ aqui!" - #~ msgid "Pre-release of Gajim 0.11.1" #~ msgstr "Pr´-lançamento do Gajim 0.11.1" - #~ msgid "Gajim 0.11 is here!" #~ msgstr "O Gajim 0.11 está aqui!" - #~ msgid "Version 0.11.3 of Gajim has been released." #~ msgstr "A versão 0.11.3 do Gajim foi lançada" - #~ msgid "Version 0.11.2 of Gajim has been released." #~ msgstr "A versão 0.11.2 do Gajim foi lançada" - #~ msgid "Version 0.11.1 of Gajim has been released." #~ msgstr "A versão 0.11.1 do Gajim é lançada" - #~ msgid "Version 0.11.1 will arrive soon." #~ msgstr "A versão 0.11.1 chegará em breve." - #~ msgid "Gajim 0.11.3 is here!" #~ msgstr "O Gajim 0.11.3 est´ aqui!" - #~ msgid "Gajim 0.11.2 is here!" #~ msgstr "O Gajim 0.11.2 est´ aqui!" - #~ msgid "" #~ " Gajim is at the moment in the ac-ready tree (it is turned off by " #~ "default, so you may need to check your poldek configuration) and can be " @@ -1233,8 +1070,8 @@ #~ "(está inativa por padrão, então você precisa " #~ "checar a configuração do poldek) e pode ser instalado " #~ "executando: " - #~ msgid " There is a Gajim installer for 0.11.2 pre-release " #~ msgstr "" #~ " Há um instalador para o pré-lançamento do Gajim " #~ "0.11.2" +

1 0

[commit-gajim] r11155 - trunk/src/common
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 18:00:28 +0100 (Wed, 11 Mar 2009) New Revision: 11155 Added: trunk/src/common/logging_helpers.py Log: add missing file. Fixes #4898, #4874 Added: trunk/src/common/logging_helpers.py =================================================================== --- trunk/src/common/logging_helpers.py (rev 0) +++ trunk/src/common/logging_helpers.py 2009-03-11 17:00:28 UTC (rev 11155) @@ -0,0 +1,184 @@ +# -*- coding:utf-8 -*- +## src/common/logging_helpers.py +## +## Copyright (C) 2009 Bruno Tarquini <btarquini AT gmail.com> +## +## This file is part of Gajim. +## +## Gajim is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 3 only. +## +## Gajim is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +## + +import logging +import i18n + +def parseLogLevel(arg): + """ + eiter numeric value or level name from logging module + """ + if arg.isdigit(): + return int(arg) + elif arg.isupper(): + return getattr(logging, arg) + else: + raise ValueError(_('%s is not a valid loglevel'), repr(arg)) + +def parseLogTarget(arg): + """ + [gajim.]c.x.y -> gajim.c.x.y + .other_logger -> other_logger + <None> -> gajim + """ + arg = arg.lower() + if not arg: + return 'gajim' + elif arg.startswith('.'): + return arg[1:] + elif arg.startswith('gajim'): + return arg + else: + return 'gajim.' + arg + +def parseAndSetLogLevels(arg): + """ + [=]LOGLEVEL -> gajim=LOGLEVEL + gajim=LOGLEVEL -> gajim=LOGLEVEL + .other=10 -> other=10 + .=10 -> <nothing> + c.x.y=c.z=20 -> gajim.c.x.y=20 + gajim.c.z=20 + gajim=10,c.x=20 -> gajim=10 + gajim.c.x=20 + """ + for directive in arg.split(','): + directive = directive.strip() + if not directive: + continue + if '=' not in directive: + directive = '=' + directive + targets, level = directive.rsplit('=', 1) + level = parseLogLevel(level.strip()) + for target in targets.split('='): + target = parseLogTarget(target.strip()) + if target: + logging.getLogger(target).setLevel(level) + print "Logger %s level set to %d" % (target, level) + + +class colors: + NONE = chr(27) + "[0m" + BLACk = chr(27) + "[30m" + RED = chr(27) + "[31m" + GREEN = chr(27) + "[32m" + BROWN = chr(27) + "[33m" + BLUE = chr(27) + "[34m" + MAGENTA = chr(27) + "[35m" + CYAN = chr(27) + "[36m" + LIGHT_GRAY = chr(27) + "[37m" + DARK_GRAY = chr(27) + "[30;1m" + BRIGHT_RED = chr(27) + "[31;1m" + BRIGHT_GREEN = chr(27) + "[32;1m" + YELLOW = chr(27) + "[33;1m" + BRIGHT_BLUE = chr(27) + "[34;1m" + PURPLE = chr(27) + "[35;1m" + BRIGHT_CYAN = chr(27) + "[36;1m" + WHITE = chr(27) + "[37;1m" + +def colorize(text, color): + return color + text + colors.NONE + +class FancyFormatter(logging.Formatter): + """ + A Eye-candy formatter with colors + """ + colors_mapping = { + 'DEBUG': colors.BLUE, + 'INFO' : colors.GREEN, + 'WARNING': colors.BROWN, + 'ERROR': colors.RED, + 'CRITICAL': colors.BRIGHT_RED, + } + + def __init__(self, fmt, datefmt=None, use_color=False): + logging.Formatter.__init__(self, fmt, datefmt) + self.use_color = use_color + + def formatTime(self, record, datefmt=None): + f = logging.Formatter.formatTime(self, record, datefmt) + if self.use_color: + f = colorize(f, colors.DARK_GRAY) + return f + + def format(self, record): + level = record.levelname + record.levelname = '(%s)' % level[0] + + if self.use_color: + c = FancyFormatter.colors_mapping.get(level, '') + record.levelname = colorize(record.levelname, c) + record.name = colorize(record.name, colors.CYAN) + else: + record.name += ':' + + return logging.Formatter.format(self, record) + + +def init(use_color=False): + """ + initialize the logging system + """ + consoleloghandler = logging.StreamHandler() + consoleloghandler.setFormatter( + FancyFormatter( + '%(asctime)s %(levelname)s %(name)s %(message)s', + '%H:%M:%S', + use_color + ) + ) + + # fake the root logger so we have 'gajim' root name instead of 'root' + root_log = logging.getLogger('gajim') + root_log.setLevel(logging.WARNING) + root_log.addHandler(consoleloghandler) + root_log.propagate = False + +def set_loglevels(loglevels_string): + parseAndSetLogLevels(loglevels_string) + +def set_verbose(): + parseAndSetLogLevels('gajim=1') + +def set_quiet(): + parseAndSetLogLevels('gajim=CRITICAL') + + +# tests +if __name__ == '__main__': + init(use_color=True) + + set_loglevels('gajim.c=DEBUG,INFO') + + log = logging.getLogger('gajim') + log.debug('debug') + log.info('info') + log.warn('warn') + log.error('error') + log.critical('critical') + + log = logging.getLogger('gajim.c.x.dispatcher') + log.debug('debug') + log.info('info') + log.warn('warn') + log.error('error') + log.critical('critical') + +# vim: se ts=3:

1 0

[commit-gajim] r11154 - trunk/src
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 10:58:25 +0100 (Wed, 11 Mar 2009) New Revision: 11154 Modified: trunk/src/config.py Log: typo Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-03-11 09:57:24 UTC (rev 11153) +++ trunk/src/config.py 2009-03-11 09:58:25 UTC (rev 11154) @@ -524,7 +524,7 @@ def get_per_account_option(self, opt): '''Return the value of the option opt if it's the same in all accounts else returns "mixed"''' - if len(gajim.connections) = 0: + if len(gajim.connections) == 0: # a non existant key return default value return gajim.config.get_per('accounts', '__default__', opt) val = None

1 0

[commit-gajim] r11153 - trunk/src/common
by asterix＠gajim.org 11 Mar '09

11 Mar '09

Author: asterix Date: 2009-03-11 10:57:24 +0100 (Wed, 11 Mar 2009) New Revision: 11153 Modified: trunk/src/common/GnuPG.py Log: decode error message returnd by GPG. Fixes #4893 Modified: trunk/src/common/GnuPG.py =================================================================== --- trunk/src/common/GnuPG.py 2009-03-11 09:47:16 UTC (rev 11152) +++ trunk/src/common/GnuPG.py 2009-03-11 09:57:24 UTC (rev 11153) @@ -111,7 +111,7 @@ # Encryption succeeded, even if there is output on stderr. Maybe # verbose is on error = '' - return self._stripHeaderFooter(output), error + return self._stripHeaderFooter(output), helpers.decode_string(error) def decrypt(self, str_, keyID): proc = self.run(['--decrypt', '-q', '-u %s'%keyID], create_fhs=['stdin', 'stdout'])

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2009