Commits April 2014

commits@gajim.org

2 participants
33 discussions

gajim-plugins: OfflineBookmarksPlugin. Fix missed attr.
by Gajim Plugins 27 Apr '14

27 Apr '14

changeset 858f5aa3401f in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=858f5aa3401f description: OfflineBookmarksPlugin. Fix missed attr. diffstat: offline_bookmarks/manifest.ini | 2 +- offline_bookmarks/offline_bookmarks.py | 3 ++- 2 файлов изменено, 3 вставок(+), 2 удалений(-) различия (25 строк): diff -r e7c89d164d05 -r 858f5aa3401f offline_bookmarks/manifest.ini --- a/offline_bookmarks/manifest.ini Wed Apr 23 22:38:41 2014 +0200 +++ b/offline_bookmarks/manifest.ini Sun Apr 27 16:43:50 2014 +0400 @@ -1,7 +1,7 @@ [info] name: Offline Bookmarks short_name: offline_bookmarks -version: 0.2.1 +version: 0.2.2 description: Saving bookmarks inside the plugin configuration file. Allows the use of locally stored bookmarks if the server does not support the storage of bookmarks (eg talk.google.com).<br/> Support to import bookmarks from one account to another. authors = Denis Fomin <fominde(a)gmail.com> diff -r e7c89d164d05 -r 858f5aa3401f offline_bookmarks/offline_bookmarks.py --- a/offline_bookmarks/offline_bookmarks.py Wed Apr 23 22:38:41 2014 +0200 +++ b/offline_bookmarks/offline_bookmarks.py Sun Apr 27 16:43:50 2014 +0400 @@ -215,7 +215,8 @@ self.server_entry = self.xml.get_object('server_entry') self.server_entry.connect('changed', self.on_server_entry_changed) self.room_entry = self.xml.get_object('room_entry') - self.room_entry.connect('changed', self.on_room_entry_changed) + self.room_entry_changed_id = self.room_entry.connect('changed', + self.on_room_entry_changed) self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton')

1 0

gajim: fix sending candidates and computing hash in jingle file ...
by Gajim 25 Apr '14

25 Apr '14

changeset 87aff98e45e5 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=87aff98e45e5 description: fix sending candidates and computing hash in jingle file transfer. Fixes #7669 diffstat: src/common/jingle_ft.py | 5 +++-- src/common/jingle_transport.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (39 lines): diff -r ebdd75803280 -r 87aff98e45e5 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Apr 24 22:08:01 2014 +0200 +++ b/src/common/jingle_ft.py Fri Apr 25 12:48:39 2014 +0200 @@ -110,7 +110,7 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - + if jingle_xtls.PYOPENSSL_PRESENT: cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], jingle_xtls.SELF_SIGNED_CERTIFICATE) @@ -160,12 +160,13 @@ if self.file_props.algo == None: return try: - file_ = open(self.file_props.file_name, 'r') + file_ = open(self.file_props.file_name, 'rb') except: # can't open file return h = nbxmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) + file_.close() # DEBUG #hash_ = '1294809248109223' if not hash_: diff -r ebdd75803280 -r 87aff98e45e5 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Apr 24 22:08:01 2014 +0200 +++ b/src/common/jingle_transport.py Fri Apr 25 12:48:39 2014 +0200 @@ -69,7 +69,7 @@ candidates is None) """ if not candidates: - candidates = self._iter_candidates() + candidates = list(self._iter_candidates()) else: candidates = (self.make_candidate(candidate) for candidate in candidates) transport = nbxmpp.Node('transport', payload=candidates)

1 0

gajim: fix some encoding issues
by Gajim 24 Apr '14

24 Apr '14

