Commits

commits@gajim.org

17632 discussions

gajim: refactoring
by Jefry Lagrange 18 Sep '12

18 Sep '12

changeset 739f86c4c606 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=739f86c4c606 description: refactoring diffstat: src/common/jingle.py | 4 ++-- src/common/jingle_ft.py | 2 +- src/common/jingle_ftstates.py | 38 +++++++++++++++++--------------------- src/common/socks5.py | 25 +++++++++++-------------- 4 files changed, 31 insertions(+), 38 deletions(-) diffs (223 lines): diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle.py --- a/src/common/jingle.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle.py Tue Sep 18 00:12:07 2012 -0400 @@ -197,8 +197,8 @@ def get_files_info(self, hash_=None, name=None): if hash_: for f in self.files: # DEBUG - #if f['hash'] == '1294809248109223': - if f['hash'] == hash_: + if f['hash'] == '1294809248109223': + #if f['hash'] == hash_: return f elif name: for f in self.files: diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle_ft.py Tue Sep 18 00:12:07 2012 -0400 @@ -155,7 +155,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) # DEBUG - #hash_ = '1294809248109223' + hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle_ftstates.py Tue Sep 18 00:12:07 2012 -0400 @@ -153,37 +153,34 @@ streamhost_used = self.jft.nominated_cand['peer-cand'] if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True - # This needs to be changed when requesting - if self.jft.weinitiate: + if self.jft.file_props.type_ == 's' and self.jft.weinitiate: self.jft.file_props.proxy_sender = streamhost_used['initiator'] self.jft.file_props.proxy_receiver = streamhost_used['target'] else: self.jft.file_props.proxy_sender = streamhost_used['target'] self.jft.file_props.proxy_receiver = streamhost_used[ 'initiator'] - # This needs to be changed when requesting - if not self.jft.weinitiate and streamhost_used['type'] == 'proxy': - r = gajim.socks5queue.readers - for reader in r: - if r[reader].host == streamhost_used['host'] and \ - r[reader].connected: - return - # This needs to be changed when requesting - if self.jft.weinitiate and streamhost_used['type'] == 'proxy': - s = gajim.socks5queue.senders - for sender in s: - if s[sender].host == streamhost_used['host'] and \ - s[sender].connected: - return - if streamhost_used['type'] == 'proxy': + if self.jft.file_props.type_ == 's': + s = gajim.socks5queue.senders + for sender in s: + if s[sender].host == streamhost_used['host'] and \ + s[sender].connected: + return + elif self.jft.file_props.type_ == 'r': + r = gajim.socks5queue.readers + for reader in r: + if r[reader].host == streamhost_used['host'] and \ + r[reader].connected: + return + else: + raise TypeError self.jft.file_props.streamhost_used = True streamhost_used['sid'] = self.jft.file_props.sid self.jft.file_props.streamhosts = [] self.jft.file_props.streamhosts.append(streamhost_used) self.jft.file_props.proxyhosts = [] self.jft.file_props.proxyhosts.append(streamhost_used) - # This needs to be changed when requesting - if self.jft.weinitiate: + if self.jft.file_props.type_ == 's': gajim.socks5queue.idx += 1 idx = gajim.socks5queue.idx sockobj = Socks5SenderClient(gajim.idlequeue, idx, @@ -198,7 +195,7 @@ sockobj.proxy = True sockobj.streamhost = streamhost_used gajim.socks5queue.add_sockobj(self.jft.session.connection.name, - sockobj, 'sender') + sockobj) streamhost_used['idx'] = sockobj.queue_idx # If we offered the nominated candidate used, we activate # the proxy @@ -214,7 +211,6 @@ def action(self, args=None): if self.jft.transport.type_ == TransportType.IBB: self.__start_IBB_transfer(self.jft.session.connection) - elif self.jft.transport.type_ == TransportType.SOCKS5: self.__start_SOCK5_transfer() diff -r 1303dd690373 -r 739f86c4c606 src/common/socks5.py --- a/src/common/socks5.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/socks5.py Tue Sep 18 00:12:07 2012 -0400 @@ -83,7 +83,6 @@ authentication using sid for generated SHA """ sid = file_props.sid - self.type_ = typ # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or self.listener.connections == []: self.listener = Socks5Listener(self.idlequeue, port, file_props, @@ -135,7 +134,7 @@ else: fp = fingerprint if receiving: - self.type_ = 'receiver' + file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) @@ -145,7 +144,7 @@ else: idx = self.idx self.idx = self.idx + 1 - self.type_ = 'sender' + file_props.type_ = 's' if 'type' in streamhost and streamhost['type'] == 'proxy': file_props.is_a_proxy = True file_props.proxy_sender = streamhost['target'] @@ -155,7 +154,7 @@ port=int(streamhost['port']),fingerprint=fp, connected=False, file_props=file_props) socks5obj.streamhost = streamhost - self.add_sockobj(account, socks5obj, type_='sender') + self.add_sockobj(account, socks5obj) streamhost['idx'] = socks5obj.queue_idx @@ -168,7 +167,7 @@ if host != streamhost and 'idx' in host: if host['state'] == 1: # remove current - if self.type_ == 'sender': + if file_props.type_ == 's': self.remove_sender(streamhost['idx'], False) else: self.remove_receiver(streamhost['idx']) @@ -176,7 +175,7 @@ # set state -2, meaning that this streamhost is stopped, # but it may be connectected later if host['state'] >= 0: - if self.type_ == 'sender': + if file_props.type_ == 's': self.remove_sender(host['idx'], False) else: self.remove_receiver(host['idx']) @@ -239,12 +238,12 @@ file_props.failure_cb(file_props.sid) file_props.failure_cb = None - def add_sockobj(self, account, sockobj, type_='receiver'): + def add_sockobj(self, account, sockobj): """ Add new file a sockobj type receiver or sender, and use it to connect to server """ - if type_ == 'receiver': + if sockobj.file_props.type_ == 'r': self._add(sockobj, self.readers, sockobj.file_props, self.idx) else: self._add(sockobj, self.senders, sockobj.file_props, self.idx) @@ -327,7 +326,7 @@ def on_connection_accepted(self, sock, listener): sock_hash = sock.__hash__() - if self.type_ == 'sender' and \ + if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, sock[0], sock[1][0], sock[1][1], fingerprint='server', @@ -336,7 +335,7 @@ # Start waiting for data self.idlequeue.plug_idle(sockobj, False, True) self.connected += 1 - if self.type_ == 'receiver' and \ + if listener.file_props.type_ == 'r' and \ not self.isHashInSockObjs(self.readers, sock_hash): sh = {} sh['host'] = sock[1][0] @@ -441,7 +440,6 @@ self.remaining_buff = '' self.file = None self.connected = False - self.type_ = '' self.mode = '' def _is_connected(self): @@ -914,7 +912,6 @@ self.file_props.elapsed_time = 0 self.file_props.last_time = self.idlequeue.current_time() self.file_props.received_len = 0 - self.type_ = 'sender' def start_transfer(self): """ @@ -1076,7 +1073,7 @@ self.disconnect() elif self.state == 5: self.state = 7 - if self.type_ == 'sender': + if self.file_props.type_ == 's': # We wait for the end of the negotiation to # send the file self.idlequeue.plug_idle(self, False, False) @@ -1186,7 +1183,7 @@ if self.queue.on_success: result = self.queue.send_success_reply(self.file_props, self.streamhost) - if self.type_ == 'sender' and self.proxy: + if self.file_props.type_ == 's' and self.proxy: self.queue.process_result(self.send_file(), self) return if result == 0:

1 0

gajim: correctly check is zeroconf account is connected. see #7199
by Yann Leboulanger 17 Sep '12

17 Sep '12

changeset 1303dd690373 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1303dd690373 description: correctly check is zeroconf account is connected. see #7199 diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ead9d19d0ee5 -r 1303dd690373 src/statusicon.py --- a/src/statusicon.py Sun Sep 16 20:54:07 2012 +0200 +++ b/src/statusicon.py Mon Sep 17 11:53:47 2012 +0200 @@ -256,7 +256,7 @@ item.connect('activate', self.on_show_menuitem_activate, 'offline') iskey = connected_accounts > 0 and not (connected_accounts == 1 and - gajim.connections[gajim.connections.keys()[0]].is_zeroconf) + gajim.zeroconf_is_connected()) chat_with_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) join_gc_menuitem.set_sensitive(iskey)

1 0

gajim: re-request file transfer to the correct resource
by Yann Leboulanger 16 Sep '12

16 Sep '12

changeset ead9d19d0ee5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ead9d19d0ee5 description: re-request file transfer to the correct resource diffstat: src/filetransfers_window.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (36 lines): diff -r 9351f657ac8e -r ead9d19d0ee5 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Sep 15 10:39:35 2012 -0400 +++ b/src/filetransfers_window.py Sun Sep 16 20:54:07 2012 +0200 @@ -249,13 +249,17 @@ def show_hash_error(self, jid, file_props, account): - def on_yes(dummy): + def on_yes(dummy, fjid, file_props, account): # Delete old file os.remove(file_props.file_name) + jid, resource = gajim.get_room_and_nick_from_fjid(fjid) + if resource: + contact = gajim.contacts.get_contact(account, jid, resource) + else: + contact = gajim.contacts.get_contact_with_highest_priority( + account, jid) + fjid = contact.get_full_jid() # Request the file to the sender - contact = gajim.contacts.get_contact_with_highest_priority(account, - jid) - fjid = contact.get_full_jid() sid = helpers.get_random_string_16() new_file_props = FilesProp.getNewFileProp(account, sid) new_file_props.file_name = file_props.file_name @@ -278,8 +282,8 @@ dialogs.YesNoDialog(('File transfer error'), _('The file %(file)s has been fully received, but it seems to be ' 'wrongly received.\nDo you want to reload it?') % \ - {'file': file_name}, on_response_yes=on_yes, - type_=gtk.MESSAGE_ERROR) + {'file': file_name}, on_response_yes=(on_yes, jid, file_props, + account), type_=gtk.MESSAGE_ERROR) def show_file_send_request(self, account, contact): win = gtk.ScrolledWindow()

1 0

gajim: IBB supports file request
by Jefry Lagrange 15 Sep '12

15 Sep '12

changeset 9351f657ac8e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9351f657ac8e description: IBB supports file request diffstat: src/common/jingle_ft.py | 21 +++++++++++++++------ src/common/jingle_session.py | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diffs (65 lines): diff -r 25cc05720fe1 -r 9351f657ac8e src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Sep 11 21:53:20 2012 +0400 +++ b/src/common/jingle_ft.py Sat Sep 15 10:39:35 2012 -0400 @@ -69,13 +69,15 @@ self.callbacks['iq-result'] += [self.__on_iq_result] self.use_security = use_security self.file_props = file_props - if file_props is None: - self.weinitiate = False - else: - self.weinitiate = True + self.weinitiate = self.session.weinitiate + self.werequest = self.session.werequest if self.file_props is not None: - self.file_props.sender = session.ourjid - self.file_props.receiver = session.peerjid + if self.session.werequest: + self.file_props.sender = self.session.peerjid + self.file_props.receiver = self.session.ourjid + else: + self.file_props.sender = self.session.ourjid + self.file_props.receiver = self.session.peerjid self.file_props.session_type = 'jingle' self.file_props.sid = session.sid self.file_props.transfered_size = [] @@ -172,6 +174,9 @@ response = stanza.buildReply('result') response.delChild(response.getQuery()) con.connection.send(response) + # If we are requesting we don't have the file + if self.session.werequest: + raise xmpp.NodeProcessed # We send the file self.__state_changed(STATE_TRANSFERING) raise xmpp.NodeProcessed @@ -359,6 +364,10 @@ else: return self.weinitiate + def start_IBB_transfer(self): + if self.file_props.type_ == 's': + self.__state_changed(STATE_TRANSFERING) + def get_content(desc): return JingleFileTransfer diff -r 25cc05720fe1 -r 9351f657ac8e src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Sep 11 21:53:20 2012 +0400 +++ b/src/common/jingle_session.py Sat Sep 15 10:39:35 2012 -0400 @@ -366,7 +366,6 @@ error_name = child.getName() self.__dispatch_error(error_name, text, error.getAttr('type')) - # FIXME: Not sure when we would want to do that... def transport_replace(self): transport = JingleTransportIBB() # For debug only, delete this and replace for a function @@ -399,6 +398,7 @@ self.contents[(creator,name)].state = STATE_TRANSPORT_REPLACE self.__ack(stanza, jingle, error, action) self.__session_accept() + self.contents[(creator,name)].start_IBB_transfer() else: stanza, jingle = self.__make_jingle('transport-reject') content = jingle.setTag('content', attrs={'creator': creator,

1 0

gajim: [Darlan]. Update Hebrew translation.
by Fomin Denis 11 Sep '12

11 Sep '12

changeset 25cc05720fe1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25cc05720fe1 description: [Darlan]. Update Hebrew translation. diffstat: po/he.po | 429 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 218 insertions(+), 211 deletions(-) diffs (truncated from 1657 to 300 lines): diff -r e777df0d7025 -r 25cc05720fe1 po/he.po --- a/po/he.po Sun Sep 09 14:28:56 2012 +0400 +++ b/po/he.po Tue Sep 11 21:53:20 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-08-18 10:37+0200\n" +"PO-Revision-Date: 2012-09-11 13:47+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -65,7 +65,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "‏Gajim: אשף יצירת חשבון" +msgstr "‫Gajim: אשף יצירת חשבון" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -90,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מהאפשרויות הבאות:" +msgstr "נא לבחור באחת מן האפשרויות הבאות:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 @@ -101,13 +101,12 @@ #: ../data/gui/accounts_window.ui.h:22 #: ../data/gui/manage_bookmarks_window.ui.h:2 msgid "_Password:" -msgstr "_מילת־מעבר:" - -# שמירת סיסמא +msgstr "סיס_מה:" + #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "שמירת מילת־מע_בר" +msgstr "שמי_רת סיסמה" # BUG: a dot at the end # From: Clipman @@ -118,12 +117,12 @@ #: ../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 msgid "_Jabber ID:" -msgstr "‏_JID:" +msgstr "‫_JID:" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Anon_ymous authentication" @@ -262,7 +261,7 @@ #: ../data/gui/accounts_window.ui.h:8 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, תלוי במספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account @@ -289,22 +288,23 @@ #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" -msgstr "שי_נוי מילת־מעבר" +msgstr "שי_נוי סיסמה" # Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" -msgstr "שינוי מילת־המעבר של החשבון" +msgstr "שינוי הסיסמה של החשבון" # מנהל, ניהול #: ../data/gui/accounts_window.ui.h:14 msgid "Administration operations" msgstr "פעולות הנהלת מערכת" +# BUG: from a jabber # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים משרת ה־jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" +msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" @@ -426,7 +426,7 @@ #: ../data/gui/accounts_window.ui.h:42 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת מילת־המעבר שלך על פני חיבור לא מאובטח." +msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא מאובטח." # חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 @@ -481,12 +481,12 @@ # 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" # OpenPGP #: ../data/gui/accounts_window.ui.h:54 msgid "OpenPGP" -msgstr "‏OpenPGP" +msgstr "‫OpenPGP" #: ../data/gui/accounts_window.ui.h:55 msgid "_Edit Personal Information..." @@ -550,7 +550,7 @@ #: ../src/config.py:1862 #: ../src/dialogs.py:838 msgid "Jabber ID:" -msgstr "‏JID:" +msgstr "‫JID:" #: ../data/gui/accounts_window.ui.h:68 msgid "Mer_ge accounts" @@ -627,7 +627,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:1 #: ../src/adhoc_commands.py:102 msgid "Ad-hoc Commands - Gajim" -msgstr "פקודות ייעודיות (Ad-hoc) - ‏Gajim" +msgstr "פקודות ייעודיות (‫Ad-hoc) - ‫Gajim" #: ../data/gui/adhoc_commands_window.ui.h:2 msgid "Please wait while retrieving command list..." @@ -730,7 +730,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:10 msgid "Update MOTD..." -msgstr "עידכון MOTD..." +msgstr "עדכון MOTD..." #: ../data/gui/advanced_menuitem_menu.ui.h:11 msgid "Delete MOTD" @@ -839,16 +839,16 @@ #: ../data/gui/change_password_dialog.ui.h:1 msgid "Change Password" -msgstr "שינוי מילת־מעבר" +msgstr "שינוי סיסמה" #: ../data/gui/change_password_dialog.ui.h:2 msgid "Enter new password:" -msgstr "נא להזין מילת־מעבר חדשה:" +msgstr "נא להזין סיסמה חדשה:" # לשם #: ../data/gui/change_password_dialog.ui.h:3 msgid "Enter it again for confirmation:" -msgstr "נא להזין את מילת־המעבר, פעם נוספת, לאימות:" +msgstr "נא להזין את הסיסמה, פעם נוספת, לאימות:" #: ../data/gui/change_status_message_dialog.ui.h:1 msgid "Save as Preset..." @@ -1115,7 +1115,7 @@ # לאיש־קשר זה #: ../data/gui/contact_context_menu.ui.h:17 msgid "_Allow him/her to see my status" -msgstr "_אפשר לאיש־קשר זה לראות את מצב־החיבור שלי" +msgstr "_התר לאיש־קשר זה לראות את מצב־החיבור שלי" # לראות # שלה/שלו @@ -1216,11 +1216,11 @@ #: ../data/gui/filetransfers.ui.h:8 msgid "Remove file transfer from the list." -msgstr "הסרת העברת קובץ מהרשימה." +msgstr "הסרת העברת קובץ מן הרשימה." #: ../data/gui/filetransfers.ui.h:9 msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed" -msgstr "פעולה זו מסירה העברת קובץ בודדת מהרשימה. במידה וההעברה פעילה, ראשית היא תיעצר ולאחר מכן היא תוסר" +msgstr "פעולה זו מסירה העברת קובץ בודדת מן הרשימה. במידה וההעברה פעילה, ראשית היא תיעצר ולאחר מכן היא תוסר" #: ../data/gui/filetransfers.ui.h:10 msgid "Clean _up" @@ -1332,7 +1332,7 @@ "Messages" msgstr "" "הודעות\n" -"‏MUC" +"‫MUC" #: ../data/gui/gajim_themes_window.ui.h:19 msgid "" @@ -1478,7 +1478,7 @@ "If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with." msgstr "" "אזהרה:\n" -"אם בכוונתך לבצע מחיקה בקנה מידה גדול, נא לוודא שהיישום Gajim אינו מורץ. באופן כללי כדאי להימנע ממחיקות עם אנשי־קשר שמשוחחים עימך כעת." +"אם בכוונתך לבצע מחיקה בקנה מידה גדול, נא לוודא שהיישום Gajim אינו מורץ. באופן כללי מוטב להימנע ממחיקות עם אנשי־קשר שמשוחחים עימך כעת." #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" @@ -1619,7 +1619,7 @@ #: ../data/gui/join_groupchat_window.ui.h:5 msgid "Password:" -msgstr "מילת־מעבר:" +msgstr "סיסמה:" # כאשר אני מתחבר/ת #: ../data/gui/join_groupchat_window.ui.h:6 @@ -1680,7 +1680,7 @@ #: ../data/gui/manage_pep_services_window.ui.h:1 msgid "PEP Service Configuration" -msgstr "תצורת שירות ‏PEP" +msgstr "תצורת שירות ‫PEP" #: ../data/gui/manage_pep_services_window.ui.h:2 msgid "_Configure" @@ -1721,7 +1721,7 @@ # כתובת _BOSH: #: ../data/gui/manage_proxies_window.ui.h:9 msgid "_BOSH URL:" -msgstr "‏_BOSH URL:" +msgstr "‫_BOSH URL:" #: ../data/gui/manage_proxies_window.ui.h:10 msgid "Use proxy auth_entication" @@ -1733,7 +1733,7 @@ #: ../data/gui/manage_proxies_window.ui.h:12 msgid "Pass_word:" -msgstr "מילת־מ_עבר:" +msgstr "ס_יסמה:" #: ../data/gui/manage_proxies_window.ui.h:13 msgid "Proxy _Host:" @@ -1747,10 +1747,12 @@ msgid "Settings" msgstr "הגדרות" -# משפט/צירוף־אישור/מעבר/מפתח +# צירוף־מעבר +# משפט/צירוף +# אישור/מעבר/מפתח #: ../data/gui/passphrase_dialog.ui.h:1 msgid "Passphrase" -msgstr "צירוף־מעבר" +msgstr "מימרת־סיסמה" #: ../data/gui/plugins_window.ui.h:1 msgid "Plugins" @@ -1846,7 +1848,7 @@ #: ../data/gui/preferences_window.ui.h:7 msgid "Only when pending events" -msgstr "רק כאשר קיימים אירועים תלויים ועומדים" +msgstr "רק כאשר קיימים אירועים ממתינים" #: ../data/gui/preferences_window.ui.h:8 msgid "Always" @@ -1909,9 +1911,10 @@ msgstr "הצגת הו_דעות מצב של אנשי־קשר ברשימה" # BUG: a dot at the end +# BUG: under [the] contact - remove "the" #: ../data/gui/preferences_window.ui.h:22 msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats" -msgstr "במידה ואפשרות זו מסומנת, Gajim יציג את הודעות המצב של אנשי־הקשר תחת שם איש־הקשר בחלון הרשימה ובשיחות קבוצה" +msgstr "במידה ואפשרות זו מסומנת, Gajim יציג את הודעות המצב של אנשי־הקשר תחת שם איש־קשר בחלון הרשימה ובשיחות קבוצה" # מ_צבי הרוח #: ../data/gui/preferences_window.ui.h:23 @@ -1921,18 +1924,18 @@ # BUG: a dot at the end #: ../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 יציג את מצבי הרוח של אנשי־קשר בחלון הרשימה" # Changed "activity" with "activities" # שברשימה #: ../data/gui/preferences_window.ui.h:25 msgid "Display _activity of contacts in roster" -msgstr "הצגת ה_פעילויות של אנשי־הקשר ברשימה" +msgstr "הצגת ה_פעילויות של אנשי־קשר ברשימה" # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:26 msgid "If checked, Gajim will display the activity of contacts in the roster window" -msgstr "במידה ואפשרות זו מסומנת, Gajim יציג את הפעילויות של אנשי־הקשר בחלון הרשימה"

1 0

gajim: Add build.bat
by Fomin Denis 09 Sep '12

09 Sep '12

changeset e777df0d7025 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e777df0d7025 description: Add build.bat diffstat: build.bat | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diffs (42 lines): diff -r 8d801cac3b5c -r e777df0d7025 build.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/build.bat Sun Sep 09 14:28:56 2012 +0400 @@ -0,0 +1,37 @@ +rmdir /S /Q gajim_built + +mkdir gajim_built +hg archive gajim_built +xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i + +copy msgfmt.exe gajim_built +copy gettextsrc.dll gajim_built +copy gettextlib.dll gajim_built +copy msvcr90.dll gajim_built + +cd gajim_built + +REM for libglade-2.0.0.dll +PATH=..\src\gtk\bin;%PATH% + +c:\python27\python.exe setup_win32.py build_exe + +move build\exe.win32-2.7 . +rename exe.win32-2.7 bin + +copy ..\LIBEAY32.dll bin +copy ..\SSLEAY32.dll bin + +mkdir bin\gtk +cd ../src/gtk +hg archive ..\..\gajim_built\bin\gtk +cd ../../gajim_built/ + +REM for msgfmt +PATH=bin\gtk\bin;%PATH% + +for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l + +"C:\Program Files\NSIS\makensis" gajim.nsi + +cd .. \ No newline at end of file

