Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim-plugins: Clients icons. fix jappix caps
by Gajim Plugins 19 Nov '13

19 Nov '13

changeset 4973f19e636a in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=4973f19e636a description: Clients icons. fix jappix caps diffstat: clients_icons/clients_icons.py | 4 +++- 1 файлов изменено, 3 вставок(+), 1 удалений(-) различия (21 строк): diff -r 54725368237f -r 4973f19e636a clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Tue Nov 19 11:06:19 2013 +0400 +++ b/clients_icons/clients_icons.py Tue Nov 19 16:42:58 2013 +0400 @@ -119,7 +119,7 @@ 'http://sim-im.org/caps': ['sim.png', 'Sim'], 'http://www.igniterealtime.org/project/spark/caps': ['spark.png', 'Spark'], 'http://emess.eqx.su/caps': ['emess.png', 'Emess'], - 'https://www.jappix.com/': ['jappix.png', 'Jappix'], + 'http://jappix.org/': ['jappix.png', 'Jappix'], 'http://japyt.googlecode.com': ['japyt.png', 'Japyt'], 'http://www.xfire.com/': ['xfire.png', 'Xfire'], 'http://www.xfire.com/caps': ['xfire.png', 'Xfire'], @@ -279,6 +279,8 @@ caps_image , client_name = self.get_icon(caps, acontact) identities = acontact.client_caps._lookup_in_cache( gajim.caps_cache.capscache).identities + print acontact.name, dir(acontact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache)) if identities and client_name == _('Unknown'): client_name = identities[0].get('name', _('Unknown')) caps_image.set_alignment(0, 0)

1 0

gajim-plugins: Yaxim,Monal,Emacs added
by Gajim Plugins 19 Nov '13

19 Nov '13