changeset ebdd75803280 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=ebdd75803280 description: fix some encoding issues diffstat: src/common/stanza_session.py | 52 +++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diffs (177 lines): diff -r c00f54ba7271 -r ebdd75803280 src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/stanza_session.py Thu Apr 24 22:08:01 2014 +0200 @@ -410,21 +410,21 @@ c = stanza.NT.c c.setNamespace('http://www.xmpp.org/extensions/xep-0200.html#ns') - c.NT.data = base64.b64encode(m_final) + c.NT.data = base64.b64encode(m_final).decode('utf-8') # FIXME check for rekey request, handle <key/> elements - m_content = ''.join(map(str, c.getChildren())) + m_content = (''.join(map(str, c.getChildren()))).encode('utf-8') c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ - crypto.encode_mpi(old_en_counter))) + crypto.encode_mpi(old_en_counter))).decode('utf-8') msgtxt = '[This is part of an encrypted session. ' \ 'If you see this message, something went wrong.]' lang = os.getenv('LANG') if lang is not None and lang != 'en': # we're not english msgtxt = _('[This is part of an encrypted session. ' - 'If you see this message, something went wrong.]') + ' (' + \ - msgtxt + ')' + 'If you see this message, something went wrong.]') + ' (' + \ + msgtxt + ')' stanza.setBody(msgtxt) return stanza @@ -473,6 +473,7 @@ # contents of <c>, minus <mac>, minus whitespace macable = ''.join(str(x) for x in c.getChildren() if x.getName() != 'mac') + macable = macable.encode('utf-8') received_mac = base64.b64decode(c.getTagData('mac')) calculated_mac = self.hmac(self.km_o, macable + \ @@ -483,7 +484,7 @@ m_final = base64.b64decode(c.getTagData('data')) m_compressed = self.decrypt(m_final) - plaintext = self.decompress(m_compressed) + plaintext = self.decompress(m_compressed).decode('utf-8') try: parsed = nbxmpp.Node(node='<node>' + plaintext + '</node>') @@ -536,7 +537,7 @@ if i_o == 'a' and self.sas_algs == 'sas28x5': # we don't need to calculate this if there's a verified retained secret # (but we do anyways) - self.sas = crypto.sas_28x5(m_o, self.form_s) + self.sas = crypto.sas_28x5(m_o, self.form_s.encode('utf-8')) if self.negotiated['recv_pubkey']: plaintext = self.decrypt(id_o) @@ -571,11 +572,11 @@ content = self.n_s + self.n_o + crypto.encode_mpi(dh_i) + pubkey_o if sigmai: - self.form_o = c7l_form + self.form_o = c7l_form.encode('utf-8') content += self.form_o else: - form_o2 = c7l_form - content += self.form_o + form_o2 + form_o2 = c7l_form.encode('utf-8') + content += self.form_o.encode('utf-8') + form_o2 mac_o_calculated = self.hmac(self.ks_o, content) @@ -609,7 +610,7 @@ old_c_s = self.c_s content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + \ - self.form_s + form_s2 + self.form_s.encode('utf-8') + form_s2.encode('utf-8') mac_s = self.hmac(self.ks_s, content) @@ -632,14 +633,16 @@ if self.status == 'requested-e2e' and self.sas_algs == 'sas28x5': # we're alice; check for a retained secret # if none exists, prompt the user with the SAS - self.sas = crypto.sas_28x5(m_s, self.form_o) + self.sas = crypto.sas_28x5(m_s, self.form_o.encode('utf-8')) if self.sigmai: # FIXME save retained secret? self.check_identity(tuple) - return (nbxmpp.DataField(name='identity', value=base64.b64encode(id_s)), - nbxmpp.DataField(name='mac', value=base64.b64encode(m_s))) + return (nbxmpp.DataField(name='identity', + value=base64.b64encode(id_s).decode('utf-8')), + nbxmpp.DataField(name='mac', + value=base64.b64encode(m_s).decode('utf-8'))) def negotiate_e2e(self, sigmai): self.negotiated = {} @@ -695,7 +698,7 @@ self.n_s = crypto.generate_nonce() x.addChild(node=nbxmpp.DataField(name='my_nonce', - value=base64.b64encode(self.n_s), typ='hidden')) + value=base64.b64encode(self.n_s).decode('utf-8'), typ='hidden')) modp_options = [ int(g) for g in gajim.config.get('esession_modp').split( ',') ] @@ -826,7 +829,7 @@ return dhhashes = dhhashes_f.getValues() self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( - 'utf8')) + 'utf8')) bytes = int(self.n / 8) @@ -845,7 +848,7 @@ 'nonce': self.n_o} for name in to_add: - b64ed = base64.b64encode(to_add[name]) + b64ed = base64.b64encode(to_add[name]).decode('utf-8') x.addChild(node=nbxmpp.DataField(name=name, value=b64ed)) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) for \ @@ -935,7 +938,7 @@ value='urn:xmpp:ssn')) result.addChild(node=nbxmpp.DataField(name='accept', value='1')) result.addChild(node=nbxmpp.DataField(name='nonce', - value=base64.b64encode(self.n_o))) + value=base64.b64encode(self.n_o).decode('utf-8'))) self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) @@ -952,11 +955,12 @@ rshash_size = self.hash_alg().digest_size rshashes.append(crypto.random_bytes(rshash_size)) - rshashes = [base64.b64encode(rshash) for rshash in rshashes] + rshashes = [base64.b64encode(rshash).decode('utf-8') for rshash in \ + rshashes] result.addChild(node=nbxmpp.DataField(name='rshashes', value=rshashes)) result.addChild(node=nbxmpp.DataField(name='dhkeys', - value=base64.b64encode(crypto.encode_mpi(e)))) + value=base64.b64encode(crypto.encode_mpi(e)).decode('utf-8'))) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) \ for el in form.getChildren()) @@ -1037,9 +1041,9 @@ x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) x.addChild(node=nbxmpp.DataField(name='nonce', value=base64.b64encode( - self.n_o))) + self.n_o).decode('utf-8'))) x.addChild(node=nbxmpp.DataField(name='srshash', value=base64.b64encode( - srshash))) + srshash).decode('utf-8'))) for datafield in self.make_identity(x, self.d): x.addChild(node=datafield) @@ -1155,11 +1159,11 @@ self.es[modp] = e if sigmai: - dhs.append(base64.b64encode(crypto.encode_mpi(e))) + dhs.append(base64.b64encode(crypto.encode_mpi(e)).decode('utf-8')) name = 'dhkeys' else: He = crypto.sha256(crypto.encode_mpi(e)) - dhs.append(base64.b64encode(He)) + dhs.append(base64.b64encode(He).decode('utf-8')) name = 'dhhashes' return nbxmpp.DataField(name=name, typ='hidden', value=dhs)