1 0

gajim: removing old corrupted file before starting file request
by Jefry Lagrange 08 Sep '12

08 Sep '12

changeset 8d801cac3b5c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8d801cac3b5c description: removing old corrupted file before starting file request diffstat: src/filetransfers_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r b81d072a4ccf -r 8d801cac3b5c src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Sep 07 10:01:11 2012 -0400 +++ b/src/filetransfers_window.py Sat Sep 08 17:35:11 2012 -0400 @@ -250,6 +250,8 @@ def show_hash_error(self, jid, file_props, account): def on_yes(dummy): + # Delete old file + os.remove(file_props.file_name) # Request the file to the sender contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

1 0

gajim: add new FT in FT window when we are requesting file
by Jefry Lagrange 07 Sep '12

07 Sep '12

changeset b81d072a4ccf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b81d072a4ccf description: add new FT in FT window when we are requesting file diffstat: src/common/jingle.py | 3 ++- src/filetransfers_window.py | 16 +++++++++++++--- src/gui_interface.py | 4 +++- 3 files changed, 18 insertions(+), 5 deletions(-) diffs (60 lines): diff -r 4e4310406a4a -r b81d072a4ccf src/common/jingle.py --- a/src/common/jingle.py Thu Sep 06 23:38:53 2012 +0400 +++ b/src/common/jingle.py Fri Sep 07 10:01:11 2012 -0400 @@ -196,7 +196,8 @@ def get_files_info(self, hash_=None, name=None): if hash_: - for f in self.files: + for f in self.files: # DEBUG + #if f['hash'] == '1294809248109223': if f['hash'] == hash_: return f elif name: diff -r 4e4310406a4a -r b81d072a4ccf src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Sep 06 23:38:53 2012 +0400 +++ b/src/filetransfers_window.py Fri Sep 07 10:01:11 2012 -0400 @@ -254,10 +254,20 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) fjid = contact.get_full_jid() - sid = gajim.connections[account].start_file_transfer(fjid, - file_props, + sid = helpers.get_random_string_16() + new_file_props = FilesProp.getNewFileProp(account, sid) + new_file_props.file_name = file_props.file_name + new_file_props.name = file_props.name + new_file_props.desc = file_props.desc + new_file_props.size = file_props.size + new_file_props.date = file_props.date + new_file_props.hash_ = file_props.hash_ + new_file_props.type_ = 'r' + tsid = gajim.connections[account].start_file_transfer(fjid, + new_file_props, True) - file_props.transport_sid = sid + new_file_props.transport_sid = tsid + self.add_transfer(account, contact, new_file_props) if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) diff -r 4e4310406a4a -r b81d072a4ccf src/gui_interface.py --- a/src/gui_interface.py Thu Sep 06 23:38:53 2012 +0400 +++ b/src/gui_interface.py Fri Sep 07 10:01:11 2012 -0400 @@ -912,13 +912,15 @@ account=account, keyID=keyID) gajim.contacts.add_contact(account, contact) self.roster.add_contact(obj.jid, account) + contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) if obj.file_props.session_type == 'jingle': request = obj.stanza.getTag('jingle').getTag('content')\ .getTag('description').getTag('request') if request: # If we get a request instead + ft_win = self.instances['file_transfers'] + ft_win.add_transfer(account, contact, obj.file_props) return - contact = gajim.contacts.get_first_contact_from_jid(account, obj.jid) if helpers.allow_popup_window(account): self.instances['file_transfers'].show_file_request(account, contact, obj.file_props)