changeset 2aceb16d9d90 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=2aceb16d9d90 description: Yaxim,Monal,Emacs added diffstat: clients_icons/clients_icons.py | 146 ++++++++++++++++++++++++++++------------ clients_icons/icons/emacs.png | Bin clients_icons/icons/monal.png | Bin clients_icons/icons/yaxim.png | Bin 4 файлов изменено, 100 вставок(+), 46 удалений(-) различия (урезанные с 316 до 300 строк): diff -r bff0a35ffdc7 -r 2aceb16d9d90 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Tue Nov 05 19:26:28 2013 +0000 +++ b/clients_icons/clients_icons.py Tue Nov 19 10:48:47 2013 +0400 @@ -25,7 +25,6 @@ 'http://bombusmod.net.ru': ['bombusmod.png', 'Bombusmod'], 'http://ex-im.name/caps': ['bombusmod.png', 'Bombusmod'], 'http://bombusmod.eu,http://bombus.pl': ['bombuspl.png', 'Bombusmod'], - 'http://mcabber.com/caps': ['mcabber.png', 'MCabber'], 'http://miranda-im.org/caps': ['miranda.png', 'Miranda'], 'http://www.asterisk.org/xmpp/client/caps': ['asterisk.png', 'Asterisk'], 'http://www.google.com/xmpp/client/caps': ['talkonaut.png', 'Talkonaut'], @@ -39,11 +38,10 @@ 'http://exodus.jabberstudio.org/caps': ['exodus.png', 'Exodus'], 'http://bitlbee.org/xmpp/caps': ['bitlbee.png', 'Bitlbee'], 'http://coccinella.sourceforge.net/protocol/caps': ['coccinella.png', 'Coccinella'], - 'http://mcabber.lilotux.net/caps': ['mcabber.png', 'MCabber'], 'http://dev.jabbim.cz/jabbim/caps': ['jabbim.png', 'Jabbim'], 'http://palringo.com/caps': ['palringo.png', 'Palringo'], - 'http://vacuum-im.googlecode.com': ['vacuum.png', 'Vacuum'], - 'http://code.google.com/p/vacuum-im/': ['vacuum.png', 'Vacuum'], + 'http://vacuum-im.googlecode.com': ['vacuum.png', 'Vacuum-im'], + 'http://code.google.com/p/vacuum-im/': ['vacuum.png', 'Vacuum-im'], 'http://jajc.jrudevels.org/caps': ['jajc.png', 'JAJC'], 'http://gaim.sf.net/caps': ['gaim.png', 'Gaim'], 'http://mchat.mgslab.com/': ['mchat.png', 'Mchat'], @@ -54,8 +52,8 @@ 'http://bluendo.com/protocol/caps': ['lampiro.png', 'Lampiro'], 'nimbuzz:caps': ['nimbuzz.png', 'Nimbuzz'], 'http://nimbuzz.com/caps': ['nimbuzz.png', 'Nimbuzz'], - 'http://isida.googlecode.com': ['isida-bot.png', 'Isida'], - 'http://isida-bot.com': ['isida-bot.png', 'Isida'], + 'http://isida.googlecode.com': ['isida-bot.png', 'iSida Jabber Bot'], + 'http://isida-bot.com': ['isida-bot.png', 'iSida Jabber Bot'], 'http://apps.radio-t.com/caps': ['radio-t.png', 'Radio-t'], 'http://pda.qip.ru/caps': ['qippda.png', 'Qip-PDA'], 'http://kopete.kde.org/jabber/caps': ['kopete.png', 'Kopete'], @@ -133,7 +131,6 @@ 'http://jasmineicq.ru/caps': ['jasmine.png', 'Jasmine'], 'http://tomclaw.com/mandarin_im/caps': ['mandarin.png', 'Mandarin'], 'http://gabber.sourceforge.net': ['gabber.png', 'Gabber'], - 'http://www.igniterealtime.org/projects/smack/': ['xabber.png', 'Xabber'], 'http://megafonvolga.ru/': ['megafon.png', 'Megafon'], 'rss(a)isida-bot.com': ['osiris.png', 'Osiris'], 'libpurple': ['libpurple.png', 'Libpurple'], @@ -144,9 +141,15 @@ 'http://opensource.palm.com/packages.html': ['palm.png', 'Palm'], 'http://spectrum.im/': ['spectrum.png', 'Spectrum'], 'http://tigase.org/messenger': ['tigase.png', 'Tigase'], - 'httр://sleekxmpp.com/ver/1.1.11': ['poezio.png', 'Poezio'], 'http://jitsi.org' :['jitsi.png', 'Jitsi'], 'http://miranda-ng.org/caps' :['miranda_ng.png', 'Miranda NG'], + 'http://monal.im/caps': ['monal.png', 'Monal'], + # + 'Poezio' :['poezio.png', 'Poezio'], + 'Emacs' :['emacs.png', ''], + 'mcabber' :['mcabber.png', ''], + 'yaxim' :['yaxim.png', ''], + 'Xabber' :['xabber.png', ''], } libpurple_clients ={ 'adium': 'http://www.adium.im/', @@ -165,10 +168,10 @@ @log_calls('ClientsIconsPlugin') def init(self): self.pos_list = [_('after statusicon'), _('before avatar')] - self.events_handlers = {'presence-received': + self.events_handlers = {'caps-presence-received': (ged.POSTGUI, self.presence_received), - 'gc-presence-received': - (ged.POSTGUI, self.gc_presence_received), } + 'caps-disco-received': + (ged.POSTGUI, self.caps_disco_received), } self.gui_extension_points = { 'groupchat_control': (self.connect_with_groupchat_control, self.disconnect_from_groupchat_control), @@ -205,6 +208,10 @@ caps = contact.client_caps._node caps_image , client_name = self.get_icon(caps, contact) + identities = contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities + if identities and client_name == _('Unknown'): + client_name = identities[0].get('name', _('Unknown')) caps_image.set_alignment(0, 0) self.table.attach(caps_image, 1, 2, vcard_current_row, vcard_current_row + 1, 0, 0, 0, 0) @@ -255,18 +262,25 @@ else: contacts_dict[contact.priority] = [contact] contact_keys = sorted(contacts_dict.keys()) + if not contact_keys: + # contact have not resource + contacts_dict[0] = [contact] + contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() #fill clients table self.table = gtk.Table(4, 1) self.table.set_property('column-spacing', 2) first_place = vcard_current_row = vcard_table.get_property('n-rows') - vcard_current_row = 0 for priority in contact_keys: for acontact in contacts_dict[priority]: caps = acontact.client_caps._node caps_image , client_name = self.get_icon(caps, acontact) + identities = acontact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities + if identities and client_name == _('Unknown'): + client_name = identities[0].get('name', _('Unknown')) caps_image.set_alignment(0, 0) self.table.attach(caps_image, 1, 2, vcard_current_row, vcard_current_row + 1, gtk.FILL, gtk.FILL, 0, 0) @@ -312,9 +326,6 @@ if client in contact.resource.lower(): caps = libpurple_clients[client] - if 'sleekxmpp.com'in caps: - caps = 'httр://sleekxmpp.com/ver/1.1.11' - caps_from_jid = self.check_jid(contact.jid) if caps_from_jid: caps = caps_from_jid @@ -325,6 +336,12 @@ client_name = clients.get(caps_[0].split()[0], ('', _('Unknown')))[1] else: client_icon = None + if client_name == _('Unknown'): + identities = contact.client_caps._lookup_in_cache( + gajim.caps_cache.capscache).identities + if identities: + client_name = identities[0].get('name', _('Unknown')) + client_icon = clients.get(client_name.split()[0], (None,))[0] if not client_icon: return gtk.image_new_from_pixbuf(self.default_pixbuf), _('Unknown') @@ -350,7 +367,7 @@ caps = 'facebook.com' elif '@vk.com' in jid and self.config['show_facebook']: caps = 'vk.com' - elif jid == 'juick(a)juick.com': + elif 'juick.com' in jid: caps = 'http://juick.com/caps' elif jid == 'psto(a)psto.net': caps = 'psto(a)psto.net' @@ -374,7 +391,7 @@ if not caps: caps = self.check_jid(jid) self.set_icon(roster.model, iter_, self.renderer_num, - caps) + caps, contact) @log_calls('ClientsIconsPlugin') def connect_with_groupchat_control(self, chat_control): @@ -418,7 +435,7 @@ continue caps = gc_contact.client_caps._node self.set_icon(chat_control.model, iter_, self.muc_renderer_num, - caps) + caps, contact) chat_control.draw_all_roles() # Recalculate column width for ellipsizin chat_control.list_treeview.columns_autosize() @@ -495,14 +512,51 @@ self.renderer_num + 1:] roster.setup_and_draw_roster() + def caps_disco_received(self, iq_obj): + roster = gajim.interface.roster + contact = gajim.contacts.get_contact_from_full_jid(iq_obj.conn.name, + iq_obj.jid) + if contact is None: + room_jid, nick = gajim.get_room_and_nick_from_fjid(iq_obj.fjid) + contact = gajim.contacts.get_gc_contact(iq_obj.conn.name, room_jid, + nick) + if contact: + gc_control = gajim.interface.msg_win_mgr.get_gc_control( + iq_obj.jid, iq_obj.conn.name) + #gc_control.draw_contact(nick) + return + if not contact: + return + child_iters = roster._get_contact_iter(iq_obj.jid, iq_obj.conn.name, + contact, roster.model) + if not child_iters: + return + for iter_ in child_iters: + caps = contact.client_caps._node + caps_ = self.check_jid(iq_obj.jid) + if caps_: + caps = caps_ + self.set_icon(roster.model, iter_, self.renderer_num, + caps, contact) + def presence_received(self, iq_obj): + roster = gajim.interface.roster + contact = gajim.contacts.get_contact_from_full_jid(iq_obj.conn.name, + iq_obj.jid) + if contact is None: + room_jid, nick = gajim.get_room_and_nick_from_fjid(iq_obj.fjid) + contact = gajim.contacts.get_gc_contact(iq_obj.conn.name, room_jid, + nick) + if contact: + self.gc_presence_received(iq_obj, contact) + return + if not contact: + return + if not self.config['show_in_roster']: return - roster = gajim.interface.roster contact = gajim.contacts.get_contact_with_highest_priority( iq_obj.conn.name, iq_obj.jid) - if not contact: - return if iq_obj.resource == 'local': # zeroconf @@ -513,15 +567,16 @@ iter_ = iters[0] if contact.show == 'error': - self.set_icon(roster.model, iter_, self.renderer_num, None) + self.set_icon(roster.model, iter_, self.renderer_num, None, contact) return - if contact != iq_obj.contact: + if contact.get_full_jid() != iq_obj.fjid: # higest contact changed if roster.model[iter_][self.renderer_num] is not None: caps = contact.client_caps._node if caps: - self.set_icon(roster.model, iter_, self.renderer_num, caps) + self.set_icon(roster.model, iter_, self.renderer_num, + caps, contact) return caps = None tag = iq_obj.stanza.getTags('c') @@ -533,50 +588,49 @@ for client in libpurple_clients: if client in contact.resource.lower(): caps = libpurple_clients[client] - if 'sleekxmpp.com'in caps: - caps = 'httр://sleekxmpp.com/ver/1.1.11' caps_from_jid = self.check_jid(iq_obj.jid) if caps_from_jid: caps = caps_from_jid for iter_ in iters: - self.set_icon(roster.model, iter_, self.renderer_num, caps) + self.set_icon(roster.model, iter_, self.renderer_num, caps, contact) - def gc_presence_received(self, iq_obj): + def gc_presence_received(self, iq_obj, contact): if not self.config['show_in_groupchats']: return - contact = gajim.contacts.get_gc_contact(iq_obj.conn.name, - iq_obj.presence_obj.jid, iq_obj.nick.decode('utf-8')) - if not contact: - return + caps = None tag = iq_obj.stanza.getTags('c') if tag: caps = tag[0].getAttr('node') if 'pidgin.im/' in caps: caps = 'libpurple' - if 'sleekxmpp.com' in caps: - caps = 'httр://sleekxmpp.com/ver/1.1.11' - iter_ = iq_obj.gc_control.get_contact_iter(iq_obj.nick.decode('utf-8')) - model = iq_obj.gc_control.model + + gc_control = gajim.interface.msg_win_mgr.get_gc_control(iq_obj.jid, + iq_obj.conn.name) + iter_ = gc_control.get_contact_iter(iq_obj.resource.decode('utf-8')) + model = gc_control.model if model[iter_][self.muc_renderer_num] is not None: return - self.set_icon(model, iter_, self.muc_renderer_num, caps) + self.set_icon(model, iter_, self.muc_renderer_num, caps, contact) - def set_icon(self, model, iter_, pos, caps): - if not caps: - if self.config['show_unknown_icon']: - model[iter_][pos] = self.default_pixbuf - return - - caps_ = caps.split('#')[0].split() - if caps_: - client_icon = clients.get(caps_[0].split()[0], (None,))[0] + def set_icon(self, model, iter_, pos, caps, contact): + if caps: + caps_ = caps.split('#')[0].split() + if caps_: + client_icon = clients.get(caps_[0].split()[0], (None,))[0] else: client_icon = None if not client_icon:

1 0

gajim-plugins: Clients icons. up version number
by Gajim Plugins 19 Nov '13

19 Nov '13

changeset 54725368237f in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=54725368237f description: Clients icons. up version number diffstat: clients_icons/manifest.ini | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 2aceb16d9d90 -r 54725368237f clients_icons/manifest.ini --- a/clients_icons/manifest.ini Tue Nov 19 10:48:47 2013 +0400 +++ b/clients_icons/manifest.ini Tue Nov 19 11:06:19 2013 +0400 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 4.6 +version: 5.0 description: Shows the client icons in the roster and in groupchats. authors: Denis Fomin <fominde(a)gmail.com> Artem Klyop <art.klyop(a)gmail.com>

1 0

gajim: Add emty line to the end of help strings
by Gajim 18 Nov '13

18 Nov '13

changeset 2a0673b623a6 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=2a0673b623a6 description: Add emty line to the end of help strings diffstat: src/gajim.py | 2 +- src/history_manager.py | 2 +- 2 файлов изменено, 2 вставок(+), 2 удалений(-) различия (24 строк): diff -r 777382f16304 -r 2a0673b623a6 src/gajim.py --- a/src/gajim.py Sun Nov 17 21:52:02 2013 +0100 +++ b/src/gajim.py Mon Nov 18 22:51:56 2013 +0400 @@ -146,7 +146,7 @@ '\n -c, --config-path ' + \ _('Set configuration directory') + \ '\n -l, --loglevel ' + \ - _('Configure logging system') + _('Configure logging system') + '\n' sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet() diff -r 777382f16304 -r 2a0673b623a6 src/history_manager.py --- a/src/history_manager.py Sun Nov 17 21:52:02 2013 +0100 +++ b/src/history_manager.py Mon Nov 18 22:51:56 2013 +0400 @@ -75,7 +75,7 @@ _('Options:') + \ '\n -h, --help ' + \ _('Show this help message and exit') + \ - '\n -c, --config-path ' + _('Set logs directory') + '\n -c, --config-path ' + _('Set logs directory') + '\n' sys.exit() elif o in ('-c', '--config-path'): config_path = a