1 0

gajim-plugins: [UbuntuIntegrationPlugin] [bergschreck] fix remov...
by Gajim Plugins 23 Apr '14

23 Apr '14

changeset e7c89d164d05 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=e7c89d164d05 description: [UbuntuIntegrationPlugin] [bergschreck] fix removing events. Fixes #93 diffstat: ubuntu_integration/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aa7eb2e686b7 -r e7c89d164d05 ubuntu_integration/plugin.py --- a/ubuntu_integration/plugin.py Thu Feb 27 16:00:12 2014 +0400 +++ b/ubuntu_integration/plugin.py Wed Apr 23 22:38:41 2014 +0200 @@ -182,7 +182,7 @@ key = (event.account, event.jid) - if key not in self.events and \ + if key in self.events and \ event in self.events[key][1]: self.events[key][1].remove(event)

1 0

gajim: make string translatable in filetranfer context menu. Fix...
by Gajim 23 Apr '14

23 Apr '14

changeset c00f54ba7271 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=c00f54ba7271 description: make string translatable in filetranfer context menu. Fixes #7740 diffstat: data/gui/filetransfers.ui | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r e19ef59ed06d -r c00f54ba7271 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Tue Apr 22 13:11:00 2014 +0200 +++ b/data/gui/filetransfers.ui Wed Apr 23 21:53:40 2014 +0200 @@ -186,7 +186,7 @@ </child> <child> <object class="GtkImageMenuItem" id="continue_menuitem"> - <property name="label">_Continue</property> + <property name="label" translatable="yes">_Continue</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> @@ -196,7 +196,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pause_menuitem"> - <property name="label">_Pause</property> + <property name="label" translatable="yes">_Pause</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> @@ -219,7 +219,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_folder_menuitem"> - <property name="label">_Open Containing Folder</property> + <property name="label" translatable="yes">_Open Containing Folder</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property>

1 0

gajim: fix Host resolver. Fixes #7729, #7750
by Gajim 22 Apr '14

22 Apr '14

