Commits

commits@gajim.org

17632 discussions

python-nbxmpp: always store certificate of server, even if there...
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset d6b80a7947ff in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d6b80a7947ff description: always store certificate of server, even if there is no error diffstat: nbxmpp/tls_nb.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r bfaed5452b52 -r d6b80a7947ff nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Wed Apr 09 17:18:57 2014 +0200 +++ b/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 @@ -493,9 +493,10 @@ def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: - if not ok and depth == 0: + if depth == 0: self._owner.ssl_certificate = cert - self._owner.ssl_errnum = errnum + if not ok: + self._owner.ssl_errnum = errnum return True except: log.error("Exception caught in _ssl_info_callback:", exc_info=True)

1 0

python-nbxmpp: BOSH doesn't support channel binding.
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset d99441bf920a in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=d99441bf920a description: BOSH doesn't support channel binding. BOSH (XEP-0124) uses short lived HTTPS connections for encryption. Channel binding requires long lived TLS connection, therefor doesn't work with XMPP over BOSH. Fixes #22 diffstat: nbxmpp/client_nb.py | 7 ++++--- nbxmpp/tls_nb.py | 7 +++++-- nbxmpp/transports_nb.py | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diffs (45 lines): diff -r d6b80a7947ff -r d99441bf920a nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/client_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -495,9 +495,10 @@ self._channel_binding = None if self.connected in ('ssl', 'tls'): try: - self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() - # TLS handshake is finished so channel binding data muss exist - assert (self._channel_binding != None) + if self.protocol_type != 'BOSH': + self._channel_binding = self.Connection.NonBlockingTLS.get_channel_binding() + # TLS handshake is finished so channel binding data muss exist + assert (self._channel_binding != None) except NotImplementedError: pass if auth_mechs == None: diff -r d6b80a7947ff -r d99441bf920a nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/tls_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -508,7 +508,10 @@ Get channel binding data. RFC 5929 """ sslObj = self._owner._sslObj - try: - return sslObj.get_channel_binding() + try: + if USE_PYOPENSSL: + return sslObj.get_finished() + else: + return sslObj.get_channel_binding() except AttributeError: raise NotImplementedError diff -r d6b80a7947ff -r d99441bf920a nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Mar 29 18:28:28 2014 +0100 +++ b/nbxmpp/transports_nb.py Mon Mar 31 16:54:20 2014 +0200 @@ -555,7 +555,7 @@ return None self.sendbuff = self.sendqueue.pop(0) try: - send_count = self._send(self.sendbuff) + send_count = self._send(self.sendbuff.encode("utf-8")) if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:]

1 0