1 0

gajim: fix typo. Fixes #7560
by Gajim 17 Nov '13

17 Nov '13

changeset 777382f16304 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=777382f16304 description: fix typo. Fixes #7560 diffstat: src/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5ec89bc93747 -r 777382f16304 src/session.py --- a/src/session.py Sun Nov 17 09:40:21 2013 +0100 +++ b/src/session.py Sun Nov 17 21:52:02 2013 +0100 @@ -238,7 +238,7 @@ self.conn.name, contact) if (not self.control and obj.mtype != 'normal') or \ - (obj.mtype != 'normal' and not obj.popup): + (obj.mtype == 'normal' and not obj.popup): event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking,

1 0

gajim: install dh4096.pem file. Fixes #7563
by Gajim 17 Nov '13

17 Nov '13

changeset 5ec89bc93747 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=5ec89bc93747 description: install dh4096.pem file. Fixes #7563 diffstat: data/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0cc6a3f549ed -r 5ec89bc93747 data/Makefile.am --- a/data/Makefile.am Sat Nov 16 22:23:13 2013 +0400 +++ b/data/Makefile.am Sun Nov 17 09:40:21 2013 +0100 @@ -12,7 +12,7 @@ sounds_DATA = $(srcdir)/sounds/*.wav otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml other/cacerts.pem +other_DATA = other/servers.xml other/cacerts.pem other/dh4096.pem man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1

1 0

gajim: Set transient_for 'You are no longer in group chat'
by Gajim 16 Nov '13

16 Nov '13

changeset 0cc6a3f549ed 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=0cc6a3f549ed description: Set transient_for 'You are no longer in group chat' diffstat: src/groupchat_control.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r a94ea3cb2223 -r 0cc6a3f549ed src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 15 20:42:49 2013 +0400 +++ b/src/groupchat_control.py Sat Nov 16 22:23:13 2013 +0400 @@ -237,7 +237,7 @@ #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' '"%(nick)s" has left.') % {'room': u'\u200E' + room, - 'nick': nick}) + 'nick': nick}, transient_for=self.parent_win.window) return ChatControl.send_message(self, message, xhtml=xhtml,

1 0

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

15 Nov '13

changeset a94ea3cb2223 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=a94ea3cb2223 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 82 ++++++++++++++++++++++++--------------------------------------- 1 файлов изменено, 32 вставок(+), 50 удалений(-) различия (урезанные с 314 до 300 строк): diff -r 1fed98a5b2e4 -r a94ea3cb2223 po/he.po --- a/po/he.po Fri Nov 15 20:23:41 2013 +0400 +++ b/po/he.po Fri Nov 15 20:42:49 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-11-10 09:39+0200\n" +"PO-Revision-Date: 2013-11-15 09:28+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -1754,7 +1754,7 @@ #: ../data/gui/preferences_window.ui.h:9 msgid "Pop it up" -msgstr "הצג התראה מוקפצת" +msgstr "הקפץ אותו" #: ../data/gui/preferences_window.ui.h:10 msgid "Notify me about it" @@ -2809,7 +2809,7 @@ msgid "" "Deny authorization from contact so he or she cannot know when you're " "connected" -msgstr "איסור הרשאות מן איש קשר כך שהוא או היא לא יוכלו לדעת מתי הינך מחובר" +msgstr "איסור הרשאות מן איש קשר כך שהוא או היא לא יוכלו לדעת מתי אתה מחובר" # הס_מך #: ../data/gui/subscription_request_window.ui.h:6 @@ -2818,7 +2818,7 @@ #: ../data/gui/subscription_request_window.ui.h:7 msgid "Authorize contact so he or she can know when you're connected" -msgstr "הענקת הרשאה אל איש קשר זה כדי שהוא או היא יידעו מתי הינך מחובר" +msgstr "הענקת הרשאה אל איש קשר זה כדי שהוא או היא יידעו מתי אתה מחובר" #: ../data/gui/synchronise_select_account_dialog.ui.h:1 msgid "Synchronise contacts" @@ -2991,11 +2991,10 @@ msgid "Cancel confirmation" msgstr "אימות ביטול" -# מצוי/ה במהלך #: ../src/adhoc_commands.py:326 msgid "" "You are in process of executing command. Do you really want to cancel it?" -msgstr "הינך בתוך עיצומו של תהליך הרצת פקודה. האם ברצונך לבטלו?" +msgstr "אתה מצוי בתוך עיצומו של תהליך הרצת פקודה. האם ברצונך לבטלו?" #: ../src/adhoc_commands.py:372 msgid "Invalid Form" @@ -4485,8 +4484,6 @@ "במידה והעדפה זו מופעלת, Gajim יציג מספר של אנשי קשר מקוונים בשורות חשבון " "וקבוצה." -# what type? -# אפשרי שיהיה #: ../src/common/config.py:293 msgid "" "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages " @@ -4712,7 +4709,7 @@ "Space separated list of JIDs for which you accept to not log conversations " "if he does not want to." msgstr "" -"רשימה אשר מופרדת עם רווח, של כתובות JID עבורן הינך מביע הסכמה שלא לרושם " +"רשימה אשר מופרדת עם רווח, של כתובות JID עבורן אתה מביע הסכמה שלא לרושם " "דיונים במידה והקצה השני לא מעוניין בכך." # חלל לבן, עקב @@ -5387,8 +5384,8 @@ "JID %s is not RFC compliant. It will not be added to your roster. Use roster " "management tools such as http://jru.jabberstudio.org/ to remove it" msgstr "" -"‏JID ‏%s אינה תואמת RFC. זו לא תוסף אל רשימתך. ניתן להשתמש בכלי ניהול רשימה " -"(roster management tools) כגון http://jru.jabberstudio.org כדי להסירה" +"‏JID ‏%s אינה תואמת RFC. זו לא תוסף אל רשימתך. השתמש בכלי ניהול רשימה (roster " +"management tools) כגון http://jru.jabberstudio.org כדי להסירה" #: ../src/common/connection_handlers_events.py:825 #, python-format @@ -6191,7 +6188,7 @@ #: ../src/common/passwords.py:123 #, python-format msgid "XMPP account %s@%s" -msgstr "חשבון ‫XMPP ‫%s@%s" +msgstr "חשבון XMPP ‫%s@%s" #: ../src/common/pep.py:27 msgid "Afraid" @@ -6966,13 +6963,12 @@ "‏\"%(title)s\" מאת %(artist)s\n" "מתוך %(source)s" -# רואה הודעה זאת #. we're not english #: ../src/common/stanza_session.py:425 msgid "" "[This is part of an encrypted session. If you see this message, something " "went wrong.]" -msgstr "[זהו חלק מן סשן מוצפן. אם הינך רואה את הודעה זאת, משהו השתבש.]" +msgstr "[זהו חלק מתוך סשן מוצפן. אם הינך רואה את הודעה זאת, משהו השתבש.]" #: ../src/common/zeroconf/connection_zeroconf.py:193 msgid "Avahi error" @@ -7111,7 +7107,7 @@ #: ../src/config.py:2035 ../src/config.py:2600 ../src/config.py:2638 msgid "You are currently connected to the server" -msgstr "הינך מחובר כעת אל שרת" +msgstr "אתה מחובר כעת לשרת" #: ../src/config.py:2036 msgid "To change the account name, you must be disconnected." @@ -7809,21 +7805,21 @@ #: ../src/dialogs.py:1292 msgid "Current Developers:" -msgstr "מפתחים נוכחיים:" +msgstr "‎מפתחים נוכחיים:" #: ../src/dialogs.py:1294 msgid "Past Developers:" -msgstr "מפתחים מן העבר:" +msgstr "‎מפתחים מן העבר:" #: ../src/dialogs.py:1300 msgid "THANKS:" -msgstr "תודות:" +msgstr "‎תודות:" #. remove one english sentence #. and add it manually as translatable #: ../src/dialogs.py:1306 msgid "Last but not least, we would like to thank all the package maintainers." -msgstr "ואחרון אחרון חביב, ברצוננו להודות לכל מתחזקי החבילות." +msgstr "‎.ואחרון אחרון חביב, ברצוננו להודות לכל מתחזקי החבילות" #. here you write your name in the form Name FamilyName <someone@somewhere> #: ../src/dialogs.py:1318 @@ -7871,7 +7867,7 @@ "unencrypted. This type of connection is really discouraged.\n" "Are you sure you want to do that?" msgstr "" -"הינך על סף התחברות אל החשבון %(account)s ‏(%(server)s) באמצעות חיבור לא " +"אתה על סף התחברות אל החשבון %(account)s ‏(%(server)s) באמצעות חיבור לא " "מאובטח. משמעות הדבר היא כי כל השיחות אשר יוחלפו עם הקצה השני לא יהיו " "מוצפנות. רצוי להימנע מחיבורים מטיפוס זה.\n" "האם אתה בטוח כי ברצונך לעשות כן?" @@ -8023,7 +8019,7 @@ #: ../src/dialogs.py:2837 ../src/dialogs.py:3222 ../src/dialogs.py:3459 #, python-format msgid "Please make sure you are connected with \"%s\"." -msgstr "אנא ודא כי הינך מחובר בעזרת \"%s\"." +msgstr "אנא ודא כי אתה מחובר בעזרת \"%s\"." #: ../src/dialogs.py:2846 ../src/dialogs.py:2849 msgid "Invalid JID" @@ -8431,8 +8427,7 @@ "OpenPGP Key is assigned to this contact, and you trust his key, so messages " "will be encrypted." msgstr "" -"מפתח OpenPGP מוקצה לאיש קשר זה, והינך סומך על המפתח שלו, אי לכך הודעות " -"יוצפנו." +"מפתח OpenPGP מוקצה לאיש קשר זה, ואתה סומך על המפתח שלו, אי לכך הודעות יוצפנו." #: ../src/dialogs.py:5286 msgid "an audio and video" @@ -9847,7 +9842,6 @@ msgid "system shutdown" msgstr "סגירת מערכת" -# שיוכה/ו של # נקבע #: ../src/groupchat_control.py:1797 #, python-format @@ -9859,7 +9853,6 @@ msgid "** Affiliation of %(nick)s has been set to %(affiliation)s" msgstr "** השיוך של %(nick)s הוגדר אל %(affiliation)s" -# תפקידה/ו של #: ../src/groupchat_control.py:1816 #, python-format msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s" @@ -10046,9 +10039,6 @@ msgid "Do you accept this request on account %s?" msgstr "האם לקבל את בקשה זו בחשבון %s?" -# Needs to be tested -# זהות -# אישור #: ../src/gui_interface.py:160 #, python-format msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)" @@ -10298,7 +10288,7 @@ msgid "" "You are already connected to this account with the same resource. Please " "type a new one" -msgstr "הינך כבר מחובר אל חשבון זה באמצעות אותו משאב. אנא הקלד אחד חדש." +msgstr "אתה כבר מחובר אל חשבון זה באמצעות אותו משאב. אנא הקלד אחד חדש." #. TODO: we should use another pixmap ;-) #: ../src/gui_interface.py:1247 @@ -10354,7 +10344,7 @@ "You are about to send your password on an insecure connection. You should " "install PyOpenSSL to prevent that. Are you sure you want to do that?" msgstr "" -"הינך על סף שליחת סיסמתך על פני חיבור לא מאובטח. עליך להתקין PyOpenSSL בכדי " +"אתה על סף שליחת סיסמתך על פני חיבור לא מאובטח. עליך להתקין PyOpenSSL בכדי " "למנוע זאת. האם אתה בטוח כי ברצונך להתחבר?" #: ../src/gui_interface.py:1489 @@ -10362,7 +10352,7 @@ "You are about to send your password unencrypted on an insecure connection. " "Are you sure you want to do that?" msgstr "" -"הינך על סף שליחת סיסמתך באופן לא מוצפן על פני חיבור לא מאובטח. האם אתה בטוח " +"אתה על סף שליחת סיסמתך באופן לא מוצפן על פני חיבור לא מאובטח. האם אתה בטוח " "כי ברצונך לעשות זאת?" #. theme doesn't exist, disable emoticons @@ -10747,15 +10737,14 @@ #: ../src/roster_window.py:2334 ../src/roster_window.py:3825 msgid "You are participating in one or more group chats" -msgstr "הינך משתתף בשיחת קבוצה אחת או יותר" - -# יוביל, יביא לידי +msgstr "אתה משתתף בשיחת קבוצה אחת או יותר" + #: ../src/roster_window.py:2335 ../src/roster_window.py:3826 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" msgstr "" -"שינוי מצב החיבור שלך אל בלתי נראה ינבע בניתוקך מתוך שיחות קבוצה אלו. האם אתה " +"שינוי מצב החיבור שלך אל בלתי נראה יגרום לניתוק מתוך שיחות קבוצה אלו. האם אתה " "בטוח כי ברצונך להפוך את מצבך אל בלתי נראה?" #: ../src/roster_window.py:2361 @@ -10783,8 +10772,7 @@ msgid "" "If you quit now, the file(s) being transferred will be stopped. Do you still " "want to quit?" -msgstr "" -"אם תצא עכשיו, הקובץ או הקבצים אשר מועברים כעת יופסקו. האם עדיין ברצונך לצאת?" +msgstr "אם תצא עכשיו, הקבצים אשר מועברים כעת יופסקו. האם עדיין ברצונך לצאת?" #: ../src/roster_window.py:2551 ../src/roster_window.py:2988 msgid "You have unread messages" @@ -10808,22 +10796,20 @@ #: ../src/roster_window.py:2992 #, python-format msgid "Transport \"%s\" will be removed" -msgstr "המוביל \"%s\" יוסר" +msgstr "מוביל \"%s\" יוסר" #: ../src/roster_window.py:2993 msgid "" "You will no longer be able to send and receive messages from contacts using " "this transport." msgstr "" -"לא תעמוד עוד לרשותך האפשרות לקבל ולשלוח הודעות מתוך אנשי קשר באמצעות מוביל " -"זה." +"לא תעמוד עוד לרשותך האפשרות לקבל וגם לשלוח הודעות מתוך אנשי קשר באמצעות " +"מוביל זה." #: ../src/roster_window.py:2996 msgid "Transports will be removed" -msgstr "המובילים יוסרו" - -# הטרנספורטים שלהלן -# הטרנספורטים הללו +msgstr "מובילים יוסרו" + #: ../src/roster_window.py:3001 #, python-format msgid "" @@ -10833,8 +10819,6 @@ "לא תעמוד עוד לרשותך האפשרות לקבל ולשלוח הודעות אל אנשי קשר מתוך מובילים אלו: " "%s" -# Needs to be tested -# you have chose to #: ../src/roster_window.py:3043 msgid "You are about to block a contact. Are you sure you want to continue?" msgstr "בחרת לחסום איש קשר. האם אתה בטוח כי ברצונך להמשיך?" @@ -10938,7 +10922,7 @@ "you also remove authorization resulting in them always seeing you as offline." msgstr "" "בהסירך את אנשי קשר אלו:%s\n" -"אתה גם תסיר הרשאה דבר אשר יביא לכך שהם תמיד יראו אותך במצב לא מקוון." +"אתה גם תסיר הרשאה דבר אשר יגרום לכך שהם תמיד יראו אותך במצב לא מקוון." #: ../src/roster_window.py:3722 msgid "" @@ -11148,8 +11132,6 @@ msgid "Error in received dataform" msgstr "שגיאה בקבלת dataform"

1 0

gajim: set transient_for for 'This service does not contain any ...
by Gajim 15 Nov '13

15 Nov '13

changeset 1fed98a5b2e4 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=1fed98a5b2e4 description: set transient_for for 'This service does not contain any items to browse.' diffstat: src/disco.py | 3 ++- 1 файлов изменено, 2 вставок(+), 1 удалений(-) различия (13 строк): diff -r 9c9a3a367746 -r 1fed98a5b2e4 src/disco.py --- a/src/disco.py Thu Nov 14 21:34:15 2013 +0100 +++ b/src/disco.py Fri Nov 15 20:23:41 2013 +0400 @@ -1121,7 +1121,8 @@ # We can't travel anywhere else. self.window.destroy() dialogs.ErrorDialog(_('The service is not browsable'), -_('This service does not contain any items to browse.')) + _('This service does not contain any items to browse.'), + transient_for=self.window.window) return # We got a list of items def fill_partial_rows(items):

1 0

gajim: fix warning message
by Gajim 14 Nov '13

14 Nov '13

changeset 9c9a3a367746 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=9c9a3a367746 description: fix warning message diffstat: src/common/jingle_xtls.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r a71bbdf23465 -r 9c9a3a367746 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Tue Nov 12 21:10:22 2013 +0100 +++ b/src/common/jingle_xtls.py Thu Nov 14 21:34:15 2013 +0100 @@ -116,7 +116,10 @@ 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) + log.warn('Unable to load DH parameter file: %s. You should generate it ' + 'by using this command : "openssl dhparam 4096 -out ' + '~/.config/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:

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