changeset e19ef59ed06d 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=e19ef59ed06d description: fix Host resolver. Fixes #7729, #7750 diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f0e7d9dfa503 -r e19ef59ed06d src/common/resolver.py --- a/src/common/resolver.py Mon Apr 21 21:10:09 2014 +0200 +++ b/src/common/resolver.py Tue Apr 22 13:11:00 2014 +0200 @@ -332,7 +332,7 @@ domain = ufqdn # For nslookup 9.6 if domain: # add 4 for ' has' after domain name - rest = line[len(domain)+4:].split('=') + rest = line[len(domain)+4:].split('record') if len(rest) != 2: continue answer_type, props_str = rest

1 0

gajim-website: [Davide Pizzetti] updated italian translation
by Gajim Website 21 Apr '14

21 Apr '14

changeset bbf08b2d36b4 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=bbf08b2d36b4 description: [Davide Pizzetti] updated italian translation diffstat: locale/it_IT/LC_MESSAGES/msg.po | 51 ++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diffs (160 lines): diff -r 3304a308ca62 -r bbf08b2d36b4 locale/it_IT/LC_MESSAGES/msg.po --- a/locale/it_IT/LC_MESSAGES/msg.po Wed Apr 02 21:49:36 2014 +0200 +++ b/locale/it_IT/LC_MESSAGES/msg.po Mon Apr 21 21:12:07 2014 +0200 @@ -1,22 +1,22 @@ # Italian translations for PACKAGE package. # Copyright (C) 2007-2014 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as Gajim's website. -# Daniel Coppi <neoex.dc(a)gmail.com>, 2007. -# Davide Pizzetti <erpizzo(a)alice.it>, 2014 +# Daniel Coppi <neoex.dc(a)gmail.com>, 2007. +# Davide Pizzetti <erpizzo(a)alice.it>, 2014 msgid "" msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-15 10:13+0100\n" -"PO-Revision-Date: 2014-02-25 15:52+0100\n" -"Last-Translator: neoex <neoex.dc(a)gmail.com>\n" -"Language-Team: Italian\n" -"Language: \n" +"PO-Revision-Date: 2014-04-17 14:36+0200\n" +"Last-Translator: Davide Pizzetti <erpizzo(a)alice.it>\n" +"Language-Team: Gajim Translators\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Virtaal 0.7.1\n" #: Design.php:85 msgid "Home" @@ -371,7 +371,7 @@ #: downloads.php:23 #, c-format msgid " The Debian package of %s is " -msgstr " Il pacchetto della versione %s per Debian è" +msgstr " Il pacchetto della versione %s per Debian è " #: downloads.php:25 msgid "" @@ -447,7 +447,7 @@ #: downloads.php:85 msgid " Just " -msgstr " Basta eseguire" +msgstr " Basta eseguire " #: downloads.php:89 msgid " SourceMage\n" @@ -680,10 +680,13 @@ "Group chat support (with Multi-User Chat protocol), invitation, chat to " "group chat transformation, minimize group chat to roster" msgstr "" +"Supporto alle conversazioni di gruppo (con il protocollo Multi-User Chat), " +"inviti, passaggio da chat individuale a chat di gruppo, minimizzazione della " +"chat nell'elenco dei propri contatti" #: index.php:26 msgid "Emoticons, avatars, PEP (user activity, mood and tune)" -msgstr "" +msgstr "Emoticon, avatar, PEP (attività degli utenti, umore e tonalità)" #: index.php:27 msgid "Audio / video conferences" @@ -739,7 +742,7 @@ #: index.php:38 msgid "Link local (bonjour / zeroconf), BOSH" -msgstr "" +msgstr "Collega local (bonjour / zeroconf), BOSH" #: index.php:39 msgid "Other features via plugins" @@ -779,14 +782,12 @@ msgstr "Gajim %s è qui!" #: index.php:65 -#, fuzzy msgid "15 March 2014" -msgstr "17 marzo 2013" +msgstr "15 marzo 2014" #: index.php:66 -#, fuzzy msgid "16 December 2013" -msgstr "18 dicembre 2011" +msgstr "16 dicembre 2013" #: index.php:67 msgid "25 May 2013" @@ -830,26 +831,24 @@ msgstr "Novità rispetto alla versione %s:" #: index.php:98 index.php:108 -#, fuzzy msgid "Improve File transfer" -msgstr "Migliora la ricerca nei propri contatti" +msgstr "Migliora il trasferimento dei file" #: index.php:99 index.php:109 -#, fuzzy msgid "Improve security" -msgstr "Migliora la ricerca nei propri contatti" +msgstr "Migliora la sicurezza" #: index.php:100 index.php:110 msgid "Improve audio / video calls" -msgstr "" +msgstr "Migliora le chiamate audio / video" #: index.php:101 index.php:111 msgid "Last message correction" -msgstr "" +msgstr "Correzione dell'ultimo messaggio" #: index.php:102 msgid "Jingle Audio under windows" -msgstr "" +msgstr "Jingle Audio sotto le finestre" #: index.php:103 index.php:112 index.php:119 index.php:127 index.php:133 #: index.php:140 index.php:152 @@ -859,7 +858,7 @@ #: index.php:103 index.php:112 index.php:119 index.php:127 index.php:133 #: index.php:140 index.php:152 msgid "Full changelog, see" -msgstr "Registro dei cambiamenti completo, consulta" +msgstr "Registro dei cambiamenti completo, consulta il " #: index.php:104 index.php:113 index.php:120 index.php:128 index.php:134 #: index.php:141 index.php:153 @@ -884,7 +883,7 @@ #: index.php:126 msgid "Improve farstream calls" -msgstr "" +msgstr "Migliora le chiamate con farstream" #: index.php:132 msgid "Fix crash when pressing ESC in chat window" @@ -893,7 +892,7 @@ #: index.php:138 msgid "Switch to python-farstream" -msgstr "" +msgstr "Passaggio a python-farstream" #: index.php:139 msgid "Fix several issues" @@ -917,7 +916,7 @@ #: index.php:149 msgid "Nested roster group" -msgstr "" +msgstr "Gruppo dei propri contatti nidificato" #: index.php:150 msgid "Roster filtrering"

1 0

gajim: [Davide Pizzetti] Updated italian translation
by Gajim 21 Apr '14

21 Apr '14

changeset f0e7d9dfa503 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=f0e7d9dfa503 description: [Davide Pizzetti] Updated italian translation diffstat: po/it.po | 370 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 186 insertions(+), 184 deletions(-) diffs (truncated from 1185 to 300 lines): diff -r fcd2f1221914 -r f0e7d9dfa503 po/it.po --- a/po/it.po Tue Apr 15 14:01:55 2014 +0200 +++ b/po/it.po Mon Apr 21 21:10:09 2014 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-09 16:54+0200\n" -"PO-Revision-Date: 2014-04-08 22:58+0200\n" +"POT-Creation-Date: 2014-04-21 21:07+0200\n" +"PO-Revision-Date: 2014-04-16 23:42+0200\n" "Last-Translator: Davide Pizzetti <erpizzo(a)alice.it>\n" "Language-Team: Gajim Translators\n" "Language: it\n" @@ -187,8 +187,8 @@ #: ../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:3158 -#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 +#: ../src/dialogs.py:537 ../src/roster_window.py:3161 +#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 msgid "None" msgstr "Nessuno" @@ -363,8 +363,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:3100 ../src/roster_window.py:4226 -#: ../src/roster_window.py:5871 +#: ../src/roster_window.py:3103 ../src/roster_window.py:4229 +#: ../src/roster_window.py:5874 msgid "General" msgstr "Generale" @@ -748,7 +748,7 @@ #: ../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/gui_menu_builder.py:674 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 +#: ../src/roster_window.py:5843 ../src/roster_window.py:5977 msgid "_Unblock" msgstr "_Sblocca" @@ -952,8 +952,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 -#: ../src/roster_window.py:5941 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5773 +#: ../src/roster_window.py:5944 msgid "In_vite to" msgstr "In_vita a" @@ -971,7 +971,7 @@ #. Send Custom Status #: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5781 +#: ../src/roster_window.py:5784 msgid "Send Cus_tom Status" msgstr "Invia uno s_tato personalizzato" @@ -986,12 +986,12 @@ #. Rename #: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5821 +#: ../src/roster_window.py:5824 msgid "_Rename..." msgstr "_Rinomina..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5966 msgid "Edit _Groups..." msgstr "Modifica i _gruppi..." @@ -1025,7 +1025,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5848 ../src/roster_window.py:5980 +#: ../src/roster_window.py:5851 ../src/roster_window.py:5983 msgid "_Block" msgstr "_Blocca" @@ -1040,14 +1040,14 @@ #. Remove #. Remove group #: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5858 +#: ../src/roster_window.py:5861 msgid "Remo_ve" msgstr "_Elimina" #: ../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:6056 +#: ../src/roster_window.py:6059 msgid "_History" msgstr "_Cronologia" @@ -2121,7 +2121,7 @@ #: ../data/gui/preferences_window.ui.h:93 msgid "Contact's nickname:" -msgstr "Soprannome del contatto" +msgstr "Soprannome del contatto:" #: ../data/gui/preferences_window.ui.h:94 msgid "Your nickname:" @@ -2575,7 +2575,7 @@ msgstr "<b>Cosa vuoi fare?</b>" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5993 msgid "_Remove" msgstr "_Rimuovi" @@ -3089,7 +3089,7 @@ #: ../src/gui_menu_builder.py:318 ../src/gui_menu_builder.py:489 #: ../src/roster_window.py:771 ../src/roster_window.py:1735 #: ../src/roster_window.py:1737 ../src/roster_window.py:2086 -#: ../src/roster_window.py:3629 ../src/roster_window.py:3656 +#: ../src/roster_window.py:3632 ../src/roster_window.py:3659 msgid "Not in Roster" msgstr "Non nei tuoi contatti" @@ -3107,7 +3107,7 @@ #: ../src/chat_control.py:1768 msgid "Feature not available, see Help->Features" -msgstr "Funzionalità non disponibile, controllare Aiuto->Funzionalità" +msgstr "Funzionalità non disponibile, consulta Aiuto->Funzionalità" #: ../src/chat_control.py:1772 msgid "Feature not supported by remote client" @@ -3134,7 +3134,7 @@ #: ../src/chat_control.py:2115 #, python-format msgid "%(nickname)s from group chat %(room_name)s" -msgstr "%(nickname)s della conversazione di gruppo %(room_name)s" +msgstr "%(nickname)s dalla conversazione di gruppo %(room_name)s" #. No key assigned nor a key is used by remote contact #: ../src/chat_control.py:2255 ../src/dialogs.py:5206 @@ -3262,7 +3262,7 @@ #: ../src/chat_control.py:3001 ../src/common/connection_handlers_events.py:916 #: ../src/common/connection_handlers.py:1145 #: ../src/common/connection_handlers.py:1270 ../src/common/connection.py:533 -#: ../src/common/logger.py:1161 ../src/gajim.py:245 ../src/session.py:98 +#: ../src/common/logger.py:1161 ../src/gajim.py:252 ../src/session.py:98 msgid "Database Error" msgstr "Errore del database" @@ -3465,7 +3465,7 @@ #: ../src/command_system/implementation/standard.py:274 msgid "Change your nickname in a group chat" -msgstr "Cambia il tuo nickname in una conversazione di gruppo" +msgstr "Cambia il tuo soprannome in una conversazione di gruppo" #. invalid char #: ../src/command_system/implementation/standard.py:279 ../src/config.py:3418 @@ -3591,36 +3591,36 @@ msgid "Excessive arguments" msgstr "Numero eccessivo di parametri" -#: ../src/common/check_paths.py:39 +#: ../src/common/check_paths.py:38 msgid "creating logs database" msgstr "creazione del database dei registri in corso" -#: ../src/common/check_paths.py:87 +#: ../src/common/check_paths.py:86 msgid "creating cache database" msgstr "creazione della cache del database" +#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284 +#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298 +#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312 +#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:326 +#, python-format +msgid "%s is a file but it should be a directory" +msgstr "%s è un file, ma dovrebbe essere una cartella" + #: ../src/common/check_paths.py:278 ../src/common/check_paths.py:285 #: ../src/common/check_paths.py:292 ../src/common/check_paths.py:299 #: ../src/common/check_paths.py:306 ../src/common/check_paths.py:313 #: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327 -#, python-format -msgid "%s is a file but it should be a directory" -msgstr "%s è un file, ma dovrebbe essere una cartella" - -#: ../src/common/check_paths.py:279 ../src/common/check_paths.py:286 -#: ../src/common/check_paths.py:293 ../src/common/check_paths.py:300 -#: ../src/common/check_paths.py:307 ../src/common/check_paths.py:314 -#: ../src/common/check_paths.py:321 ../src/common/check_paths.py:328 -#: ../src/common/check_paths.py:338 ../src/common/check_paths.py:346 +#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 msgid "Gajim will now exit" msgstr "Gajim sta per uscire" -#: ../src/common/check_paths.py:337 ../src/common/check_paths.py:345 +#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344 #, python-format msgid "%s is a directory but should be a file" msgstr "%s è una cartella ma dovrebbe essere un file" -#: ../src/common/check_paths.py:366 +#: ../src/common/check_paths.py:359 #, python-format msgid "creating %s directory" msgstr "creazione della cartella %s" @@ -3686,7 +3686,7 @@ #: ../src/common/commands.py:216 ../src/common/contacts.py:131 #: ../src/common/helpers.py:67 ../src/roster_window.py:824 #: ../src/roster_window.py:1739 ../src/roster_window.py:1741 -#: ../src/roster_window.py:2625 ../src/roster_window.py:5736 +#: ../src/roster_window.py:2625 ../src/roster_window.py:5739 msgid "Groupchats" msgstr "Conversazioni di gruppo" @@ -3908,16 +3908,16 @@ "Character to add after nickname when using nick completion (tab) in group " "chat." msgstr "" -"Carattere da aggiungere dopo il nickname quando si usa il completamento nick " -"(tab) nella conversazione di gruppo." +"Carattere da aggiungere dopo il soprannome quando si usa il completamento " +"automatico dei soprannomi (tab) nella conversazione di gruppo." #: ../src/common/config.py:142 msgid "" "Character to propose to add after desired nickname when desired nickname is " "used by someone else in group chat." msgstr "" -"Carattere da proporre di aggiungere dopo il nickname desiderato quando il " -"nickname desiderato è già usato da qualcun'altro nella conversazione di " +"Carattere da proporre di aggiungere dopo il soprannome desiderato quando il " +"soprannome desiderato è già usato da qualcun'altro nella conversazione di " "gruppo" #: ../src/common/config.py:160 @@ -3941,7 +3941,7 @@ #: ../src/common/config.py:173 msgid "Characters that are printed before the nickname in conversations" -msgstr "Caratteri scritti prima del nickname nelle conversazioni" +msgstr "Caratteri scritti prima del soprannome nelle conversazioni" #: ../src/common/config.py:174 msgid "Characters that are printed after the nickname in conversations" @@ -4225,11 +4225,11 @@ #: ../src/common/config.py:262 msgid "Background color of contacts when they just signed in." -msgstr "Colore di sfondo dei contatti appena collegati." +msgstr "Colore di sfondo dei contatti appena connessi." #: ../src/common/config.py:263 msgid "Background color of contacts when they just signed out." -msgstr "Colore di sfondo dei contatti appena scollegati." +msgstr "Colore di sfondo dei contatti appena disconnessi." #: ../src/common/config.py:265 msgid "" @@ -4264,7 +4264,7 @@ msgstr "" "Jabberd1.4 non vuole informazioni SHA quando ci si unisce ad una stanza " "protetta da password. Impostare a Falso per smettere di inviare informazioni " -"SHA nella presenza sulle conversazioni di gruppo" +"SHA nella presenza sulle conversazioni di gruppo." #. always, never, peracct, pertype should not be translated #: ../src/common/config.py:273 @@ -4307,7 +4307,7 @@ #: ../src/common/config.py:276 msgid "If True, pressing the escape key closes a tab/window." -msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra" +msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra." #: ../src/common/config.py:277 msgid "Hides the buttons in chat windows." @@ -4332,12 +4332,12 @@ "In a chat, show the nickname at the beginning of a line only when it's not " "the same person talking than in previous message." msgstr "" -"In una conversazione, mostra il nickname all'inizio della riga solo quando " +"In una conversazione, mostra il soprannome all'inizio della riga solo quando " "non è quello della persona che parlava nel messaggio precedente." #: ../src/common/config.py:282 msgid "Indentation when using merge consecutive nickname."