python-nbxmpp: merge python23 branch
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset bfaed5452b52 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=bfaed5452b52 description: merge python23 branch diffstat: nbxmpp/auth_nb.py | 14 +++++++++++--- nbxmpp/c14n.py | 2 +- nbxmpp/dispatcher_nb.py | 5 +++++ nbxmpp/idlequeue.py | 45 +++++++++++++++++++++++++++++++++++---------- nbxmpp/simplexml.py | 48 ++++++++++++++++++++++++++++++++++-------------- nbxmpp/tls_nb.py | 2 ++ nbxmpp/transports_nb.py | 8 +++++++- 7 files changed, 95 insertions(+), 29 deletions(-) diffs (261 lines): diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/auth_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -21,10 +21,13 @@ See client_nb.py """ +from __future__ import unicode_literals + from .protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH from .protocol import NS_STREAM_MGMT from .protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID from .plugin import PlugIn +import sys import re import base64 from . import dispatcher_nb @@ -373,9 +376,14 @@ def HMAC(k, s): return hmac.new(key=k, msg=s, digestmod=hashfn).digest() - def XOR(x, y): - r = [px ^ py for px, py in zip(x, y)] - return bytes(r) + if sys.version_info[0] == 2: + def XOR(x, y): + r = (chr(ord(px) ^ ord(py)) for px, py in zip(x, y)) + return bytes(b''.join(r)) + else: + def XOR(x, y): + r = [px ^ py for px, py in zip(x, y)] + return bytes(r) def Hi(s, salt, iters): ii = 1 diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/c14n.py --- a/nbxmpp/c14n.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/c14n.py Wed Apr 09 17:18:57 2014 +0200 @@ -50,7 +50,7 @@ s=s[:-1]+' />' else: s = s + "</" + node.name + ">" - return s.encode('utf-8') + return s def normalise_attr(val): return val.replace('&', '&').replace('<', '<').replace('"', '"').replace('\t', '	').replace('\n', '
').replace('\r', '') diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/dispatcher_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -20,6 +20,7 @@ different handlers to different XMPP stanzas and namespaces """ +from __future__ import unicode_literals from . import simplexml import sys import locale @@ -29,6 +30,10 @@ from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging + +if sys.version_info[0] == 2: + chr = unichr + log = logging.getLogger('nbxmpp.dispatcher_nb') #: default timeout to wait for response for our id diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/idlequeue.py Wed Apr 09 17:18:57 2014 +0200 @@ -18,14 +18,20 @@ objects and be informed about possible IO """ +from __future__ import unicode_literals + import os +import sys import select import logging log = logging.getLogger('nbxmpp.idlequeue') # needed for get_idleqeue try: - from gi.repository import GLib + if sys.version_info[0] == 2: + import gobject + else: + from gi.repository import GLib HAVE_GLIB = True except ImportError: HAVE_GLIB = False @@ -36,11 +42,18 @@ elif os.name == 'posix': import fcntl -FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP -FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | GLib.IOCondition.HUP -FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ - GLib.IOCondition.PRI | GLib.IOCondition.HUP -FLAG_CLOSE = GLib.IOCondition.HUP +if sys.version_info[0] == 2: + FLAG_WRITE = 20 # write only + FLAG_READ = 19 # read only + FLAG_READ_WRITE = 23 # read and write + FLAG_CLOSE = 16 # wait for close +else: + FLAG_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.HUP + FLAG_READ = GLib.IOCondition.IN | GLib.IOCondition.PRI | \ + GLib.IOCondition.HUP + FLAG_READ_WRITE = GLib.IOCondition.OUT | GLib.IOCondition.IN | \ + GLib.IOCondition.PRI | GLib.IOCondition.HUP + FLAG_CLOSE = GLib.IOCondition.HUP PENDING_READ = 3 # waiting read event PENDING_WRITE = 4 # waiting write event @@ -516,15 +529,18 @@ Creates a dict, which maps file/pipe/sock descriptor to glib event id """ self.events = {} - self.current_time = GLib.get_real_time def _add_idle(self, fd, flags): """ This method is called when we plug a new idle object. Start listening for events from fd """ - res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, - self._process_events) + if sys.version_info[0] == 2: + res = gobject.io_add_watch(fd, flags, self._process_events, + priority=gobject.PRIORITY_LOW) + else: + res = GLib.io_add_watch(fd, GLib.PRIORITY_LOW, flags, + self._process_events) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -543,8 +559,17 @@ """ if not fd in self.events: return - GLib.source_remove(self.events[fd]) + if sys.version_info[0] == 2: + gobject.source_remove(self.events[fd]) + else: + GLib.source_remove(self.events[fd]) del(self.events[fd]) def process(self): self._check_time_events() + + if sys.version_info[0] == 2: + def current_time(self): + return gobject.get_current_time() * 1e6 + else: + current_time = GLib.get_real_time diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/simplexml.py --- a/nbxmpp/simplexml.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/simplexml.py Wed Apr 09 17:18:57 2014 +0200 @@ -20,6 +20,9 @@ projects. It is designed to be as standalone as possible """ +from __future__ import unicode_literals + +import sys import xml.parsers.expat import logging log = logging.getLogger('nbxmpp.simplexml') @@ -34,20 +37,37 @@ ENCODING='utf-8' -def ustr(what): - """ - Converts object "what" to unicode string using it's own __str__ method if - accessible or unicode method otherwise - """ - if isinstance(what, str): - return what - try: - r = what.__str__() - except AttributeError: - r = str(what) - if not isinstance(r, str): - return str(r, ENCODING) - return r +if sys.version_info[0] == 2: + def ustr(what): + """ + Converts object "what" to unicode string using it's own __str__ method if + accessible or unicode method otherwise + """ + if isinstance(what, unicode): + return what + try: + r = what.__str__() + except AttributeError: + r = unicode(what) + if not isinstance(r, unicode): + return unicode(r, ENCODING) + return r + +else: + def ustr(what): + """ + Converts object "what" to unicode string using it's own __str__ method if + accessible or unicode method otherwise + """ + if isinstance(what, str): + return what + try: + r = what.__str__() + except AttributeError: + r = str(what) + if not isinstance(r, str): + return str(r, ENCODING) + return r class Node(object): """ diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/tls_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -15,6 +15,8 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. +from __future__ import print_function + import socket import ssl from .plugin import PlugIn diff -r 3dec8187531c -r bfaed5452b52 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Thu Mar 27 13:22:15 2014 +0100 +++ b/nbxmpp/transports_nb.py Wed Apr 09 17:18:57 2014 +0200 @@ -24,6 +24,8 @@ connection handling. """ +from __future__ import unicode_literals + from .simplexml import ustr from .plugin import PlugIn from .idlequeue import IdleObject @@ -35,7 +37,11 @@ import time import traceback import base64 -from urllib.parse import urlparse + +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse import logging log = logging.getLogger('nbxmpp.transports_nb')

1 0

python-nbxmpp: remove bad .encode()
by Python-nbxmpp 09 Apr '14

09 Apr '14

