Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: [fedor] enable forward secrecy thanks to Diffie-Hellman p...
by Gajim 12 Nov '13

12 Nov '13

changeset a71bbdf23465 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=a71bbdf23465 description: [fedor] enable forward secrecy thanks to Diffie-Hellman parameters. Fixes #7555 diffstat: data/other/dh4096.pem | 18 ++++++++++++++++++ src/common/jingle_xtls.py | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diffs (60 lines): diff -r cdc6bee4b259 -r a71bbdf23465 data/other/dh4096.pem --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/other/dh4096.pem Tue Nov 12 21:10:22 2013 +0100 @@ -0,0 +1,18 @@ +-----BEGIN DH PARAMETERS----- +MIICCAKCAgEA+hRyUsFN4VpJ1O8JLcCo/VWr19k3BCgJ4uk+d+KhehjdRqNDNyOQ +l/MOyQNQfWXPeGKmOmIig6Ev/nm6Nf9Z2B1h3R4hExf+zTiHnvVPeRBhjdQi81rt +Xeoh6TNrSBIKIHfUJWBh3va0TxxjQIs6IZOLeVNRLMqzeylWqMf49HsIXqbcokUS +Vt1BkvLdW48j8PPv5DsKRN3tloTxqDJGo9tKvj1Fuk74A+Xda1kNhB7KFlqMyN98 +VETEJ6c7KpfOo30mnK30wqw3S8OtaIR/maYX72tGOno2ehFDkq3pnPtEbD2CScxc +alJC+EL7RPk5c/tgeTvCngvc1KZn92Y//EI7G9tPZtylj2b56sHtMftIoYJ9+ODM +sccD5Piz/rejE3Ome8EOOceUSCYAhXn8b3qvxVI1ddd1pED6FHRhFvLrZxFvBEM9 +ERRMp5QqOaHJkM+Dxv8Cj6MqrCbfC4u+ZErxodzuusgDgvZiLF22uxMZbobFWyte +OvOzKGtwcTqO/1wV5gKkzu1ZVswVUQd5Gg8lJicwqRWyyNRczDDoG9jVDxmogKTH +AaqLulO7R8Ifa1SwF2DteSGVtgWEN8gDpN3RBmmPTDngyF2DHb5qmpnznwtFKdTL +KWbuHn491xNO25CQWMtem80uKw+pTnisBRF/454n1Jnhub144YRBoN8CAQI= +-----END DH PARAMETERS----- + +These are the 4096 bit DH parameters from "Assigned Number for SKIP Protocols" +(http://www.skip-vpn.org/spec/numbers.html). +See there for how they were generated. +Note that g is not a generator, but this is not a problem since p is a safe prime. diff -r cdc6bee4b259 -r a71bbdf23465 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Nov 11 13:37:16 2013 +0100 +++ b/src/common/jingle_xtls.py Tue Nov 12 21:10:22 2013 +0100 @@ -50,6 +50,8 @@ TYPE_DSA = crypto.TYPE_DSA SELF_SIGNED_CERTIFICATE = 'localcert' +DH_PARAMS = 'dh_params.pem' +DEFAULT_DH_PARAMS = 'dh4096.pem' def default_callback(connection, certificate, error_num, depth, return_code): log.info("certificate: %s" % certificate) @@ -106,6 +108,25 @@ cert_name = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) ctx.use_privatekey_file (cert_name + '.pkey') ctx.use_certificate_file(cert_name + '.cert') + + # Try to load Diffie-Hellman parameters. + # First try user DH parameters, if this fails load the default DH parameters + dh_params_name = os.path.join(gajim.MY_CERT_DIR, DH_PARAMS) + try: + with open(dh_params_name, "r") as dh_params_file: + ctx.load_tmp_dh(dh_params_name) + except IOError as err: + log.warn('Unable to load DH parameter file: %s. You should generate it by using this command : "openssl dhparam 4096 -out ~/.local/share/gajim/dh_params.pem". This command take about 15 minutes to complete.' % dh_params_name) + default_dh_params_name = os.path.join(common.gajim.DATA_DIR, + 'other', DEFAULT_DH_PARAMS) + try: + with open(default_dh_params_name, "r") as default_dh_params_file: + ctx.load_tmp_dh(default_dh_params_name) + except IOError as err: + log.error('Unable to load default DH parameter file: %s , %s' + % (default_dh_params_name, err)) + raise + store = ctx.get_cert_store() for f in os.listdir(os.path.expanduser(gajim.MY_PEER_CERTS_PATH)): load_cert_file(os.path.join(os.path.expanduser(