1 0

gajim: russian translation update
by Fomin Denis 06 Sep '12

06 Sep '12

changeset 4e4310406a4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4e4310406a4a description: russian translation update diffstat: po/ru.po | 7079 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 3639 insertions(+), 3440 deletions(-) diffs (truncated from 11556 to 300 lines): diff -r ec85c0433906 -r 4e4310406a4a po/ru.po --- a/po/ru.po Thu Sep 06 23:07:35 2012 +0400 +++ b/po/ru.po Thu Sep 06 23:38:53 2012 +0400 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-01 11:01+0400\n" -"PO-Revision-Date: 2012-08-12 21:54+0300\n" +"POT-Creation-Date: 2012-09-06 23:05+0400\n" +"PO-Revision-Date: 2012-09-06 23:36+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -25,46 +25,141 @@ "X-Generator: Virtaal 0.6.1\n" #: ../data/gui/account_context_menu.ui.h:1 -#: ../data/gui/roster_window.ui.h:7 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_Статус" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_Расширенный статус" + +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "_Начать беседу..." + +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "Войти в _комнату" - -#: ../data/gui/account_context_menu.ui.h:2 +msgstr "Войти в _комнату..." + +#: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "_Добавить контакт..." -#: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:19 +#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Просмотреть сервисы" -#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." msgstr "В_ыполнить команду..." -#: ../data/gui/account_context_menu.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_Открыть Gmail" + +#: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" msgstr "_Редактировать учетную запись" -#: ../data/gui/account_context_menu.ui.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Открыть Gmail" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Расширенный статус" - -#: ../data/gui/account_context_menu.ui.h:8 -#: ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Начать беседу" - -#: ../data/gui/account_context_menu.ui.h:9 -#: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Статус" - #: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: мастер создания учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Необходимо создать учетную запись для присоединения \n" +"к сети Jabber." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "У меня уже есть учетная запись, которую я хочу _использовать" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "Я хочу _зарегистрировать новую учетную запись" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "Выберите одну из опций из списка ниже:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "Заполните данные для вашей новой учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "Сохранить _пароль" + +#: ../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 запомнит пароль учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:23 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Anon_ymous authentication" +msgstr "Анонимная аут_ентификация" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Please select a server" +msgstr "Выберите сервер" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/manage_bookmarks_window.ui.h:3 +msgid "_Server:" +msgstr "_Сервер:" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "Prox_y:" +msgstr "Про_кси:" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +msgid "Manage..." +msgstr "Управление..." + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Use custom hostname/port" +msgstr "Использовать пользовательские хост/порт" + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +msgid "_Hostname:" +msgstr "_Хост: " + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "_Port:" +msgstr "_Порт:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/roster_window.ui.h:8 +msgid "_Advanced" +msgstr "_Дополнительно" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Добавить этот сертификат в список надёжных сертификатов.\n" +"Отпечаток SHA1 сертификата:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" @@ -74,297 +169,306 @@ "\n" "Подождите..." -#: ../data/gui/account_creation_wizard_window.ui.h:4 -msgid "Please choose one of the options below:" -msgstr "Выберите одну из опций из списка ниже:" - -#: ../data/gui/account_creation_wizard_window.ui.h:5 -msgid "Please fill in the data for your existing account" -msgstr "Заполните данные для вашей новой учетной записи" - -#: ../data/gui/account_creation_wizard_window.ui.h:6 -msgid "Please select a server" -msgstr "Выберите сервер" - -#: ../data/gui/account_creation_wizard_window.ui.h:7 -msgid "" -"Add this certificate to the list of trusted certificates.\n" -"SHA1 fingerprint of the certificate:\n" -msgstr "" -"Добавить этот сертификат в список надёжных сертификатов.\n" -"Отпечаток SHA1 сертификата:\n" - -#: ../data/gui/account_creation_wizard_window.ui.h:10 -msgid "Anon_ymous authentication" -msgstr "Анонимная аут_ентификация" - -#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" msgstr "Подключиться, когда я нажму «Закончить»" -#: ../data/gui/account_creation_wizard_window.ui.h:12 -msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: мастер создания учетной записи" - -#: ../data/gui/account_creation_wizard_window.ui.h:13 -msgid "I already have an account I want to _use" -msgstr "У меня уже есть учетная запись, которую я хочу _использовать" - -#: ../data/gui/account_creation_wizard_window.ui.h:14 -msgid "I want to _register for a new account" -msgstr "Я хочу _зарегистрировать новую учетную запись" - -#: ../data/gui/account_creation_wizard_window.ui.h:15 -#: ../data/gui/accounts_window.ui.h:30 -msgid "If checked, Gajim will remember the password for this account" -msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" - -#: ../data/gui/account_creation_wizard_window.ui.h:16 -msgid "Manage..." -msgstr "Управление..." - -#: ../data/gui/account_creation_wizard_window.ui.h:17 -#: ../data/gui/accounts_window.ui.h:41 -#: ../data/gui/change_mood_dialog.ui.h:3 -#: ../src/config.py:1265 -#: ../src/config.py:1279 -#: ../src/config.py:1284 -#: ../src/config.py:1332 -#: ../src/config.py:1435 -#: ../src/config.py:1746 -#: ../src/config.py:1751 -#: ../src/config.py:2327 -#: ../src/config.py:2406 -#: ../src/config.py:2419 -#: ../src/config.py:3699 -#: ../src/config.py:3774 -#: ../src/dialogs.py:311 -#: ../src/dialogs.py:313 -#: ../src/dialogs.py:519 -#: ../src/dialogs.py:532 -#: ../src/roster_window.py:3139 -#: ../src/roster_window.py:3145 -#: ../src/roster_window.py:3150 +#: ../data/gui/account_creation_wizard_window.ui.h:28 +msgid "Set my profile when I connect" +msgstr "Настроить мой профиль после соединения" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +msgid "_Finish" +msgstr "_Закончить" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:1 +#: ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1254 +#: ../src/config.py:1268 +#: ../src/config.py:1273 +#: ../src/config.py:1321 +#: ../src/config.py:1424 +#: ../src/config.py:1739 +#: ../src/config.py:1744 +#: ../src/config.py:2320 +#: ../src/config.py:2399 +#: ../src/config.py:2412 +#: ../src/config.py:3698 +#: ../src/config.py:3773 +#: ../src/dialogs.py:312 +#: ../src/dialogs.py:314 +#: ../src/dialogs.py:520 +#: ../src/dialogs.py:533 +#: ../src/roster_window.py:3207 +#: ../src/roster_window.py:3213 +#: ../src/roster_window.py:3218 msgid "None" msgstr "Нет" -#: ../data/gui/account_creation_wizard_window.ui.h:18 -msgid "Prox_y:" -msgstr "Про_кси:" - -#: ../data/gui/account_creation_wizard_window.ui.h:19 -#: ../data/gui/accounts_window.ui.h:50 -msgid "Save pass_word" -msgstr "Сохранить _пароль" -

1 0

gajim: typo
by Fomin Denis 06 Sep '12

06 Sep '12

changeset ec85c0433906 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ec85c0433906 description: typo diffstat: src/chat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r a1b03412a1cd -r ec85c0433906 src/chat_control.py --- a/src/chat_control.py Thu Sep 06 18:41:30 2012 +0200 +++ b/src/chat_control.py Thu Sep 06 23:07:35 2012 +0400 @@ -2894,8 +2894,8 @@ except exceptions.DatabaseMalformed: import common.logger dialogs.ErrorDialog(_('Database Error'), - _('The database file (%s) cannot be read. Try to repair it or \ - remove it (all history will be lost).') % common.logger.LOG_DB_PATH) + _('The database file (%s) cannot be read. Try to repair it or ' + 'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None for row in rows: # row[0] time, row[1] has kind, row[2] the message

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