changeset 3d6e29ca2511 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3d6e29ca2511 description: remove bad .encode() diffstat: nbxmpp/c14n.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fb11bbe7c37a -r 3d6e29ca2511 nbxmpp/c14n.py --- a/nbxmpp/c14n.py Sun Apr 06 17:44:38 2014 +0200 +++ b/nbxmpp/c14n.py Wed Apr 09 17:18:14 2014 +0200 @@ -50,7 +50,7 @@ s=s[:-1]+' />' else: s = s + "</" + node.name + ">" - return s.encode('utf-8') + return s def normalise_attr(val): return val.replace('&', '&').replace('<', '<').replace('"', '"').replace('\t', '	').replace('\n', '
').replace('\r', '')

1 0

gajim: use host to resolve DNS if it's available.
by Gajim 09 Apr '14

09 Apr '14

changeset b3debc7bde94 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=b3debc7bde94 description: use host to resolve DNS if it's available. diffstat: src/common/resolver.py | 147 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 114 insertions(+), 33 deletions(-) diffs (236 lines): diff -r 21c576b271a2 -r b3debc7bde94 src/common/resolver.py --- a/src/common/resolver.py Wed Apr 09 16:55:59 2014 +0200 +++ b/src/common/resolver.py Wed Apr 09 17:04:03 2014 +0200 @@ -51,8 +51,13 @@ def get_resolver(idlequeue): if USE_LIBASYNCNS: + log.info('Using LibAsyncNSResolver') return LibAsyncNSResolver() else: + if helpers.is_in_path('host'): + log.info('Using HostResolver') + return HostResolver(idlequeue) + log.info('Using NSLookupResolver') return NSLookupResolver(idlequeue) class CommonResolver(): @@ -62,43 +67,43 @@ # dict {"host+type" : list of callbacks} self.handlers = {} - def resolve(self, host, on_ready, type='srv'): + def resolve(self, host, on_ready, type_='srv'): host = host.lower() - log.debug('resolve %s type=%s' % (host, type)) - assert(type in ['srv', 'txt']) + log.debug('resolve %s type=%s' % (host, type_)) + assert(type_ in ['srv', 'txt']) if not host: # empty host, return empty list of srv records on_ready([]) return - if self.resolved_hosts.has_key(host+type): + if self.resolved_hosts.has_key(host+type_): # host is already resolved, return cached values log.debug('%s already resolved: %s' % (host, - self.resolved_hosts[host+type])) - on_ready(host, self.resolved_hosts[host+type]) + self.resolved_hosts[host+type_])) + on_ready(host, self.resolved_hosts[host+type_]) return - if self.handlers.has_key(host+type): + if self.handlers.has_key(host+type_): # host is about to be resolved by another connection, # attach our callback log.debug('already resolving %s' % host) - self.handlers[host+type].append(on_ready) + self.handlers[host+type_].append(on_ready) else: # host has never been resolved, start now log.debug('Starting to resolve %s using %s' % (host, self)) - self.handlers[host+type] = [on_ready] - self.start_resolve(host, type) + self.handlers[host+type_] = [on_ready] + self.start_resolve(host, type_) - def _on_ready(self, host, type, result_list): + def _on_ready(self, host, type_, result_list): # practically it is impossible to be the opposite, but who knows :) host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) - if not self.resolved_hosts.has_key(host+type): - self.resolved_hosts[host+type] = result_list - if self.handlers.has_key(host+type): - for callback in self.handlers[host+type]: + if not self.resolved_hosts.has_key(host+type_): + self.resolved_hosts[host+type_] = result_list + if self.handlers.has_key(host+type_): + for callback in self.handlers[host+type_]: callback(host, result_list) - del(self.handlers[host+type]) + del(self.handlers[host+type_]) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): pass # FIXME: API usage is not consistent! This one requires that process is called @@ -113,22 +118,22 @@ self.asyncns = libasyncns.Asyncns() CommonResolver.__init__(self) - def start_resolve(self, host, type): - type = libasyncns.ns_t_srv - if type == 'txt': type = libasyncns.ns_t_txt - resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type) - resq.userdata = {'host':host, 'type':type} + def start_resolve(self, host, type_): + type_ = libasyncns.ns_t_srv + if type_ == 'txt': type_ = libasyncns.ns_t_txt + resq = self.asyncns.res_query(host, libasyncns.ns_c_in, type_) + resq.userdata = {'host':host, 'type':type_} # getaddrinfo to be done #def resolve_name(self, dname, callback): #resq = self.asyncns.getaddrinfo(dname) #resq.userdata = {'callback':callback, 'dname':dname} - def _on_ready(self, host, type, result_list): - if type == libasyncns.ns_t_srv: type = 'srv' - elif type == libasyncns.ns_t_txt: type = 'txt' + def _on_ready(self, host, type_, result_list): + if type_ == libasyncns.ns_t_srv: type_ = 'srv' + elif type_ == libasyncns.ns_t_txt: type_ = 'txt' - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) def process(self): try: @@ -153,7 +158,7 @@ continue r['prio'] = r['pref'] hosts.append(r) - self._on_ready(host=requested_host, type=requested_type, + self._on_ready(host=requested_host, type_=requested_type, result_list=hosts) try: resq = self.asyncns.get_next() @@ -277,27 +282,98 @@ 'prio': prio}) return hosts - def _on_ready(self, host, type, result): + def _on_ready(self, host, type_, result): # nslookup finished, parse the result and call the handlers result_list = self.parse_srv_result(host, result) - CommonResolver._on_ready(self, host, type, result_list) + CommonResolver._on_ready(self, host, type_, result_list) - def start_resolve(self, host, type): + def start_resolve(self, host, type_): """ Spawn new nslookup process and start waiting for results """ - ns = NsLookup(self._on_ready, host, type) + ns = NsLookup(self._on_ready, host, type_) ns.set_idlequeue(self.idlequeue) ns.commandtimeout = 20 ns.start() +class HostResolver(CommonResolver): + """ + Asynchronous DNS resolver calling host. Processing of pending requests + is invoked from idlequeue which is watching file descriptor of pipe of + stdout of host process. + """ + + def __init__(self, idlequeue): + self.idlequeue = idlequeue + self.process = False + CommonResolver.__init__(self) + + def parse_srv_result(self, fqdn, result): + """ + Parse the output of host command and return list of properties: + 'host', 'port','weight', 'priority' corresponding to the found srv hosts + """ + # typical output of host command: + # _xmpp-client._tcp.jabber.org has SRV record 30 30 5222 jabber.org. + if not result: + return [] + ufqdn = helpers.ascii_to_idn(fqdn) # Unicode domain name + hosts = [] + lines = result.split('\n') + for line in lines: + if line == '': + continue + domain = None + if line.startswith(fqdn): + domain = fqdn # For nslookup 9.5 + elif helpers.decode_string(line).startswith(ufqdn): + line = helpers.decode_string(line) + domain = ufqdn # For nslookup 9.6 + if domain: + # add 4 for ' has' after domain name + rest = line[len(domain)+4:].split('=') + if len(rest) != 2: + continue + answer_type, props_str = rest + if answer_type.strip() != 'SRV': + continue + props = props_str.strip().split(' ') + if len(props) < 4: + continue + prio, weight, port, host = props[-4:] + if host[-1] == '.': + host = host[:-1] + try: + prio = int(prio) + weight = int(weight) + port = int(port) + except ValueError: + continue + hosts.append({'host': host, 'port': port, 'weight': weight, + 'prio': prio}) + return hosts + + def _on_ready(self, host, type_, result): + # host finished, parse the result and call the handlers + result_list = self.parse_srv_result(host, result) + CommonResolver._on_ready(self, host, type_, result_list) + + def start_resolve(self, host, type_): + """ + Spawn new nslookup process and start waiting for results + """ + ns = Host(self._on_ready, host, type_) + ns.set_idlequeue(self.idlequeue) + ns.commandtimeout = 20 + ns.start() + class NsLookup(IdleCommand): - def __init__(self, on_result, host='_xmpp-client', type='srv'): + def __init__(self, on_result, host='_xmpp-client', type_='srv'): IdleCommand.__init__(self, on_result) self.commandtimeout = 10 self.host = host.lower() - self.type_ = type.lower() + self.type_ = type_.lower() if not host_pattern.match(self.host): # invalid host name log.error('Invalid host: %s' % self.host) @@ -316,6 +392,11 @@ self.result_handler(self.host, self.type_, self.result) self.result_handler = None + +class Host(NsLookup): + def _compose_command_args(self): + return ['host', '-t', self.type_, self.host] + # below lines is on how to use API and assist in testing if __name__ == '__main__': import gobject

1 0

gajim: [Davide Pizzetti] updated italian translation
by Gajim 09 Apr '14

09 Apr '14

changeset 21c576b271a2 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=21c576b271a2 description: [Davide Pizzetti] updated italian translation diffstat: po/it.po | 792 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 402 insertions(+), 390 deletions(-) diffs (truncated from 2424 to 300 lines): diff -r 4e54449ea374 -r 21c576b271a2 po/it.po --- a/po/it.po Wed Apr 09 17:47:59 2014 +0400 +++ b/po/it.po Wed Apr 09 16:55:59 2014 +0200 @@ -11,16 +11,16 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-25 14:36+0100\n" -"PO-Revision-Date: 2013-11-15 20:10+0100\n" -"Last-Translator: v <noway(a)insiberia.net>\n" -"Language-Team: Italian <>\n" +"POT-Creation-Date: 2014-04-09 16:54+0200\n" +"PO-Revision-Date: 2014-04-08 22:58+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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 @@ -567,7 +567,7 @@ #: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366 msgid "I would like to add you to my contact list." -msgstr "Vorrei aggiungerti al mio elenco dei contatti." +msgstr "Vorrei aggiungerti all'elenco dei miei contatti." #. displaying the window #: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104 @@ -747,7 +747,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:676 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 #: ../src/roster_window.py:5840 ../src/roster_window.py:5974 msgid "_Unblock" msgstr "_Sblocca" @@ -914,7 +914,7 @@ #: ../data/gui/chat_to_muc_window.ui.h:1 msgid "Invite Friends!" -msgstr "Invita degli Amici!" +msgstr "Invita degli amici!" #: ../data/gui/chat_to_muc_window.ui.h:2 msgid "" @@ -938,17 +938,17 @@ #: ../data/gui/contact_context_menu.ui.h:1 msgid "Start _Chat" -msgstr "Inizia _Conversazione" +msgstr "Inizia una _conversazione" #. 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/gui_menu_builder.py:586 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:584 msgid "Send Single _Message..." -msgstr "Invia _Messaggio Singolo..." +msgstr "Invia un _messaggio singolo..." #: ../data/gui/contact_context_menu.ui.h:3 msgid "Send _File..." -msgstr "Invia _File..." +msgstr "Invia un _file..." #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 @@ -959,33 +959,33 @@ #: ../data/gui/contact_context_menu.ui.h:5 msgid "Invite _Contacts" -msgstr "Invita Contatti" +msgstr "Invita dei _contatti" #: ../data/gui/contact_context_menu.ui.h:6 msgid "Toggle Open_PGP Encryption" -msgstr "Attiva Cifratura Open_PGP" +msgstr "Attiva/disattiva la cifratura Open_PGP" #: ../data/gui/contact_context_menu.ui.h:7 msgid "Toggle End to End Encryption" -msgstr "Attiva Cifratura End-to-End" +msgstr "Attiva la cifratura End-to-End" #. Send Custom Status -#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:600 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 #: ../src/roster_window.py:5781 msgid "Send Cus_tom Status" -msgstr "Invia S_tato Personalizzato" +msgstr "Invia uno s_tato personalizzato" #. Execute Command -#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:636 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:634 msgid "E_xecute Command..." -msgstr "E_segui Comando..." +msgstr "E_segui un comando..." #: ../data/gui/contact_context_menu.ui.h:10 msgid "M_anage Contact" -msgstr "_Gestisci Contatto" +msgstr "_Gestisci il contatto" #. Rename -#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:663 +#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 #: ../src/roster_window.py:5821 msgid "_Rename..." msgstr "_Rinomina..." @@ -993,19 +993,19 @@ #. Edit Groups #: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 msgid "Edit _Groups..." -msgstr "Modifica _Gruppi..." +msgstr "Modifica i _gruppi..." #: ../data/gui/contact_context_menu.ui.h:13 msgid "Assign Open_PGP Key..." -msgstr "Assegna Chiave Open_PGP..." +msgstr "Assegna una chiave Open_PGP..." #: ../data/gui/contact_context_menu.ui.h:14 msgid "Set Custom _Avatar..." -msgstr "Imposta _Avatar Personalizzato..." +msgstr "Imposta un _avatar personalizzato..." #: ../data/gui/contact_context_menu.ui.h:15 msgid "Add Special _Notification..." -msgstr "Aggiungi _Notifica Speciale..." +msgstr "Aggiungi una _notifica speciale..." #: ../data/gui/contact_context_menu.ui.h:16 msgid "_Subscription" @@ -1024,7 +1024,7 @@ msgstr "_Proibisci al contatto di vedere il mio stato" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:679 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 #: ../src/roster_window.py:5848 ../src/roster_window.py:5980 msgid "_Block" msgstr "_Blocca" @@ -1039,7 +1039,7 @@ #. Remove #. Remove group -#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:689 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 #: ../src/roster_window.py:5858 msgid "Remo_ve" msgstr "_Elimina" @@ -1053,7 +1053,7 @@ #: ../data/gui/data_form_window.ui.h:1 msgid "Room Configuration" -msgstr "Configurazione della Stanza" +msgstr "Configurazione della stanza" #: ../data/gui/data_form_window.ui.h:2 msgid "Fill in the form." @@ -1061,7 +1061,7 @@ #: ../data/gui/edit_groups_dialog.ui.h:1 msgid "Edit Groups" -msgstr "Modifica Gruppi" +msgstr "Modifica i gruppi" #: ../data/gui/esession_info_window.ui.h:1 msgid "(ESession info)" @@ -1081,7 +1081,7 @@ #: ../data/gui/filetransfers.ui.h:1 msgid "File Transfers" -msgstr "Trasferimenti File" +msgstr "Trasferimenti di file" #: ../data/gui/filetransfers.ui.h:2 msgid "Shows a list of file transfers between you and others" @@ -1106,7 +1106,7 @@ #: ../data/gui/filetransfers.ui.h:7 msgid "Clean _up" -msgstr "P_ulizia" +msgstr "P_ulisci" #: ../data/gui/filetransfers.ui.h:8 msgid "Removes completed, cancelled and failed file transfers from the list" @@ -1135,7 +1135,7 @@ #: ../data/gui/filetransfers.ui.h:13 msgid "Cancel file transfer" -msgstr "Annulla trasferimento file" +msgstr "Annulla il trasferimento del file" #: ../data/gui/filetransfers.ui.h:14 msgid "Cancels the selected file transfer" @@ -1159,11 +1159,11 @@ #: ../data/gui/gajim_themes_window.ui.h:4 msgid "Chat Banner" -msgstr "Banner della Conversazione" +msgstr "Banner della conversazione" #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Gajim Themes Customization" -msgstr "Personalizzazione Temi Gajim" +msgstr "Personalizzazione dei temi di Gajim" #: ../data/gui/gajim_themes_window.ui.h:6 msgid "Text _color:" @@ -1299,9 +1299,9 @@ #: ../data/gui/gc_occupants_menu.ui.h:12 msgid "_Add to Roster" -msgstr "_Aggiungi all'elenco dei contatti" - -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1730 +msgstr "_Aggiungi all'elenco dei tuoi contatti" + +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1728 msgid "Show a list of formattings" msgstr "Mostra un elenco di formattazioni" @@ -1503,7 +1503,7 @@ msgid "Bro_wse Rooms" msgstr "Esp_lora le stanze" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3414 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 #: ../src/disco.py:1412 ../src/disco.py:1854 msgid "_Join" msgstr "_Unisciti" @@ -1728,7 +1728,8 @@ #: ../data/gui/preferences_window.ui.h:13 msgid "Detached roster with single chat" -msgstr "Elenco dei contatti separato con una finestra di conversazione unica" +msgstr "" +"Elenco dei tuoi contatti separato con una finestra di conversazione unica" #: ../data/gui/preferences_window.ui.h:14 msgid "Single window for everything" @@ -1821,7 +1822,7 @@ #: ../data/gui/preferences_window.ui.h:32 msgid "_Ignore rich content in incoming messages" -msgstr "_Ignora contenuto ricco nei messaggi in arrivo" +msgstr "_Ignora il contenuto ricco nei messaggi in arrivo" #: ../data/gui/preferences_window.ui.h:33 msgid "" @@ -1849,11 +1850,11 @@ #: ../data/gui/preferences_window.ui.h:36 msgid "_Show roster on startup:" -msgstr "Mo_stra lista contatti all'avvio di Gajim" +msgstr "Mo_stra l'elenco dei tuoi contatti all'avvio di Gajim:" #: ../data/gui/preferences_window.ui.h:37 msgid "Show icon when your messages are received" -msgstr "Mostra icona quando i tuoi messaggi vengono ricevuti" +msgstr "Mostra un'icona quando i tuoi messaggi vengono ricevuti" #: ../data/gui/preferences_window.ui.h:38 msgid "" @@ -1935,7 +1936,7 @@ #: ../data/gui/preferences_window.ui.h:54 msgid "Play _sounds" -msgstr "Riproduci _suoni" +msgstr "Riproduci dei _suoni" #: ../data/gui/preferences_window.ui.h:55 msgid "Ma_nage..." @@ -1943,7 +1944,7 @@ #: ../data/gui/preferences_window.ui.h:56 msgid "Allow sound when I'm _busy" -msgstr "Consenti la riproduzione di suoni quando sono occupato" +msgstr "Consenti la riproduzione di suoni quando sono _occupato" #: ../data/gui/preferences_window.ui.h:57 msgid "Sounds" @@ -1965,7 +1966,7 @@ #: ../data/gui/preferences_window.ui.h:60 msgid "_Display chat state notifications:" -msgstr "Visualizza notifiche sugli stati:" +msgstr "_Visualizza delle notifiche sugli stati:" #: ../data/gui/preferences_window.ui.h:61

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 09 Apr '14

09 Apr '14

changeset 4e54449ea374 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=4e54449ea374 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 927 +++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 458 вставок(+), 469 удалений(-) различия (урезанные с 2672 до 300 строк): diff -r 6c3053fc7a12 -r 4e54449ea374 po/he.po --- a/po/he.po Sun Apr 06 12:05:01 2014 +0200 +++ b/po/he.po Wed Apr 09 17:47:59 2014 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-24 03:05+0000\n" -"PO-Revision-Date: 2014-02-20 18:25+0200\n" +"POT-Creation-Date: 2014-04-09 07:58+0300\n" +"PO-Revision-Date: 2014-04-09 08:21+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -106,7 +106,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 msgid "If checked, Gajim will remember the password for this account" -msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את הסיסמה עבור חשבון זה" +msgstr "כאשר מסומן, Gajim יזכור את הסיסמה עבור חשבון זה" #: ../data/gui/account_creation_wizard_window.ui.h:11 #: ../data/gui/accounts_window.ui.h:23 @@ -323,14 +323,12 @@ msgstr "התחבר בעת ה_פעלת Gajim" # BUG: a dot at the end -# כאשר משוגר #: ../data/gui/accounts_window.ui.h:30 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות " -"חשבון זה" +"כאשר מסומן, Gajim, בעת שיגור, יתחבר אוטומטית אל jabber באמצעות חשבון זה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:31 @@ -357,8 +355,8 @@ "bottom of the roster window) will change the status of this account " "accordingly" msgstr "" -"במידה ואפשרות זו מסומנת, כל שינוי אל מצב החיבור הגלובלי (מטופל על ידי תיבת " -"הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +"כאשר מסומן, כל שינוי אל מצב החיבור הגלובלי (מטופל על ידי תיבת הבחירה שמצויה " +"בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 @@ -370,9 +368,9 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏" -"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלפעולת העברת קובץ יהיו " -"סיכויים גדולים יותר לעבוד." +"כאשר מסומן, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏Internet Protocol) " +"שלך, מספר כתובות IP נוספות, כך שלפעולת העברת קובץ יהיו סיכויים גדולים יותר " +"לעבוד." # (קבוצה כללית) #. FIXME: Ugly workaround. @@ -421,8 +419,8 @@ "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של " -"חיבור (connection timeout) אשר מביאה לידי ניתוק" +"כאשר מסומן, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של חיבור " +"(connection timeout) אשר מביאה לידי ניתוק" #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" @@ -461,8 +459,7 @@ # BUG: a dot at the end #: ../data/gui/accounts_window.ui.h:53 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" -msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יאחזר את הסיסמה מתוך סוכן GPG כגון seahorse" +msgstr "כאשר מסומן, Gajim יאחזר את הסיסמה מתוך סוכן GPG כגון seahorse" #: ../data/gui/accounts_window.ui.h:54 msgid "OpenPGP" @@ -503,7 +500,7 @@ "setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"במידה והפורט המשתמט שמצוי בשימוש עבור הודעות נכנסות איננו מתאים עבור התקנתך " +"כאשר הפורט המשתמט אשר מצוי בשימוש עבור הודעות נכנסות איננו מתאים עבור התקנתך " "באפשרותך לבחור פורט אחר כאן.\n" "ייתכן כי יהיה ברצונך לשקול לשנות הגדרות חומת אש אפשריות." @@ -778,7 +775,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:676 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:674 #: ../src/roster_window.py:5840 ../src/roster_window.py:5974 msgid "_Unblock" msgstr "_בטל חסימה" @@ -974,7 +971,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/gui_menu_builder.py:586 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:584 msgid "Send Single _Message..." msgstr "שליחת הודעה _בודדת..." @@ -1003,13 +1000,13 @@ msgstr "הפעל הצפנת קצה אל קצה" #. Send Custom Status -#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:600 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 #: ../src/roster_window.py:5781 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" #. Execute Command -#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:636 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:634 msgid "E_xecute Command..." msgstr "הרצת _פקודה..." @@ -1018,7 +1015,7 @@ msgstr "_נהל איש קשר" #. Rename -#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:663 +#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 #: ../src/roster_window.py:5821 msgid "_Rename..." msgstr "_שינוי שם..." @@ -1057,7 +1054,7 @@ msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:679 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 #: ../src/roster_window.py:5848 ../src/roster_window.py:5980 msgid "_Block" msgstr "_חסום" @@ -1072,7 +1069,7 @@ #. Remove #. Remove group -#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:689 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 #: ../src/roster_window.py:5858 msgid "Remo_ve" msgstr "הס_ר" @@ -1154,7 +1151,7 @@ "This action removes single file transfer from the list. If the transfer is " "active, it is first stopped and then removed" msgstr "" -"פעולה זו מסירה העברת קובץ בודדת מתוך הרשימה. במידה וההעברה פעילה, היא תיעצר " +"פעולה זו מסירה העברת קובץ בודדת מתוך הרשימה. כאשר ההעברה פעילה, היא תיעצר " "תחילה ולאחר מכן היא תוסר" #: ../data/gui/filetransfers.ui.h:11 @@ -1334,7 +1331,7 @@ msgid "_Add to Roster" msgstr "הו_סף אל רשימה" -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1730 +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1728 msgid "Show a list of formattings" msgstr "הצגת רשימת עיצובים" @@ -1543,7 +1540,7 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3414 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 #: ../src/disco.py:1412 ../src/disco.py:1854 msgid "_Join" msgstr "_כנס" @@ -1573,7 +1570,7 @@ # אתחול #: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "If checked, Gajim will join this group chat on startup" -msgstr "במידה ואפשרות זו מסומנת, Gajim יצטרף אל שיחת קבוצה זו בעת הפעלה" +msgstr "כאשר מסומן, Gajim יצטרף אל שיחת קבוצה זו בעת הפעלה" #: ../data/gui/manage_bookmarks_window.ui.h:10 msgid "Minimi_ze on Auto Join" @@ -1779,7 +1776,7 @@ #: ../data/gui/preferences_window.ui.h:14 msgid "Single window for everything" -msgstr "חלון בודד עבור כל החלונות" +msgstr "חלון מאוגד עבור כל החלונות" #: ../data/gui/preferences_window.ui.h:15 msgid "Detached roster with chat grouped by account" @@ -1808,8 +1805,7 @@ "If checked, Gajim will display avatars of contacts in roster window and in " "group chats" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יציג אווטארים של אנשי קשר בחלון הרשימה ובתוך " -"שיחות קבוצה" +"כאשר מסומן, Gajim יציג אווטארים של אנשי קשר בחלון הרשימה ובתוך שיחות קבוצה" #: ../data/gui/preferences_window.ui.h:21 msgid "Display status _messages of contacts in roster" @@ -1822,8 +1818,8 @@ "If checked, Gajim will display status messages of contacts under the contact " "name in roster window and in group chats" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יציג את הודעות המצב של אנשי קשר תחת שם איש " -"קשר בתוך חלון הרשימה וגם בתוך שיחות קבוצה" +"כאשר מסומן, Gajim יציג את הודעות המצב של אנשי קשר תחת שם איש קשר בתוך חלון " +"הרשימה וגם בתוך שיחות קבוצה" #: ../data/gui/preferences_window.ui.h:23 msgid "Display e_xtra information of contacts in roster (mood, activity, ...)" @@ -1833,8 +1829,7 @@ #: ../data/gui/preferences_window.ui.h:24 msgid "" "If checked, Gajim will display the mood of contacts in the roster window" -msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יציג את מצבי הרוח של אנשי קשר בחלון הרשימה" +msgstr "כאשר מסומן, Gajim יציג את מצבי הרוח של אנשי קשר בחלון הרשימה" #: ../data/gui/preferences_window.ui.h:25 msgid "Sort contacts by status" @@ -1874,8 +1869,8 @@ "Some messages may include rich content (formatting, colors etc). If checked, " "Gajim will just display the raw message text." msgstr "" -"ייתכן כי הודעות מסוימות יכילו תוכן עשיר (עיצוב, צבעים וכו׳). במידה ואפשרות " -"זו מסומנת, Gajim יציג רק את התמליל הגולמי אשר מצוי בהודעה." +"ייתכן כי הודעות מסוימות יכילו תוכן עשיר (עיצוב, צבעים וכו׳). כאשר מסומן, " +"Gajim יציג רק את התמליל הגולמי אשר מצוי בהודעה." #: ../data/gui/preferences_window.ui.h:34 msgid "_Highlight misspelled words" @@ -1887,9 +1882,9 @@ "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." msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יבליט שגיאות כתיב בשדות קלט של חלונות שיחה. " -"במידה ולא צוינה במפורש באמצעות מקש ימני על שדה הקלט, השפה המשתמטת תהיה " -"בשימוש עבור איש קשר זה או שיחת קבוצה." +"כאשר מסומן, Gajim יבליט שגיאות כתיב בשדות קלט של חלונות שיחה. כאשר לא מצוינת " +"במפורש באמצעות מקש ימני על שדה הקלט, השפה המשתמטת תהיה בשימוש עבור איש קשר " +"זה או שיחת קבוצה." #: ../data/gui/preferences_window.ui.h:36 msgid "_Show roster on startup:" @@ -1905,8 +1900,8 @@ "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent " "animated or static graphical emoticons" msgstr "" -"במידה ואפשרות זו לא מנוטרלת, Gajim יחליף סמיילים אשר מורכבים מתווי ascii " -"כגון ':)' עם רגשונים ציוריים תואמים (מונפשים או סטטיים)" +"כאשר לא מנוטרלת, Gajim יחליף סמיילים אשר מורכבים מתווי ascii כגון ':)' עם " +"רגשונים ציוריים תואמים (מונפשים או סטטיים)" #: ../data/gui/preferences_window.ui.h:39 msgid "_Emoticons:" @@ -1950,8 +1945,7 @@ msgid "" "If checked, Gajim will show a notification when a new e-mail is received via " "GMail" -msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יציג התראה כאשר דוא״ל חדש מתקבל דרך GMail" +msgstr "כאשר מסומן, Gajim יציג התראה כאשר דוא״ל חדש מתקבל דרך GMail" #: ../data/gui/preferences_window.ui.h:49 msgid "Display _extra email details" @@ -1963,8 +1957,7 @@ "If checked, Gajim will also include information about the sender of new " "emails" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יכיל גם מידע אודות הממען של ההודעות " -"האלקטרוניות החדשות." +"כאשר מסומן, Gajim יכיל גם מידע אודות הממען של ההודעות האלקטרוניות החדשות." #: ../data/gui/preferences_window.ui.h:51 msgid "GMail Options" @@ -2042,8 +2035,7 @@ #: ../data/gui/preferences_window.ui.h:66 msgid "" "If checked, Gajim will change status to Away when the computer is unused." -msgstr "" -"במידה ואפשרות זו מסומנת, Gajim ישנה מצב אל נעדר כאשר המחשב לא מצוי בשימוש." +msgstr "כאשר מסומן, Gajim ישנה מצב אל נעדר כאשר המחשב לא מצוי בשימוש." #: ../data/gui/preferences_window.ui.h:67 msgid "_Not available after:" @@ -2055,8 +2047,8 @@ "If checked, Gajim will change status to Not Available when the computer has " "not been used even longer" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim ישנה מצב אל לא זמין כאשר המחשב לא מצוי בשימוש "

1 0

gajim: remove wrong .decode()
by Gajim 08 Apr '14

08 Apr '14

changeset 9dbca6d480c4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9dbca6d480c4 description: remove wrong .decode() diffstat: src/common/jingle_xtls.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 182aaa7fab1a -r 9dbca6d480c4 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Apr 08 22:36:19 2014 +0200 +++ b/src/common/jingle_xtls.py Tue Apr 08 22:47:43 2014 +0200 @@ -290,8 +290,7 @@ os.chmod(filepath + '.pkey', 0o600) f.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, key)) with open(filepath + '.cert', 'wb') as f: - f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode( - 'utf-8')) + f.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert)) if __name__ == '__main__':