1 0

gajim: Defer the creation of XTLS until it's first time used.
by Gajim 15 Apr '14

15 Apr '14

changeset fcd2f1221914 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=fcd2f1221914 description: Defer the creation of XTLS until it's first time used. This will make Gajim start a bit faster and more entropy can be generated for key generation. diffstat: src/common/check_paths.py | 7 ------- src/common/jingle_ft.py | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diffs (53 lines): diff -r 9528eb6f8432 -r fcd2f1221914 src/common/check_paths.py --- a/src/common/check_paths.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/check_paths.py Tue Apr 15 14:01:55 2014 +0200 @@ -30,7 +30,6 @@ from common import gajim import logger -from common import jingle_xtls # DO NOT MOVE ABOVE OF import gajim import sqlite3 as sqlite @@ -350,12 +349,6 @@ create_path(XTLS_CERTS) if not os.path.exists(LOCAL_XTLS_CERTS): create_path(LOCAL_XTLS_CERTS) - cert_name = os.path.join(LOCAL_XTLS_CERTS, - jingle_xtls.SELF_SIGNED_CERTIFICATE) - if not (os.path.exists(cert_name + '.cert') and os.path.exists( - cert_name + '.pkey')): - jingle_xtls.make_certs(cert_name, 'gajim') - def create_path(directory): head, tail = os.path.split(directory) diff -r 9528eb6f8432 -r fcd2f1221914 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Apr 15 12:42:09 2014 +0200 +++ b/src/common/jingle_ft.py Tue Apr 15 14:01:55 2014 +0200 @@ -19,9 +19,11 @@ Handles Jingle File Transfer (XEP 0234) """ +import os import hashlib import gajim import nbxmpp +import configpaths import jingle_xtls from jingle_content import contents, JingleContent from jingle_transport import * @@ -108,6 +110,13 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } + + if jingle_xtls.PYOPENSSL_PRESENT: + cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], + jingle_xtls.SELF_SIGNED_CERTIFICATE) + if not (os.path.exists(cert_name + '.cert') + and os.path.exists(cert_name + '.pkey')): + jingle_xtls.make_certs(cert_name, 'gajim') def __state_changed(self, nextstate, args=None): # Executes the next state action and sets the next state

1 0

gajim: XTLS keys will be stored separate for each profile.
by Gajim 15 Apr '14

15 Apr '14

changeset 9528eb6f8432 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9528eb6f8432 description: XTLS keys will be stored separate for each profile. Fixes #7735. diffstat: src/common/configpaths.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (45 lines): diff -r 46f319807a21 -r 9528eb6f8432 src/common/configpaths.py --- a/src/common/configpaths.py Wed Apr 09 18:02:30 2014 +0200 +++ b/src/common/configpaths.py Tue Apr 15 12:42:09 2014 +0200 @@ -141,7 +141,7 @@ d = {'MY_DATA': '', 'LOG_DB': u'logs.db', 'MY_CACERTS': u'cacerts.pem', 'MY_EMOTS': u'emoticons', 'MY_ICONSETS': u'iconsets', 'MY_MOOD_ICONSETS': u'moods', 'MY_ACTIVITY_ICONSETS': u'activities', - 'PLUGINS_USER': u'plugins', 'MY_PEER_CERTS': u'certs', + 'PLUGINS_USER': u'plugins', 'RNG_SEED': u'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) @@ -152,7 +152,6 @@ self.add(name, TYPE_CACHE, windowsify(d[name])) self.add('MY_CONFIG', TYPE_CONFIG, '') - self.add('MY_CERT', TYPE_CONFIG, '') basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify(u'data'))) @@ -178,16 +177,24 @@ pidfile = windowsify(u'gajim') secretsfile = windowsify(u'secrets') pluginsconfdir = windowsify(u'pluginsconfig') + certsdir = windowsify(u'certs') + localcertsdir = windowsify(u'localcerts') + if len(profile) > 0: conffile += u'.' + profile pidfile += u'.' + profile secretsfile += u'.' + profile pluginsconfdir += u'.' + profile + certsdir += u'.' + profile + localcertsdir += u'.' + profile + pidfile += u'.pid' self.add('CONFIG_FILE', TYPE_CONFIG, conffile) self.add('PID_FILE', TYPE_CACHE, pidfile) self.add('SECRETS_FILE', TYPE_DATA, secretsfile) self.add('PLUGINS_CONFIG_DIR', TYPE_CONFIG, pluginsconfdir) + self.add('MY_PEER_CERTS', TYPE_DATA, certsdir) + self.add('MY_CERT', TYPE_CONFIG, localcertsdir) gajimpaths = ConfigPaths()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2014