1 0

gajim: ability to configure cipher list
by Gajim 11 Nov '13

11 Nov '13

changeset 8bd293727c0e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8bd293727c0e description: ability to configure cipher list diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r fd7a48bf7d8a -r 8bd293727c0e src/common/config.py --- a/src/common/config.py Tue Nov 05 13:12:38 2013 +0100 +++ b/src/common/config.py Sun Nov 03 17:57:12 2013 +0100 @@ -349,6 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'cipher_list': [ opt_str, 'HIGH:!aNULL:!eNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r fd7a48bf7d8a -r 8bd293727c0e src/common/connection.py --- a/src/common/connection.py Tue Nov 05 13:12:38 2013 +0100 +++ b/src/common/connection.py Sun Nov 03 17:57:12 2013 +0100 @@ -1236,7 +1236,9 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS - secure_tuple = (self._current_type, cacerts, mycerts) + cipher_list = gajim.config.get_per('accounts', self.name, + 'cipher_list') + secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

gajim: improve manage bookmark jid handling. Fixes #7547
by Gajim 11 Nov '13

11 Nov '13

changeset cdc6bee4b259 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=cdc6bee4b259 description: improve manage bookmark jid handling. Fixes #7547 diffstat: src/config.py | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diffs (64 lines): diff -r 07573da02031 -r cdc6bee4b259 src/config.py --- a/src/config.py Mon Nov 11 15:43:56 2013 +0400 +++ b/src/config.py Mon Nov 11 13:37:16 2013 +0100 @@ -3221,7 +3221,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') @@ -3370,7 +3371,9 @@ self.title_entry.set_text(model[iter_][1]) room_jid = model[iter_][2].decode('utf-8') (room, server) = room_jid.split('@') + self.room_entry.handler_block(self.room_entry_changed_id) self.room_entry.set_text(room) + self.room_entry.handler_unblock(self.room_entry_changed_id) self.server_entry.set_text(server) self.autojoin_checkbutton.set_active(model[iter_][3]) @@ -3423,13 +3426,17 @@ if not iter_: return server = widget.get_text().decode('utf-8') + if not server: + return if '@' in server: dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed'), transient_for=self.window) widget.set_text(server.replace('@', '')) - room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \ - server.strip() + room = self.room_entry.get_text().decode('utf-8').strip() + if not room: + return + room_jid = room + '@' + server.strip() try: room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat, e: @@ -3444,14 +3451,18 @@ if not iter_: return room = widget.get_text().decode('utf-8') + if not room: + return if '@' in room: room, server = room.split('@', 1) widget.set_text(room) if server: self.server_entry.set_text(server) self.server_entry.grab_focus() - room_jid = room.strip() + '@' + \ - self.server_entry.get_text().decode('utf-8').strip() + server = self.server_entry.get_text().decode('utf-8').strip() + if not server: + return + room_jid = room.strip() + '@' + server try: room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat, e:

1 0

gajim: Add date to gajim logs. Fixes #7556
by Gajim 11 Nov '13

11 Nov '13

changeset 07573da02031 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=07573da02031 description: Add date to gajim logs. Fixes #7556 diffstat: src/common/logging_helpers.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 574cb75e920a -r 07573da02031 src/common/logging_helpers.py --- a/src/common/logging_helpers.py Mon Nov 11 14:27:30 2013 +0400 +++ b/src/common/logging_helpers.py Mon Nov 11 15:43:56 2013 +0400 @@ -141,7 +141,7 @@ consoleloghandler.setFormatter( FancyFormatter( '%(asctime)s %(levelname)s %(name)s %(message)s', - '%H:%M:%S', + '%x %H:%M:%S', use_color ) )

1 0

gajim: Fix wrong import
by Gajim 11 Nov '13

11 Nov '13

changeset 574cb75e920a 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=574cb75e920a description: Fix wrong import diffstat: src/htmltextview.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (19 строк): diff -r 1868b2a79c4d -r 574cb75e920a src/htmltextview.py --- a/src/htmltextview.py Sun Nov 10 13:28:10 2013 +0100 +++ b/src/htmltextview.py Mon Nov 11 14:27:30 2013 +0400 @@ -794,7 +794,6 @@ class HtmlTextView(gtk.TextView): def __init__(self): - from gtkgui_helpers import get_gtk_builder gobject.GObject.__init__(self) self.set_wrap_mode(gtk.WRAP_CHAR) self.set_editable(False) @@ -910,6 +909,7 @@ dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): + from gtkgui_helpers import get_gtk_builder xml = get_gtk_builder('chat_context_menu.ui') menu = xml.get_object('chat_context_menu') childs = menu.get_children()

1 0

gajim: [Darlan] Updated hebrew translation
by Gajim 10 Nov '13

10 Nov '13

changeset 1868b2a79c4d 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=1868b2a79c4d description: [Darlan] Updated hebrew translation diffstat: po/he.po | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diffs (105 lines): diff -r c42abe306bc5 -r 1868b2a79c4d po/he.po --- a/po/he.po Sun Nov 10 08:39:50 2013 +0100 +++ b/po/he.po Sun Nov 10 13:28:10 2013 +0100 @@ -9,7 +9,7 @@ "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-07 22:24+0200\n" +"PO-Revision-Date: 2013-11-10 09:39+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -3179,8 +3179,7 @@ #: ../src/chat_control.py:1789 msgid "You need to know the real JID of the contact to send him or her a file." -msgstr "" -"יש צורך לדעת את הכתובת המממשת (JID) של איש הקשר כדי לשלוח אליו או אליה קובץ." +msgstr "עליך לדעת את הכתובת (JID) של איש הקשר כדי לשלוח אליו או אליה קובץ." #: ../src/chat_control.py:1907 #, python-format @@ -3238,7 +3237,7 @@ #. About encrypted chat session #: ../src/chat_control.py:2291 msgid "and authenticated" -msgstr "והינה מאומת" +msgstr "והינה מאומתת" #. About encrypted chat session #: ../src/chat_control.py:2295 @@ -3740,7 +3739,7 @@ #: ../src/common/commands.py:212 msgid "Choose the groupchats you want to leave" -msgstr "בחירת שיחות קבוצה אשר ברצונך לעזוב" +msgstr "בחר שיחות קבוצה אשר ברצונך לעזוב" #. Make special context menu if group is Groupchats #: ../src/common/commands.py:216 ../src/common/contacts.py:131 @@ -3768,7 +3767,7 @@ #: ../src/common/config.py:76 msgid "Play sound when user is busy" -msgstr "נגן צלילים כאשר המשתמש עסוק" +msgstr "נגן צלילים כאשר משתמש עסוק" #: ../src/common/config.py:77 msgid "Use D-Bus and Notification-Daemon to show notifications" @@ -3886,7 +3885,7 @@ #. thistle2 #: ../src/common/config.py:110 msgid "Other dialogs color." -msgstr "צבע של תיבות דו שיח אחרות." +msgstr "צבע תיבות דו שיח אחרות." #. white #: ../src/common/config.py:111 @@ -3923,7 +3922,7 @@ #: ../src/common/config.py:123 msgid "Language used by speller" -msgstr "השפה אשר בשימוש על ידי מאיית" +msgstr "שפה אשר מצויה בשימוש על ידי מאיית" #: ../src/common/config.py:124 msgid "" @@ -4051,8 +4050,8 @@ "How many seconds to wait before trying to autorejoin to a conference you are " "being disconnected from. Set to 0 to disable autorejoining." msgstr "" -"כמה שניות להמתין טרם ניסיון להצטרף אוטומטית אל שיחת ועידה אשר ממנה הינך " -"מתנתק. הגדר אל 0 כדי לנטרל הצטרפות אוטומטית." +"כמה שניות להמתין טרם ניסיון הצטרפות חוזרת אוטומטית אל שיחת ועידה אשר ממנה " +"אנחנו מתנתקים. הגדר אל 0 כדי לנטרל הצטרפות חוזרת אוטומטית." #: ../src/common/config.py:185 msgid "" @@ -4066,7 +4065,7 @@ "Client default behaviour)." msgstr "" "שליחת הודעה בלחיצה על Ctrl+Enter ויצירת שורה חדשה באמצעות המקש Enter " -"(התנהגות משתמטת של Mirabilis לקוח ICQ)." +"(התנהגות שגרתית של Mirabilis לקוח ICQ)." # Ctrl+מעלה #: ../src/common/config.py:188 @@ -4105,7 +4104,7 @@ msgid "" "Sent chat state notifications. Can be one of all, composing_only, disabled." msgstr "" -"שלח התראות מצב שיחה בחלון שיחה. יכול להיות אחד מאלו all, composing_only, " +"שליחת התראות מצב שיחה בחלון שיחה. יכול להיות אחד מאלו all, composing_only, " "disabled." #: ../src/common/config.py:197 @@ -7497,7 +7496,7 @@ "SHA1 fingerprint of the certificate:\n" "%s" msgstr "" -"הוספת תעודה זו אל רשימת התעודות המהימנות.\n" +"הוסף את תעודה זו אל רשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" "%s"

1 0

gajim: [fedor] use openssl random number generator if available,...
by Gajim 10 Nov '13

10 Nov '13

changeset c42abe306bc5 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=c42abe306bc5 description: [fedor] use openssl random number generator if available, and improve entropy. Fixes #7550 diffstat: src/common/configpaths.py | 3 +- src/common/crypto.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++- src/gajim.py | 16 +++++++++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) diffs (112 lines): diff -r 687e80243968 -r c42abe306bc5 src/common/configpaths.py --- a/src/common/configpaths.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/common/configpaths.py Sun Nov 10 08:39:50 2013 +0100 @@ -141,7 +141,8 @@ 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', 'MY_PEER_CERTS': u'certs', + 'RNG_SEED': u'rng_seed'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) diff -r 687e80243968 -r c42abe306bc5 src/common/crypto.py --- a/src/common/crypto.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/common/crypto.py Sun Nov 10 08:39:50 2013 +0100 @@ -19,6 +19,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## +import sys import os import math @@ -75,8 +76,53 @@ else: return base28_chr[n] +def add_entropy_sources_OpenSSL(): + # Other possibly variable data. This are very low quality sources of + # entropy, but some of them are installation dependent and can be hard + # to guess for the attacker. + # Data available on all platforms Unix, Windows + sources = [sys.argv, sys.builtin_module_names, + sys.copyright, sys.getfilesystemencoding(), sys.hexversion, + sys.modules, sys.path, sys.version, sys.api_version, + os.environ, os.getcwd(), os.getpid()] + + for s in sources: + OpenSSL.rand.add(str(s), 0.01) + + # On Windows add the current contents of the screen to the PRNG state. + if os.name == 'nt': + OpenSSL.rand.screen() + # The /proc filesystem on POSIX systems contains many random variables: + # memory statistics, interrupt counts, network packet counts + if os.name == 'posix': + dirs = ['/proc', '/proc/net', '/proc/self'] + for d in dirs: + if os.access(d, os.R_OK): + for filename in os.listdir(d): + OpenSSL.rand.add(filename, 0) + try: + with open(d + os.sep + filename, "r") as fp: + # Limit the ammount of read bytes, in case a memory + # file was opened + OpenSSL.rand.add(str(fp.read(5000)), 0.01) + except: + # Ignore all read and access errors + pass + +PYOPENSSL_PRNG_PRESENT = False +try: + import OpenSSL.rand + PYOPENSSL_PRNG_PRESENT = True +except ImportError: + # PyOpenSSL PRNG not available + pass + def random_bytes(bytes_): - return os.urandom(bytes_) + if PYOPENSSL_PRNG_PRESENT: + OpenSSL.rand.add(os.urandom(bytes_), bytes_) + return OpenSSL.rand.bytes(bytes_) + else: + return os.urandom(bytes_) def generate_nonce(): return random_bytes(8) diff -r 687e80243968 -r c42abe306bc5 src/gajim.py --- a/src/gajim.py Fri Nov 08 14:06:22 2013 +0400 +++ b/src/gajim.py Sun Nov 10 08:39:50 2013 +0100 @@ -293,6 +293,19 @@ pid_filename = gajimpaths['PID_FILE'] config_filename = gajimpaths['CONFIG_FILE'] +# Seed the OpenSSL pseudo random number generator from file and initialize +RNG_SEED = gajimpaths['RNG_SEED'] +PYOPENSSL_PRNG_PRESENT = False +try: + import OpenSSL.rand + from common import crypto + PYOPENSSL_PRNG_PRESENT = True + # Seed from file + OpenSSL.rand.load_file(RNG_SEED) + crypto.add_entropy_sources_OpenSSL() +except ImportError: + log.info("PyOpenSSL PRNG not available") + import traceback import errno import dialogs @@ -439,6 +452,9 @@ del pid_dir def on_exit(): + # Save the entropy from OpenSSL PRNG + if PYOPENSSL_PRNG_PRESENT: + OpenSSL.rand.write_file(RNG_SEED) # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename)

1 0