1 0

gajim: fix typo
by Gajim 08 Apr '14

08 Apr '14

changeset 182aaa7fab1a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=182aaa7fab1a description: fix typo diffstat: src/common/jingle_xtls.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 8140a766fe30 -r 182aaa7fab1a src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Sat Mar 29 18:27:48 2014 +0100 +++ b/src/common/jingle_xtls.py Tue Apr 08 22:36:19 2014 +0200 @@ -194,7 +194,7 @@ if cert: try: digest_algo = cert.get_signature_algorithm().split('With')[0] - except AttributeError as e: + except AttributeError as e: # Old py-OpenSSL is missing get_signature_algorithm digest_algo = "sha256" if cert.digest(digest_algo) == fingerprint: @@ -251,7 +251,7 @@ req.sign(pkey, digest) return req -def createCertificate(req, issuerCert, issuerKey, serial, notBefore, notAfter, digest="shai256"): +def createCertificate(req, issuerCert, issuerKey, serial, notBefore, notAfter, digest="sha256"): """ Generate a certificate given a certificate request.

1 0

python-nbxmpp: idlequeue uses time in microseconds (even with Py...
by Python-nbxmpp 06 Apr '14

06 Apr '14

changeset fb11bbe7c37a in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=fb11bbe7c37a description: idlequeue uses time in microseconds (even with Python 2). diffstat: nbxmpp/idlequeue.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (24 lines): diff -r 1ac06e5b152d -r fb11bbe7c37a nbxmpp/idlequeue.py --- a/nbxmpp/idlequeue.py Sun Apr 06 17:28:50 2014 +0200 +++ b/nbxmpp/idlequeue.py Sun Apr 06 17:44:38 2014 +0200 @@ -529,10 +529,6 @@ Creates a dict, which maps file/pipe/sock descriptor to glib event id """ self.events = {} - if sys.version_info[0] == 2: - self.current_time = gobject.get_current_time - else: - self.current_time = GLib.get_real_time def _add_idle(self, fd, flags): """ @@ -571,3 +567,9 @@ def process(self): self._check_time_events() + + if sys.version_info[0] == 2: + def current_time(self): + return gobject.get_current_time() * 1e6 + else: + current_time = GLib.get_real_time

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits