Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: fix adding transport contacts
by Gajim 30 Nov '13

30 Nov '13

changeset a49c6adac288 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a49c6adac288 description: fix adding transport contacts diffstat: src/dialogs.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 155fdc9f6544 -r a49c6adac288 src/dialogs.py --- a/src/dialogs.py Sat Nov 30 10:33:04 2013 +0100 +++ b/src/dialogs.py Sat Nov 30 15:25:21 2013 +0100 @@ -1060,10 +1060,10 @@ model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] - if type_ != 'jabber' and not self.jid_escaped: + if type_ != 'jabber': transport = self.protocol_jid_combobox.get_active_text().decode( 'utf-8') - if self.account: + if self.account and not self.jid_escaped: self.adding_jid = (jid, transport, type_) gajim.connections[self.account].request_gateway_prompt( transport, jid) @@ -5182,7 +5182,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, control): + def __init__(self, control, transient_for=None): xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') security_image = xml.get_object('security_image') status_label = xml.get_object('verification_status_label')

1 0

python-nbxmpp: prevent traceback
by Yann Leboulanger 30 Nov '13

30 Nov '13

changeset e88ec6cb0884 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=e88ec6cb0884 description: prevent traceback diffstat: nbxmpp/smacks.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 42b312ce951f -r e88ec6cb0884 nbxmpp/smacks.py --- a/nbxmpp/smacks.py Sat Nov 30 09:58:35 2013 +0100 +++ b/nbxmpp/smacks.py Sat Nov 30 11:29:05 2013 +0100 @@ -95,7 +95,11 @@ number of stanzas received by the server. Pops stanzas that were handled by the server from the queue. ''' - h = int(stanza.getAttr('h')) + h = stanza.getAttr('h') + if not h: + log.error('Server did not send h attribute') + return + h = int(h) diff = self.out_h - h if len(self.uqueue) < diff or diff < 0:

1 0

gajim: [Dicson] Do not display dialog confirm_metacontacts when ...
by Gajim 30 Nov '13

30 Nov '13

changeset 155fdc9f6544 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=155fdc9f6544 description: [Dicson] Do not display dialog confirm_metacontacts when using Make CONTACT first contact. Fixes #7576 diffstat: src/roster_window.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diffs (40 lines): diff -r 4507ce0d9d3a -r 155fdc9f6544 src/roster_window.py --- a/src/roster_window.py Sat Nov 30 10:10:39 2013 +0100 +++ b/src/roster_window.py Sat Nov 30 10:33:04 2013 +0100 @@ -4555,8 +4555,12 @@ self.draw_account(account_source) context.finish(True, True, etime) + dest_family = gajim.contacts.get_metacontacts_family(account_dest, + c_dest.jid) + source_family = gajim.contacts.get_metacontacts_family(account_source, + c_source.jid) confirm_metacontacts = gajim.config.get('confirm_metacontacts') - if confirm_metacontacts == 'no': + if confirm_metacontacts == 'no' or dest_family == source_family: merge_contacts() return pritext = _('You are about to create a metacontact. Are you sure you ' @@ -4830,7 +4834,7 @@ return menu = gtk.Menu() item = gtk.MenuItem(_('Send %s to %s') % (c_source.get_shown_name(), - c_dest.get_shown_name())) + c_dest.get_shown_name()), use_underline=False) item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) menu.append(item) @@ -4841,10 +4845,11 @@ account_source, c_source.jid) if dest_family == source_family and dest_family: item = gtk.MenuItem(_('Make %s first contact') % ( - c_source.get_shown_name())) + c_source.get_shown_name()), use_underline=False) else: item = gtk.MenuItem(_('Make %s and %s metacontacts') % ( - c_source.get_shown_name(), c_dest.get_shown_name())) + c_source.get_shown_name(), c_dest.get_shown_name()), + use_underline=False) item.connect('activate', self.on_drop_in_contact, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime)

1 0

gajim: [fedor] fix gpg signature when hash algo is not SHA-1. Fi...
by Gajim 30 Nov '13

30 Nov '13

changeset 4507ce0d9d3a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4507ce0d9d3a description: [fedor] fix gpg signature when hash algo is not SHA-1. Fixes #7569 diffstat: src/common/gpg.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diffs (32 lines): diff -r 7202e4b54fbd -r 4507ce0d9d3a src/common/gpg.py --- a/src/common/gpg.py Sat Nov 30 10:04:50 2013 +0100 +++ b/src/common/gpg.py Sat Nov 30 10:10:39 2013 +0100 @@ -80,14 +80,21 @@ def verify(self, str_, sign): if str_ is None: return '' - data = '-----BEGIN PGP SIGNED MESSAGE-----' + os.linesep - data = data + 'Hash: SHA1' + os.linesep + os.linesep - data = data + str_ + os.linesep - data = data + self._addHeaderFooter(sign, 'SIGNATURE') - result = super(GnuPG, self).verify(data) + # Hash algorithm is not transfered in the signed presence stanza so try + # all algorithms. Text name for hash algorithms from RFC 4880 - section 9.4 + hash_algorithms = ['SHA512', 'SHA384', 'SHA256', 'SHA224', 'SHA1', 'RIPEMD160'] + for algo in hash_algorithms: + data = os.linesep.join( + ['-----BEGIN PGP SIGNED MESSAGE-----', + 'Hash: ' + algo, + '', + str_, + self._addHeaderFooter(sign, 'SIGNATURE')] + ) + result = super(GnuPG, self).verify(data) + if result.valid: + return result.key_id - if result.valid: - return result.key_id return '' def get_keys(self, secret=False):

1 0

gajim: improve XEP-184 mark colors. see #7476
by Gajim 30 Nov '13

30 Nov '13

changeset 7202e4b54fbd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7202e4b54fbd description: improve XEP-184 mark colors. see #7476 diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r ed832ba2cbdd -r 7202e4b54fbd src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 30 10:00:10 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 30 10:04:50 2013 +0100 @@ -306,10 +306,10 @@ self.displaymarking_tags = {} tag = buffer_.create_tag('xep0184-warning') - tag.set_property('foreground', 'red') + tag.set_property('foreground', '#cc0000') tag = buffer_.create_tag('xep0184-received') - tag.set_property('foreground', 'green') + tag.set_property('foreground', '#73d216') # One mark at the begining then 2 marks between each lines size = gajim.config.get('max_conversation_lines')

1 0

gajim: Make threads usable under windows so GPG works correctly....
by Gajim 30 Nov '13

30 Nov '13

changeset ed832ba2cbdd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ed832ba2cbdd description: Make threads usable under windows so GPG works correctly. Fixes #7565 diffstat: src/gajim.py | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diffs (20 lines): diff -r b2788bedd2a1 -r ed832ba2cbdd src/gajim.py --- a/src/gajim.py Sat Nov 30 09:48:18 2013 +0100 +++ b/src/gajim.py Sat Nov 30 10:00:10 2013 +0100 @@ -509,13 +509,9 @@ interface.run() try: - if os.name != 'nt': - # This makes Gajim unusable under windows, and threads are used only - # for GPG, so not under windows - gtk.gdk.threads_init() - gtk.gdk.threads_enter() + gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() - if os.name != 'nt': - gtk.gdk.threads_leave() + gtk.gdk.threads_leave() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt'

1 0

python-nbxmpp: [fedor] Disable SSL v3 protocol and use only TLS ...
by Yann Leboulanger 30 Nov '13

30 Nov '13

changeset 42b312ce951f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=42b312ce951f description: [fedor] Disable SSL v3 protocol and use only TLS 1.0, TLS 1.1, TLS 1.2. Fixes #9 diffstat: nbxmpp/tls_nb.py | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diffs (78 lines): diff -r a21475d3659f -r 42b312ce951f nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Nov 29 20:31:51 2013 +0100 +++ b/nbxmpp/tls_nb.py Sat Nov 30 09:58:35 2013 +0100 @@ -253,13 +253,13 @@ :param mycerts: path to pem file with certificates of user trusted servers :param cipher_list: list of ciphers to use when connection to server. If - None is provided, a default list is used: HIGH:!aNULL:!eNULL:RC4-SHA + None is provided, a default list is used: HIGH:!aNULL:RC4-SHA """ PlugIn.__init__(self) self.cacerts = cacerts self.mycerts = mycerts if cipher_list is None: - self.cipher_list = 'HIGH:!aNULL:!eNULL:RC4-SHA' + self.cipher_list = 'HIGH:!aNULL:RC4-SHA' else: self.cipher_list = cipher_list @@ -277,8 +277,11 @@ return res def _dumpX509(self, cert, stream=sys.stderr): + try: + print >> stream, "Digest (SHA-2 256):", cert.digest("sha256") + except ValueError: # Old OpenSSL version + pass print >> stream, "Digest (SHA-1):", cert.digest("sha1") - print >> stream, "Digest (MD5):", cert.digest("md5") print >> stream, "Serial #:", cert.get_serial_number() print >> stream, "Version:", cert.get_version() print >> stream, "Expired:", ("Yes" if cert.has_expired() else "No") @@ -349,17 +352,21 @@ def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner + # See http://docs.python.org/dev/library/ssl.html + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 | \ + OpenSSL.SSL.OP_SINGLE_DH_USE + try: + flags |= OpenSSL.SSL.OP_NO_TICKET + except AttributeError, e: + # py-OpenSSL < 0.9 or old OpenSSL + flags |= 16384 + tcpsock._sslContext.set_options(flags) + # NonBlockingHTTPBOSH instance has no attribute _owner if hasattr(tcpsock, '_owner') and tcpsock._owner._caller.client_cert \ and os.path.exists(tcpsock._owner._caller.client_cert): conn = tcpsock._owner._caller - # FIXME make a checkbox for Client Cert / SSLv23 / TLSv1 - # If we are going to use a client cert/key pair for authentication, - # we choose TLSv1* method. - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = (OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_SSLv3 - | OpenSSL.SSL.OP_SINGLE_DH_USE) - tcpsock._sslContext.set_options(flags) log.debug('Using client cert and key from %s' % conn.client_cert) try: p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read(), @@ -385,16 +392,6 @@ 'from file %s: %s' % (conn.client_cert, msg)) else: log.info('client cert and key loaded OK') - else: - # See http://docs.python.org/dev/library/ssl.html - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) - flags = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_SINGLE_DH_USE - try: - flags |= OpenSSL.SSL.OP_NO_TICKET - except AttributeError, e: - # py-OpenSSL < 0.9 or old OpenSSL - flags |= 16384 - tcpsock._sslContext.set_options(flags) tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER,

1 0

gajim: prevent traceback. Fixes #7572
by Gajim 30 Nov '13

30 Nov '13

changeset b2788bedd2a1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b2788bedd2a1 description: prevent traceback. Fixes #7572 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8fba80aa51ce -r b2788bedd2a1 src/gui_interface.py --- a/src/gui_interface.py Fri Nov 29 22:07:59 2013 +0400 +++ b/src/gui_interface.py Sat Nov 30 09:48:18 2013 +0100 @@ -1688,6 +1688,8 @@ event = gajim.events.get_first_event(account, fjid, type_) if not event: event = gajim.events.get_first_event(account, jid, type_) + if not event: + return if type_ == 'printed_pm': ctrl = event.parameters[2]

1 0

python-nbxmpp: [fedor] fix BOSH connection. Fixes #10
by Yann Leboulanger 29 Nov '13

29 Nov '13

changeset a21475d3659f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=a21475d3659f description: [fedor] fix BOSH connection. Fixes #10 diffstat: nbxmpp/bosh.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r a7f633ee2fc2 -r a21475d3659f nbxmpp/bosh.py --- a/nbxmpp/bosh.py Sun Nov 03 17:55:20 2013 +0100 +++ b/nbxmpp/bosh.py Fri Nov 29 20:31:51 2013 +0100 @@ -68,6 +68,7 @@ self.bosh_secure = 'true' else: self.bosh_secure = 'false' + self.cipher_list = cipher_list self.use_proxy_auth = bosh_dict['useauth'] self.proxy_creds = proxy_creds self.wait_cb_time = None @@ -450,6 +451,7 @@ on_disconnect=self.disconnect, idlequeue = self.idlequeue, estabilish_tls = self.estabilish_tls, + cipher_list = self.cipher_list, certs = self.certs, on_http_request_possible = self.on_http_request_possible, http_dict = http_dict,

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 29 Nov '13

29 Nov '13

changeset 8fba80aa51ce in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8fba80aa51ce description: [Darlan] Update Hebrew translation diffstat: po/he.po | 1016 +++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 508 вставок(+), 508 удалений(-) различия (урезанные с 2943 до 300 строк): diff -r f6a92d1d42e7 -r 8fba80aa51ce po/he.po --- a/po/he.po Thu Nov 28 21:24:17 2013 +0100 +++ b/po/he.po Fri Nov 29 22:07:59 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-10-22 13:06+0200\n" -"PO-Revision-Date: 2013-11-15 09:28+0200\n" +"POT-Creation-Date: 2013-11-19 03:05+0000\n" +"PO-Revision-Date: 2013-11-29 12:59+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -28,7 +28,8 @@ msgid "_Personal Events" msgstr "_אירועים אישיים" -#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." msgstr "התחלת _שיחה..." @@ -184,13 +185,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1268 ../src/config.py:1273 -#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1743 -#: ../src/config.py:1748 ../src/config.py:2342 ../src/config.py:2424 -#: ../src/config.py:2439 ../src/config.py:3720 ../src/config.py:3795 +#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748 +#: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 +#: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../src/dialogs.py:537 ../src/roster_window.py:3157 +#: ../src/roster_window.py:3163 ../src/roster_window.py:3168 msgid "None" msgstr "ללא" @@ -210,15 +211,14 @@ msgid "Delete" msgstr "מחק" -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5799 +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "_שנה שם" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "א_פשר" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4188 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "פעיל" #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" @@ -381,8 +381,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5849 +#: ../src/roster_window.py:3099 ../src/roster_window.py:4225 +#: ../src/roster_window.py:5860 msgid "General" msgstr "כללית" @@ -445,8 +445,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1841 -#: ../src/config.py:2440 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1846 +#: ../src/config.py:2446 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -523,7 +523,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1868 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1873 #: ../src/dialogs.py:842 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -778,8 +778,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5818 -#: ../src/roster_window.py:5945 ../src/roster_window.py:6082 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:619 +#: ../src/roster_window.py:5829 ../src/roster_window.py:5956 msgid "_Unblock" msgstr "_בטל חסימה" @@ -852,9 +852,8 @@ msgid "_Open Email Composer" msgstr "_פתח מלחין דוא״ל" -#: ../data/gui/chat_context_menu.ui.h:5 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/chat_context_menu.ui.h:5 #: ../data/gui/subscription_request_popup_menu.ui.h:1 -#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat" msgstr "התחל _שיחה" @@ -975,7 +974,7 @@ #. Send single message #: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4 -#: ../data/gui/systray_context_menu.ui.h:4 ../src/roster_window.py:5989 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:529 msgid "Send Single _Message..." msgstr "שליחת הודעה _בודדת..." @@ -983,11 +982,10 @@ msgid "Send _File..." msgstr "שליחת _קובץ..." -#. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749 -#: ../src/roster_window.py:5913 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5760 +#: ../src/roster_window.py:5924 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1004,13 +1002,14 @@ msgid "Toggle End to End Encryption" msgstr "הפעל הצפנת קצה אל קצה" -#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 -#: ../src/roster_window.py:6004 +#. Send Custom Status +#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:543 +#: ../src/roster_window.py:5770 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" #. Execute Command -#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:6040 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:579 msgid "E_xecute Command..." msgstr "הרצת _פקודה..." @@ -1018,11 +1017,14 @@ msgid "M_anage Contact" msgstr "_נהל איש קשר" -#: ../data/gui/contact_context_menu.ui.h:11 +#. Rename +#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:606 +#: ../src/roster_window.py:5810 msgid "_Rename..." msgstr "_שינוי שם..." -#: ../data/gui/contact_context_menu.ui.h:12 +#. Edit Groups +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5945 msgid "Edit _Groups..." msgstr "עריכת _קבוצות..." @@ -1055,8 +1057,8 @@ msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5826 -#: ../src/roster_window.py:5951 ../src/roster_window.py:6085 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:622 +#: ../src/roster_window.py:5837 ../src/roster_window.py:5962 msgid "_Block" msgstr "_חסום" @@ -1068,14 +1070,17 @@ msgid "_Ignore" msgstr "הת_עלם" -#: ../data/gui/contact_context_menu.ui.h:25 +#. Remove +#. Remove group +#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:632 +#: ../src/roster_window.py:5847 msgid "Remo_ve" msgstr "הס_ר" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6158 +#: ../src/roster_window.py:6038 msgid "_History" msgstr "_היסטוריה" @@ -1281,7 +1286,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1839 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1849 msgid "_Bookmark" msgstr "_סמן" @@ -1530,7 +1535,7 @@ msgid "_Bookmark this room" msgstr "_סמן את חדר זה" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1858 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1863 msgid "Server:" msgstr "שרת:" @@ -1538,8 +1543,8 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3387 -#: ../src/disco.py:1401 ../src/disco.py:1843 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3396 +#: ../src/disco.py:1411 ../src/disco.py:1853 msgid "_Join" msgstr "_כנס" @@ -2627,10 +2632,8 @@ msgid "What do you want to do?" msgstr "מה ברצונך לעשות?" -#. Remove group #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5836 -#: ../src/roster_window.py:5961 ../src/roster_window.py:6095 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5972 msgid "_Remove" msgstr "הס_ר" @@ -2664,7 +2667,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1554 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1564 msgid "_Edit" msgstr "ע_ריכה" @@ -2747,11 +2750,11 @@ msgstr "הוסף _איש קשר" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6107 +#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:644 msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1410 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1420 msgid "_Search" msgstr "_חפש" @@ -2914,6 +2917,11 @@ msgid "Jabber Traffic" msgstr "תעבורת Jabber" +#. XML Console enable checkbutton +#: ../data/gui/xml_console_window.ui.h:3 +msgid "_Enable" +msgstr "א_פשר" + #: ../data/gui/xml_console_window.ui.h:4 msgid "Hide IN stanzas" msgstr "הסתר סטנזות IN" @@ -3141,10 +3149,10 @@ #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 #: ../src/common/helpers.py:261 ../src/dialogs.py:1106 ../src/dialogs.py:2314 #: ../src/dialogs.py:2343 ../src/dialogs.py:3561 ../src/gui_interface.py:485 -#: ../src/gui_menu_builder.py:269 ../src/gui_menu_builder.py:424 -#: ../src/roster_window.py:771 ../src/roster_window.py:1732 -#: ../src/roster_window.py:1734 ../src/roster_window.py:2082 -#: ../src/roster_window.py:3618 ../src/roster_window.py:3645 +#: ../src/gui_menu_builder.py:279 ../src/gui_menu_builder.py:434 +#: ../src/roster_window.py:771 ../src/roster_window.py:1735 +#: ../src/roster_window.py:1737 ../src/roster_window.py:2085 +#: ../src/roster_window.py:3628 ../src/roster_window.py:3655 msgid "Not in Roster" msgstr "לא ברשימה" @@ -3299,27 +3307,27 @@ msgstr "ההודעה הבאה הוצפנה"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2013