gajim: fix var name
by Gajim 08 Nov '13

08 Nov '13

changeset 687e80243968 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=687e80243968 description: fix var name diffstat: src/common/jingle.py | 3 +-- 1 файлов изменено, 1 вставок(+), 2 удалений(-) различия (17 строк): diff -r e6dd503c9d09 -r 687e80243968 src/common/jingle.py --- a/src/common/jingle.py Fri Nov 08 09:24:29 2013 +0400 +++ b/src/common/jingle.py Fri Nov 08 14:06:22 2013 +0400 @@ -80,7 +80,7 @@ try: jid = helpers.get_full_jid_from_iq(stanza) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) + logger.warn('Invalid JID: %s, ignoring it' % stanza.getFrom()) return id_ = stanza.getID() if (jid, id_) in self.__iq_responses.keys(): @@ -224,4 +224,3 @@ if session.peerjid == jid and session.get_content(media): return session return None -

1 0

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

08 Nov '13

changeset e6dd503c9d09 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=e6dd503c9d09 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 39 +++++++++++++++++++++------------------ 1 файлов изменено, 21 вставок(+), 18 удалений(-) различия (175 строк): diff -r 990f1f7f6604 -r e6dd503c9d09 po/he.po --- a/po/he.po Fri Nov 08 00:31:34 2013 +0400 +++ b/po/he.po Fri Nov 08 09:24:29 2013 +0400 @@ -9,7 +9,7 @@ "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-10-22 13:09+0200\n" +"PO-Revision-Date: 2013-11-07 22:24+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -32,11 +32,12 @@ msgid "_Start Chat..." msgstr "התחלת _שיחה..." +# אל שיחת #: ../data/gui/account_context_menu.ui.h:4 #: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 #: ../data/gui/systray_context_menu.ui.h:3 msgid "Join _Group Chat" -msgstr "הצטרף אל שיחת _קבוצה" +msgstr "הצטרף לשיחת _קבוצה" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -156,7 +157,7 @@ "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" -"הוספת תעודה זו אל רשימת התעודות המהימנות.\n" +"הוסף את תעודה זו אל רשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" #: ../data/gui/account_creation_wizard_window.ui.h:24 @@ -615,7 +616,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:5 msgid "Please wait while the command is being sent..." -msgstr "אנא המתן בזמן שהפקודה נשלחת..." +msgstr "אנא המתן בעת שהפקודה נשלחת..." #: ../data/gui/adhoc_commands_window.ui.h:6 msgid "Please wait..." @@ -1500,7 +1501,7 @@ #: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2420 msgid "Join Group Chat" -msgstr "הצטרף אל שיחת קבוצה" +msgstr "הצטרף לשיחת קבוצה" #: ../data/gui/join_groupchat_window.ui.h:2 msgid "Room:" @@ -2635,7 +2636,7 @@ #: ../data/gui/roster_item_exchange_window.ui.h:1 msgid "Roster Item Exchange" -msgstr "המרת פריטי רשימה" +msgstr "המרת פריט רשימה" #: ../data/gui/roster_item_exchange_window.ui.h:2 msgid "" @@ -2726,7 +2727,7 @@ #: ../data/gui/roster_window.ui.h:25 msgid "Keyboard Shortcuts" -msgstr "קיצורי מקלדת" +msgstr "קיצורי מקש" #: ../data/gui/roster_window.ui.h:26 msgid "Fea_tures" @@ -3367,12 +3368,12 @@ #: ../src/chat_control.py:3384 ../src/dialogs.py:2935 ../src/dialogs.py:4625 #: ../src/gui_interface.py:646 ../src/notify.py:278 msgid "Groupchat Invitation" -msgstr "הזמנה אל שיחת קבוצה" +msgstr "הזמנת שיחת קבוצה" #: ../src/chat_control.py:3406 ../src/gui_interface.py:1019 #: ../src/roster_window.py:1991 msgid "Remote contact stopped transfer" -msgstr "ההעברה הופסקה על ידי איש קשר מרוחק" +msgstr "איש קשר מרוחק הפסיק העברה" #: ../src/chat_control.py:3408 ../src/gui_interface.py:1022 #: ../src/roster_window.py:1993 @@ -3719,13 +3720,14 @@ msgid "Presence description:" msgstr "תיאור נוכחות:" +# BUG: remove "the" #: ../src/common/commands.py:153 ../src/common/commands.py:330 msgid "The status has been changed." msgstr "מצב החיבור השתנה." #: ../src/common/commands.py:185 ../src/common/commands.py:211 msgid "Leave Groupchats" -msgstr "עזיבת שיחות קבוצה" +msgstr "עזוב שיחות קבוצה" #: ../src/common/commands.py:201 #, python-format @@ -3873,7 +3875,7 @@ #. yellowgreen #: ../src/common/config.py:108 msgid "Groupchat invitation notification color" -msgstr "צבע התראה של הזמנה אל שיחת קבוצה" +msgstr "צבע התראה של הזמנת שיחת קבוצה" # BUG: no Dot #. tan1 @@ -5300,7 +5302,7 @@ #: ../src/common/connection.py:1574 msgid "Error while removing privacy list" -msgstr "שגיאה במהלך הסרת רשימת פרטיות" +msgstr "שגיאה בעת הסרת רשימת פרטיות" # בטל/י נטרל/י #: ../src/common/connection.py:1575 @@ -7027,13 +7029,13 @@ #: ../src/common/zeroconf/connection_zeroconf.py:394 msgid "" "Connection to host could not be established: Timeout while sending data." -msgstr "לא היתה אפשרות לבסס חיבור אל מארח: תם הזמן במהלך שליחת מידע." +msgstr "לא היתה אפשרות לבסס חיבור אל מארח: תם הזמן בעת שליחת מידע." #: ../src/common/zeroconf/zeroconf_avahi.py:192 #: ../src/common/zeroconf/zeroconf_bonjour.py:191 #, python-format msgid "Error while adding service. %s" -msgstr "שגיאה במהלך הוספת שירות. %s" +msgstr "שגיאה בעת הוספת שירות. %s" #: ../src/config.py:404 msgid "Default Message" @@ -8354,7 +8356,7 @@ #: ../src/dialogs.py:5134 ../src/dialogs.py:5219 msgid "Contact's identity verified" -msgstr "זהות איש קשר מאומתת" +msgstr "זהות איש קשר אומתה" # מאמת #: ../src/dialogs.py:5140 @@ -8369,7 +8371,7 @@ "send you messages, you need to verify their identity by clicking the button " "below." msgstr "" -"כדי להסיר ספק כי האישיות הצפויה <b>בלבד</b> יכולה לקרוא את הודעותייך או " +"כדי להסיר ספק כי האישיות הצפויה <b>בלבד</b> מסוגלת לקרוא את הודעותייך או " "לשלוח לך הודעות, עליך לאמת את זהותם על ידי הקלקה על הלחצן מטה." #: ../src/dialogs.py:5148 ../src/dialogs.py:5200 ../src/dialogs.py:5213 @@ -10702,7 +10704,7 @@ msgid "" "There was an error while publishing your personal information, try again " "later." -msgstr "אירעה שגיאה במהלך פרסום המידע האישי שלך, נסה שוב מאוחר יותר." +msgstr "אירעה שגיאה בעת פרסום המידע האישי שלך, נסה שוב מאוחר יותר." #: ../src/roster_window.py:240 ../src/roster_window.py:1035 msgid "Merged accounts" @@ -11130,9 +11132,10 @@ msgid "History Manager" msgstr "מנהל היסטוריה" +# אל שיחת #: ../src/roster_window.py:6256 msgid "_Join New Group Chat" -msgstr "ה_צטרף אל שיחת קבוצה חדשה" +msgstr "ה_צטרף לשיחת קבוצה חדשה" #: ../src/roster_window.py:6489 msgid "Change Status Message..."

1 0

gajim: Fix wrong import
by Gajim 07 Nov '13

07 Nov '13

changeset 990f1f7f6604 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=990f1f7f6604 description: Fix wrong import diffstat: src/htmltextview.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (19 строк): diff -r 53c0972a4ab4 -r 990f1f7f6604 src/htmltextview.py --- a/src/htmltextview.py Wed Nov 06 22:00:21 2013 +0100 +++ b/src/htmltextview.py Fri Nov 08 00:31:34 2013 +0400 @@ -52,7 +52,6 @@ import gtkgui_helpers from common import gajim from gtkgui_helpers import get_icon_pixmap -from gtkgui_helpers import get_gtk_builder from common import helpers import tooltips @@ -795,6 +794,7 @@ class HtmlTextView(gtk.TextView): def __init__(self): + from gtkgui_helpers import get_gtk_builder gobject.GObject.__init__(self) self.set_wrap_mode(gtk.WRAP_CHAR) self.set_editable(False)

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