Commits

commits@gajim.org

17632 discussions

gajim: fix using transport sid in jingle IBB instead of jingle sid
by Gajim 24 Feb '14

24 Feb '14

changeset d7d8cb266c79 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=d7d8cb266c79 description: fix using transport sid in jingle IBB instead of jingle sid fix double iq-result sending diffstat: src/common/file_props.py | 7 +++++++ src/common/jingle_content.py | 3 ++- src/common/jingle_ft.py | 7 ------- src/common/jingle_ftstates.py | 1 + src/common/protocol/bytestream.py | 22 +++++++++++----------- 5 files changed, 21 insertions(+), 19 deletions(-) diffs (158 lines): diff -r 65c0d54660a5 -r d7d8cb266c79 src/common/file_props.py --- a/src/common/file_props.py Mon Feb 24 16:54:40 2014 +0100 +++ b/src/common/file_props.py Mon Feb 24 22:13:25 2014 +0100 @@ -63,6 +63,13 @@ return fp @classmethod + def getFilePropByTransportSid(cls, account, sid): + files_prop = cls.getAllFileProp() + for fp in files_prop: + if fp.account == account and fp.transport_sid == sid: + return fp + + @classmethod def getAllFileProp(cls): return cls._files_props.values() diff -r 65c0d54660a5 -r d7d8cb266c79 src/common/jingle_content.py --- a/src/common/jingle_content.py Mon Feb 24 16:54:40 2014 +0100 +++ b/src/common/jingle_content.py Mon Feb 24 22:13:25 2014 +0100 @@ -199,7 +199,8 @@ if self.file_props.size < 10000000 and not \ self.file_props.hash_: h = self._calcHash() - file_tag.addChild(node=h) + if h: + file_tag.addChild(node=h) pjid = gajim.get_jid_without_resource(self.session.peerjid) file_info = {'name' : self.file_props.name, 'file-name' : self.file_props.file_name, diff -r 65c0d54660a5 -r d7d8cb266c79 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Feb 24 16:54:40 2014 +0100 +++ b/src/common/jingle_ft.py Mon Feb 24 22:13:25 2014 +0100 @@ -173,10 +173,6 @@ def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") con = self.session.connection - # We ack the session accept - response = stanza.buildReply('result') - response.delChild(response.getQuery()) - con.connection.send(response) security = content.getTag('security') if not security: # responder can not verify our fingerprint self.use_security = False @@ -288,9 +284,6 @@ 'sendCand' : False} if self.state == STATE_CAND_SENT: self.__state_changed(STATE_CAND_SENT_AND_RECEIVED, args) - response = stanza.buildReply('result') - response.delChild(response.getQuery()) - self.session.connection.connection.send(response) self.__state_changed(STATE_TRANSFERING) raise nbxmpp.NodeProcessed else: diff -r 65c0d54660a5 -r d7d8cb266c79 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Mon Feb 24 16:54:40 2014 +0100 +++ b/src/common/jingle_ftstates.py Mon Feb 24 22:13:25 2014 +0100 @@ -140,6 +140,7 @@ ''' def __start_IBB_transfer(self, con): + self.jft.file_props.transport_sid = self.jft.transport.sid fp = open(self.jft.file_props.file_name, 'r') con.OpenStream( self.jft.file_props.sid, self.jft.session.peerjid, fp, blocksize=4096) diff -r 65c0d54660a5 -r d7d8cb266c79 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Feb 24 16:54:40 2014 +0100 +++ b/src/common/protocol/bytestream.py Mon Feb 24 22:13:25 2014 +0100 @@ -184,6 +184,7 @@ if nbxmpp.NS_BYTESTREAM in file_props.stream_methods: field.setValue(nbxmpp.NS_BYTESTREAM) else: + file_props.transport_sid = file_props.sid field.setValue(nbxmpp.NS_IBB) self.connection.send(iq) @@ -249,6 +250,7 @@ raise nbxmpp.NodeProcessed if field.getValue() == nbxmpp.NS_IBB: sid = file_props.sid + file_props.transport_sid = sid fp = open(file_props.file_name, 'r') self.OpenStream(sid, file_props.receiver, fp) raise nbxmpp.NodeProcessed @@ -780,7 +782,7 @@ blocksize = stanza.getTagAttr('open', 'block-size') log.debug('StreamOpenHandler called sid->%s blocksize->%s' % (sid, blocksize)) - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFilePropByTransportSid(self.name, sid) try: blocksize = int(blocksize) except: @@ -851,8 +853,8 @@ file_props.disconnect_cb = None file_props.continue_cb = None syn = nbxmpp.Protocol('iq', to, 'set', payload=[nbxmpp.Node( - nbxmpp.NS_IBB + ' open', {'sid': sid, 'block-size': blocksize, - 'stanza': 'iq'})]) + nbxmpp.NS_IBB + ' open', {'sid': file_props.transport_sid, + 'block-size': blocksize, 'stanza': 'iq'})]) self.connection.send(syn) file_props.syn_id = syn.getID() return file_props @@ -878,7 +880,8 @@ continue chunk = file_props.fp.read(file_props.block_size) if chunk: - datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', {'sid': sid, + datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', { + 'sid': file_props.transport_sid, 'seq': file_props.seq}, base64.encodestring(chunk)) file_props.seq += 1 file_props.started = True @@ -900,7 +903,7 @@ self.connection.send(nbxmpp.Protocol('iq', file_props.direction[1:], 'set', payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':sid})])) + {'sid': file_props.transport_sid})])) file_props.completed = True def IBBMessageHandler(self, conn, stanza): @@ -919,7 +922,7 @@ seq = '' data = '' err = None - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props is None: err = nbxmpp.ERR_ITEM_NOT_FOUND else: @@ -956,15 +959,12 @@ sid = stanza.getTagAttr('close', 'sid') log.debug('StreamCloseHandler called sid->%s' % sid) # look in sending files - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props: reply = stanza.buildReply('result') reply.delChild('close') conn.send(reply) # look in receiving files - reply = stanza.buildReply('result') - reply.delChild('close') - conn.send(reply) file_props.fp.close() file_props.completed = file_props.received_len >= file_props.size if not file_props.completed: @@ -1004,7 +1004,7 @@ else: if stanza.getTag('data'): sid = stanza.getTagAttr('data', 'sid') - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props.connected and self.IBBMessageHandler(conn, stanza): reply = stanza.buildReply('result')

1 0

gajim: [guybrush88] updated italian translation
by Gajim 24 Feb '14

24 Feb '14

changeset 65c0d54660a5 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=65c0d54660a5 description: [guybrush88] updated italian translation diffstat: po/it.po | 710 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 342 insertions(+), 368 deletions(-) diffs (truncated from 2345 to 300 lines): diff -r 53f76458ae26 -r 65c0d54660a5 po/it.po --- a/po/it.po Sun Feb 23 20:53:04 2014 +0100 +++ b/po/it.po Mon Feb 24 16:54:40 2014 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-17 15:22+0100\n" +"POT-Creation-Date: 2014-02-24 16:39+0100\n" "PO-Revision-Date: 2013-11-15 20:10+0100\n" "Last-Translator: v <noway(a)insiberia.net>\n" "Language-Team: Italian <>\n" @@ -369,7 +369,7 @@ #: ../data/gui/accounts_window.ui.h:38 msgid "_use HTTP__PROXY environment variable" -msgstr "_usare variabile d'ambiente HTTP__PROXY" +msgstr "_usa la variabile d'ambiente HTTP__PROXY" #: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." @@ -1194,7 +1194,7 @@ #: ../data/gui/gajim_themes_window.ui.h:13 msgid "Composing" -msgstr "Scrivendo" +msgstr "Sta scrivendo" #: ../data/gui/gajim_themes_window.ui.h:14 ../src/common/pep.py:150 msgid "Inactive" @@ -1202,11 +1202,11 @@ #: ../data/gui/gajim_themes_window.ui.h:15 msgid "Chatstate Tab Colors" -msgstr "Colori per l'Attività delle Schede" +msgstr "Colori per l'attività delle schede" #: ../data/gui/gajim_themes_window.ui.h:16 msgid "Gone" -msgstr "Andato via" +msgstr "Andato/a via" #: ../data/gui/gajim_themes_window.ui.h:17 msgid "" @@ -1226,23 +1226,23 @@ #: ../data/gui/gc_control_popup_menu.ui.h:1 msgid "Change _Nickname..." -msgstr "Cambia _Nickname..." +msgstr "Cambia il _soprannome..." #: ../data/gui/gc_control_popup_menu.ui.h:2 msgid "_Manage Room" -msgstr "Gestisci stanza" +msgstr "_Gestisci la stanza" #: ../data/gui/gc_control_popup_menu.ui.h:3 msgid "Change _Subject..." -msgstr "Cambia _Oggetto..." +msgstr "Cambia il _soggetto..." #: ../data/gui/gc_control_popup_menu.ui.h:4 msgid "Configure _Room..." -msgstr "Configura _Stanza..." +msgstr "Configura la _stanza..." #: ../data/gui/gc_control_popup_menu.ui.h:5 msgid "_Destroy Room" -msgstr "_Elimina stanza" +msgstr "_Elimina la stanza" #: ../data/gui/gc_control_popup_menu.ui.h:6 msgid "_Minimize on close" @@ -1250,23 +1250,23 @@ #: ../data/gui/gc_control_popup_menu.ui.h:7 msgid "_Request Voice" -msgstr "_Richiedi Voce" +msgstr "_Richiedi la voce" #: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1850 msgid "_Bookmark" -msgstr "Aggiungi _segnalibro" +msgstr "Aggiungi ai _segnalibri" #: ../data/gui/gc_occupants_menu.ui.h:1 msgid "_Send Private Message" -msgstr "_Invia Messaggio Privato" +msgstr "_Invia un messaggio privato" #: ../data/gui/gc_occupants_menu.ui.h:2 msgid "Send _File" -msgstr "Invia _File" +msgstr "Invia un _file" #: ../data/gui/gc_occupants_menu.ui.h:3 msgid "Occupant Actions" -msgstr "Azioni Partecipante" +msgstr "Azioni partecipante" #: ../data/gui/gc_occupants_menu.ui.h:4 msgid "_Voice" @@ -1298,7 +1298,7 @@ #: ../data/gui/gc_occupants_menu.ui.h:12 msgid "_Add to Roster" -msgstr "_Aggiungi alla Lista Contatti" +msgstr "_Aggiungi all'elenco dei contatti" #: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1730 msgid "Show a list of formattings" @@ -1306,7 +1306,7 @@ #: ../data/gui/groupchat_control.ui.h:3 msgid "Change your nickname (Ctrl+N)" -msgstr "Cambia nickname (Ctrl+N)" +msgstr "Cambia il tuo soprannome (Ctrl+N)" #: ../data/gui/groupchat_control.ui.h:4 msgid "Change the room's subject (Alt+T)" @@ -1318,7 +1318,7 @@ #: ../data/gui/groups_post_window.ui.h:1 msgid "Create new post" -msgstr "Crea nuovo post" +msgstr "Crea un nuovo post" #: ../data/gui/groups_post_window.ui.h:2 #: ../data/gui/single_message_window.ui.h:2 @@ -1328,11 +1328,11 @@ #: ../data/gui/groups_post_window.ui.h:3 #: ../data/gui/single_message_window.ui.h:4 msgid "Subject:" -msgstr "Oggetto:" +msgstr "Soggetto:" #: ../data/gui/history_manager.ui.h:1 msgid "Gajim History Logs Manager" -msgstr "Gestore Cronologia di Gajim" +msgstr "Gestore della cronologia di Gajim" #: ../data/gui/history_manager.ui.h:2 msgid "<big>Welcome to Gajim History Logs Manager</big>" @@ -1346,9 +1346,9 @@ "Use this program to delete or export logs. You can select logs from the left " "and/or search database from below." msgstr "" -"Non è previsto usare questo gestore della cronologia per visualizzare file " -"di log. Se si desidera tale funzionalità, usare invece la finestra della " -"cronologia.\n" +"Non è previsto usare questo gestore della cronologia per visualizzare dei " +"file di registro. Se si desidera tale funzionalità, usare invece la finestra " +"della cronologia.\n" "\n" "Usare questo programma per eliminare o esportare file di log. Si possono " "selezionare file di log sulla sinistra e/o cercare nel database qui sotto." @@ -1366,7 +1366,7 @@ #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" -msgstr "_Cerca nel Database" +msgstr "_Cerca nel database" #: ../data/gui/history_manager.ui.h:9 msgid "Export" @@ -1378,15 +1378,15 @@ #: ../data/gui/history_window.ui.h:2 msgid "Groupchat Histories" -msgstr "Cronologia delle Conversazioni di Gruppo" +msgstr "Cronologia delle conversazioni di gruppo" #: ../data/gui/history_window.ui.h:3 msgid "All Chat Histories" -msgstr "Tutte le Cronologie delle Conversazioni" +msgstr "Tutte le cronologie delle conversazioni" #: ../data/gui/history_window.ui.h:4 ../src/history_window.py:326 msgid "Conversation History" -msgstr "Cronologia Conversazioni" +msgstr "Cronologia delle conversazioni" #: ../data/gui/history_window.ui.h:5 msgid "Search:" @@ -1411,7 +1411,7 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:1 msgid "expire" -msgstr "" +msgstr "scade" #: ../data/gui/item_archiving_preferences_window.ui.h:2 msgid "save" @@ -1468,7 +1468,7 @@ #: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2420 msgid "Join Group Chat" -msgstr "Entra in Conversazione di Gruppo" +msgstr "Unisciti alla conversazione di gruppo" #: ../data/gui/join_groupchat_window.ui.h:2 msgid "Room:" @@ -1476,7 +1476,7 @@ #: ../data/gui/join_groupchat_window.ui.h:3 msgid "Nickname:" -msgstr "Nickname:" +msgstr "Soprannome:" #: ../data/gui/join_groupchat_window.ui.h:4 msgid "Recently:" @@ -1500,16 +1500,16 @@ #: ../data/gui/join_groupchat_window.ui.h:10 msgid "Bro_wse Rooms" -msgstr "Esp_lora Stanze" +msgstr "Esp_lora le stanze" #: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3414 #: ../src/disco.py:1412 ../src/disco.py:1854 msgid "_Join" -msgstr "_Entra" +msgstr "_Unisciti" #: ../data/gui/manage_bookmarks_window.ui.h:1 msgid "Manage Bookmarks" -msgstr "Gestisci Segnalibri" +msgstr "Gestisci i segnalibri" #: ../data/gui/manage_bookmarks_window.ui.h:4 msgid "Roo_m:" @@ -1521,11 +1521,11 @@ #: ../data/gui/manage_bookmarks_window.ui.h:7 msgid "Pr_int status:" -msgstr "Stampa stato:" +msgstr "St_ampa stato:" #: ../data/gui/manage_bookmarks_window.ui.h:8 msgid "A_uto join" -msgstr "Entra _automaticamente" +msgstr "Unisciti _automaticamente" #: ../data/gui/manage_bookmarks_window.ui.h:9 msgid "If checked, Gajim will join this group chat on startup" @@ -1533,11 +1533,11 @@ #: ../data/gui/manage_bookmarks_window.ui.h:10 msgid "Minimi_ze on Auto Join" -msgstr "Minimizza all'Entrata Automatica" +msgstr "Minimizza all'entrata automatica" #: ../data/gui/manage_pep_services_window.ui.h:1 msgid "PEP Service Configuration" -msgstr "Configurazione Servizio PEP" +msgstr "Configurazione del servizio PEP" #: ../data/gui/manage_pep_services_window.ui.h:2 msgid "_Configure" @@ -1557,7 +1557,7 @@ #: ../data/gui/manage_proxies_window.ui.h:4 msgid "Manage Proxy Profiles" -msgstr "Gestisci Profili Proxy" +msgstr "Gestisci i profili proxy" #: ../data/gui/manage_proxies_window.ui.h:5 msgid "_Type:" @@ -1581,7 +1581,7 @@ #: ../data/gui/manage_proxies_window.ui.h:10 msgid "Use proxy auth_entication" -msgstr "Usa aut_enticazione proxy" +msgstr "Usa l'aut_enticazione proxy" #: ../data/gui/manage_proxies_window.ui.h:11 msgid "_Username:" @@ -1593,11 +1593,11 @@ #: ../data/gui/manage_proxies_window.ui.h:13 msgid "Proxy _Host:" -msgstr "Proxy:" +msgstr "_Host proxy:" #: ../data/gui/manage_proxies_window.ui.h:14 msgid "Proxy _Port:" -msgstr "_Porta Proxy:" +msgstr "_Porta proxy:" #: ../data/gui/manage_proxies_window.ui.h:15 msgid "Settings" @@ -1605,11 +1605,11 @@ #: ../data/gui/manage_sounds_window.ui.h:1 msgid "Manage sounds" -msgstr "Gestisci suoni" +msgstr "Gestisci i suoni" #: ../data/gui/passphrase_dialog.ui.h:1 msgid "Passphrase"

1 0

gajim: don't fail to receive a jingle FT request with no <securi...
by Gajim 23 Feb '14

23 Feb '14

changeset 53f76458ae26 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=53f76458ae26 description: don't fail to receive a jingle FT request with no <security> tag diffstat: src/common/connection_handlers_events.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 5ccb2dae7ded -r 53f76458ae26 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Feb 20 22:27:21 2014 +0400 +++ b/src/common/connection_handlers_events.py Sun Feb 23 20:53:04 2014 +0100 @@ -2060,9 +2060,10 @@ if self.jingle_content: secu = self.jingle_content.getTag('security') self.FT_content.use_security = bool(secu) - fingerprint = secu.getTag('fingerprint') - if fingerprint: - self.FT_content.x509_fingerprint = fingerprint.getData() + if secu: + fingerprint = secu.getTag('fingerprint') + if fingerprint: + self.FT_content.x509_fingerprint = fingerprint.getData() if not self.FT_content.transport: self.FT_content.transport = JingleTransportSocks5() self.FT_content.transport.set_our_jid(

1 0

gajim: [Darlan] Update Hebrew translation
by Gajim 20 Feb '14

20 Feb '14

changeset 5ccb2dae7ded 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=5ccb2dae7ded description: [Darlan] Update Hebrew translation diffstat: po/he.po | 964 +++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 483 вставок(+), 481 удалений(-) различия (урезанные с 2874 до 300 строк): diff -r c7cc7d2725c3 -r 5ccb2dae7ded po/he.po --- a/po/he.po Mon Feb 17 15:26:09 2014 +0100 +++ b/po/he.po Thu Feb 20 22:27:21 2014 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-19 03:05+0000\n" -"PO-Revision-Date: 2013-11-29 12:59+0200\n" +"POT-Creation-Date: 2014-01-24 03:05+0000\n" +"PO-Revision-Date: 2014-02-20 18:25+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -89,7 +89,7 @@ # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "אנא מלא את נתוני ההתחברות עבור חשבונך הקיים" +msgstr "אנא מלא את נתוני ההתחברות בשביל חשבונך הקיים" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -190,8 +190,8 @@ #: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 #: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3157 -#: ../src/roster_window.py:3163 ../src/roster_window.py:3168 +#: ../src/dialogs.py:537 ../src/roster_window.py:3158 +#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 msgid "None" msgstr "ללא" @@ -254,7 +254,7 @@ #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחץ בכדי לבקש הרשאות עבור כל איש קשר של חשבון אחר" +msgstr "לחץ בכדי לבקש הרשאות מכל איש קשר של חשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -381,8 +381,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3099 ../src/roster_window.py:4225 -#: ../src/roster_window.py:5860 +#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 +#: ../src/roster_window.py:5871 msgid "General" msgstr "כללית" @@ -778,8 +778,8 @@ #: ../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:619 -#: ../src/roster_window.py:5829 ../src/roster_window.py:5956 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:676 +#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 msgid "_Unblock" msgstr "_בטל חסימה" @@ -974,7 +974,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:529 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:586 msgid "Send Single _Message..." msgstr "שליחת הודעה _בודדת..." @@ -984,8 +984,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5760 -#: ../src/roster_window.py:5924 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 +#: ../src/roster_window.py:5941 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1003,13 +1003,13 @@ msgstr "הפעל הצפנת קצה אל קצה" #. Send Custom Status -#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:543 -#: ../src/roster_window.py:5770 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:600 +#: ../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:579 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:636 msgid "E_xecute Command..." msgstr "הרצת _פקודה..." @@ -1018,13 +1018,13 @@ msgstr "_נהל איש קשר" #. Rename -#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:606 -#: ../src/roster_window.py:5810 +#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:663 +#: ../src/roster_window.py:5821 msgid "_Rename..." msgstr "_שינוי שם..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5945 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 msgid "Edit _Groups..." msgstr "עריכת _קבוצות..." @@ -1057,8 +1057,8 @@ msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:622 -#: ../src/roster_window.py:5837 ../src/roster_window.py:5962 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:679 +#: ../src/roster_window.py:5848 ../src/roster_window.py:5980 msgid "_Block" msgstr "_חסום" @@ -1072,15 +1072,15 @@ #. Remove #. Remove group -#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:632 -#: ../src/roster_window.py:5847 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:689 +#: ../src/roster_window.py:5858 msgid "Remo_ve" msgstr "הס_ר" #: ../data/gui/contact_context_menu.ui.h:26 #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6038 +#: ../src/roster_window.py:6056 msgid "_History" msgstr "_היסטוריה" @@ -1213,11 +1213,11 @@ msgid "Font style:" msgstr "סגנון גופן:" -#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1045 +#: ../data/gui/gajim_themes_window.ui.h:10 ../src/chat_control.py:1046 msgid "Bold" msgstr "מובלט" -#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1046 +#: ../data/gui/gajim_themes_window.ui.h:11 ../src/chat_control.py:1047 msgid "Italic" msgstr "נטוי" @@ -1286,7 +1286,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1849 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1850 msgid "_Bookmark" msgstr "_סמן" @@ -1334,7 +1334,7 @@ msgid "_Add to Roster" msgstr "הו_סף אל רשימה" -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1723 +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1730 msgid "Show a list of formattings" msgstr "הצגת רשימת עיצובים" @@ -1543,8 +1543,8 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3396 -#: ../src/disco.py:1411 ../src/disco.py:1853 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3414 +#: ../src/disco.py:1412 ../src/disco.py:1854 msgid "_Join" msgstr "_כנס" @@ -1897,7 +1897,7 @@ #: ../data/gui/preferences_window.ui.h:37 msgid "Show icon when your messages are received" -msgstr "הצג צלמית כאשר הודעותיך מתקבלות" +msgstr "הצג צלמית כאשר ההודעות שלך מתקבלות" # תרשימיים, נייחים #: ../data/gui/preferences_window.ui.h:38 @@ -2633,7 +2633,7 @@ msgstr "מה ברצונך לעשות?" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5972 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 msgid "_Remove" msgstr "הס_ר" @@ -2667,7 +2667,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1564 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1565 msgid "_Edit" msgstr "ע_ריכה" @@ -2750,11 +2750,11 @@ msgstr "הוסף _איש קשר" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:644 +#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:701 msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1420 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1421 msgid "_Search" msgstr "_חפש" @@ -3051,7 +3051,7 @@ msgid "Text" msgstr "תמליל" -#: ../src/advanced_configuration_window.py:98 ../src/chat_control.py:1065 +#: ../src/advanced_configuration_window.py:98 ../src/chat_control.py:1066 msgid "Color" msgstr "צבע" @@ -3106,104 +3106,106 @@ msgid "Your message can not be sent until you are connected." msgstr "הודעתך לא יכולה להישלח עד אשר תהיה מחובר." -#: ../src/chat_control.py:1047 +#: ../src/chat_control.py:1048 msgid "Underline" msgstr "קו תחתון" -#: ../src/chat_control.py:1048 +#: ../src/chat_control.py:1049 msgid "Strike" msgstr "קו חוצה" -#: ../src/chat_control.py:1071 +#: ../src/chat_control.py:1072 msgid "Font" msgstr "גופן" # Reset -#: ../src/chat_control.py:1080 +#: ../src/chat_control.py:1081 msgid "Clear formating" msgstr "איפוס עיצוב" -#: ../src/chat_control.py:1157 +#: ../src/chat_control.py:1158 msgid "Really send file?" msgstr "האם באמת לשלוח קובץ?" -#: ../src/chat_control.py:1158 +#: ../src/chat_control.py:1159 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובתך (מזהה Jabber) המלאה." -#: ../src/chat_control.py:1665 ../src/chat_control.py:2250 +#: ../src/chat_control.py:1672 ../src/chat_control.py:2268 msgid "OpenPGP encryption enabled" msgstr "הצפנת OpenPGP מאופשרת" -#: ../src/chat_control.py:1727 +#: ../src/chat_control.py:1734 msgid "Formattings are not available when GPG is active" msgstr "עיצובים אינם נתמכים כאשר GPG הינו פעיל" -#: ../src/chat_control.py:1730 +#: ../src/chat_control.py:1737 msgid "This contact does not support HTML" msgstr "איש קשר זה לא תומך HTML" #. Add to roster -#: ../src/chat_control.py:1735 ../src/common/contacts.py:152 +#: ../src/chat_control.py:1742 ../src/common/contacts.py:152 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 #: ../src/common/helpers.py:261 ../src/dialogs.py:1106 ../src/dialogs.py:2314 #: ../src/dialogs.py:2343 ../src/dialogs.py:3561 ../src/gui_interface.py:485 -#: ../src/gui_menu_builder.py:279 ../src/gui_menu_builder.py:434

1 0

python-nbxmpp: add NS_MSG_HINTS
by Yann Leboulanger 19 Feb '14

19 Feb '14

changeset 3a7acfa0b346 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=3a7acfa0b346 description: add NS_MSG_HINTS diffstat: nbxmpp/__init__.py | 2 +- nbxmpp/protocol.py | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diffs (20 lines): diff -r cadd7701fcfe -r 3a7acfa0b346 nbxmpp/__init__.py --- a/nbxmpp/__init__.py Wed Jan 29 16:47:10 2014 +0100 +++ b/nbxmpp/__init__.py Wed Feb 19 10:30:13 2014 +0100 @@ -17,4 +17,4 @@ from plugin import PlugIn from smacks import Smacks -__version__ = "0.3.1" +__version__ = "0.3.2" diff -r cadd7701fcfe -r 3a7acfa0b346 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Wed Jan 29 16:47:10 2014 +0100 +++ b/nbxmpp/protocol.py Wed Feb 19 10:30:13 2014 +0100 @@ -83,6 +83,7 @@ NS_GATEWAY = 'jabber:iq:gateway' # XEP-0100 NS_GEOLOC = 'http://jabber.org/protocol/geoloc' # XEP-0080 NS_GROUPCHAT = 'gc-1.0' +NS_MSG_HINTS = 'urn:xmpp:hints' # XEP-0280 NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 NS_IBB = 'http://jabber.org/protocol/ibb'

1 0

gajim: correct for API changes in pyOpenSSL
by Gajim 18 Feb '14

18 Feb '14

changeset 49aa84ae4f2d in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=49aa84ae4f2d description: correct for API changes in pyOpenSSL Fixes #7662 diffstat: src/gajim.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 0edfd3fd28f0 -r 49aa84ae4f2d src/gajim.py --- a/src/gajim.py Tue Feb 18 09:39:48 2014 +0100 +++ b/src/gajim.py Tue Feb 18 10:09:03 2014 +0100 @@ -320,7 +320,10 @@ from common import crypto PYOPENSSL_PRNG_PRESENT = True # Seed from file - OpenSSL.rand.load_file(str(RNG_SEED).encode('utf-8')) + try: + OpenSSL.rand.load_file(RNG_SEED) + except TypeError: + OpenSSL.rand.load_file(RNG_SEED.encode('utf-8')) crypto.add_entropy_sources_OpenSSL() except ImportError: log.info("PyOpenSSL PRNG not available") @@ -473,7 +476,10 @@ def on_exit(): # Save the entropy from OpenSSL PRNG if PYOPENSSL_PRNG_PRESENT: - OpenSSL.rand.write_file(str(RNG_SEED).encode('utf-8')) + try: + OpenSSL.rand.write_file(RNG_SEED) + except TypeError: + OpenSSL.rand.write_file(RNG_SEED.encode('utf-8')) # delete pid file on normal exit if os.path.exists(pid_filename): os.remove(pid_filename)

1 0

gajim: Replace the obsolete method warn.
by Gajim 18 Feb '14

18 Feb '14

changeset 0edfd3fd28f0 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0edfd3fd28f0 description: Replace the obsolete method warn. http://docs.python.org/3/library/logging.html Note: There is an obsolete method warn which is functionally identical to warning. As warn is deprecated, please do not use it - use warning instead. diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 424f244a3725 -r 0edfd3fd28f0 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Jan 29 14:12:10 2014 +0100 +++ b/src/common/connection_handlers_events.py Tue Feb 18 09:39:48 2014 +0100 @@ -1207,7 +1207,7 @@ try: self.room_jid = helpers.parse_jid(invite_tag.getAttr('jid')) except helpers.InvalidFormat: - log.warn('Invalid JID: %s, ignoring it' % invite_tag.getAttr( + log.warning('Invalid JID: %s, ignoring it' % invite_tag.getAttr( 'jid')) return self.jid_from = self.msg_obj.fjid

1 0

python-nbxmpp: Replace the obsolete method warn.
by Fedor Brunner 18 Feb '14

18 Feb '14

changeset 1196b6ac3d82 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1196b6ac3d82 description: Replace the obsolete method warn. http://docs.python.org/3/library/logging.html Note: There is an obsolete method warn which is functionally identical to warning. As warn is deprecated, please do not use it - use warning instead. diffstat: nbxmpp/auth_nb.py | 2 +- nbxmpp/bosh.py | 6 +++--- nbxmpp/dispatcher_nb.py | 4 ++-- nbxmpp/transports_nb.py | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diffs (107 lines): diff -r 8bd30c2236ef -r 1196b6ac3d82 nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Tue Jan 21 00:15:25 2014 +0100 +++ b/nbxmpp/auth_nb.py Tue Feb 18 09:27:16 2014 +0100 @@ -582,7 +582,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Secure methods unsupported, performing plain text \ + log.warning("Secure methods unsupported, performing plain text \ authentication") self._method = 'plain' self._owner._caller.get_password(self._on_password, self._method) diff -r 8bd30c2236ef -r 1196b6ac3d82 nbxmpp/bosh.py --- a/nbxmpp/bosh.py Tue Jan 21 00:15:25 2014 +0100 +++ b/nbxmpp/bosh.py Tue Feb 18 09:27:16 2014 +0100 @@ -129,7 +129,7 @@ if self.get_state() != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: - log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) + log.warning('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) def on_http_request_possible(self): """ @@ -216,7 +216,7 @@ # sent after HTTP response from CM, exception is when we're disconnecting - then we # send anyway if total_pending_reqs >= self.bosh_requests and self.get_state()!=DISCONNECTING: - log.warn('attemp to make more requests than allowed by Connection Manager:\n%s' % + log.warning('attemp to make more requests than allowed by Connection Manager:\n%s' % self.get_current_state()) return @@ -309,7 +309,7 @@ :param socket: disconnected transport object """ if socket.http_persistent: - log.warn('Fallback to nonpersistent HTTP (no pipelining as well)') + log.warning('Fallback to nonpersistent HTTP (no pipelining as well)') socket.http_persistent = False self.http_persistent = False self.http_pipelining = False diff -r 8bd30c2236ef -r 1196b6ac3d82 nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Tue Jan 21 00:15:25 2014 +0100 +++ b/nbxmpp/dispatcher_nb.py Tue Feb 18 09:27:16 2014 +0100 @@ -428,12 +428,12 @@ # log.info('in dispatch, getting ns for %s, and the ns is %s' # % (stanza, xmlns)) if xmlns not in self.handlers: - log.warn("Unknown namespace: " + xmlns) + log.warning("Unknown namespace: " + xmlns) xmlns = 'unknown' # features stanza has been handled before if name not in self.handlers[xmlns]: if name != 'features': - log.warn("Unknown stanza: " + name) + log.warning("Unknown stanza: " + name) else: log.debug("Got %s/%s stanza" % (xmlns, name)) name='unknown' diff -r 8bd30c2236ef -r 1196b6ac3d82 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Tue Jan 21 00:15:25 2014 +0100 +++ b/nbxmpp/transports_nb.py Tue Feb 18 09:27:16 2014 +0100 @@ -52,7 +52,7 @@ try: port = splitted.port except ValueError: - log.warn('port cannot be extracted from BOSH URL %s, using default port' \ + log.warning('port cannot be extracted from BOSH URL %s, using default port' \ % uri) port = '' if not port: @@ -224,7 +224,7 @@ if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: - log.warn('No Dispatcher plugged. Received data will not be processed') + log.warning('No Dispatcher plugged. Received data will not be processed') self.on_receive = None return self.on_receive = recv_handler @@ -482,14 +482,14 @@ if self.get_state() != DISCONNECTED and self.fd != -1: NonBlockingTransport.set_timeout(self, timeout) else: - log.warn('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % + log.warning('set_timeout: TIMEOUT NOT SET: state is %s, fd is %s' % (self.get_state(), self.fd)) def remove_timeout(self): if self.fd: NonBlockingTransport.remove_timeout(self) else: - log.warn('remove_timeout: no self.fd state is %s' % self.get_state()) + log.warning('remove_timeout: no self.fd state is %s' % self.get_state()) def send(self, raw_data, now=False): """ @@ -542,7 +542,7 @@ """ if not self.sendbuff: if not self.sendqueue: - log.warn('calling send on empty buffer and queue') + log.warning('calling send on empty buffer and queue') self._plug_idle(writable=False, readable=True) return None self.sendbuff = self.sendqueue.pop(0)

1 0

gajim: Disable TLS tickets (RFC 5077) in OpenSSL Context for XTLS.
by Gajim 17 Feb '14

17 Feb '14

changeset 424f244a3725 in /home/hg/repos/gajim author: Fedor Brunner <fedor.brunner(a)azet.sk> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=424f244a3725 description: Disable TLS tickets (RFC 5077) in OpenSSL Context for XTLS. More on the effect of TLS tickets: https://media.blackhat.com/us-13/US-13-Daigniere-TLS-Secrets-Slides.pdf Fixes #7638 diffstat: src/common/jingle_xtls.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r c5405ee71751 -r 424f244a3725 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Feb 17 14:54:20 2014 +0100 +++ b/src/common/jingle_xtls.py Wed Jan 29 14:12:10 2014 +0100 @@ -99,7 +99,8 @@ constructs and returns the context objects """ ctx = SSL.Context(SSL.SSLv23_METHOD) - flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE) + flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE \ + | SSL.OP_NO_TICKET) ctx.set_options(flags) ctx.set_cipher_list('HIGH:!aNULL:!3DES')

1 0

gajim: updated french translation
by Gajim 17 Feb '14

17 Feb '14

changeset b01f49d73ae9 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=b01f49d73ae9 description: updated french translation diffstat: po/fr.po | 2567 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 1228 insertions(+), 1339 deletions(-) diffs (truncated from 6475 to 300 lines): diff -r ae6b6f66f9c3 -r b01f49d73ae9 po/fr.po --- a/po/fr.po Mon Feb 17 15:25:01 2014 +0100 +++ b/po/fr.po Mon Feb 17 15:25:13 2014 +0100 @@ -8,19 +8,18 @@ msgstr "" "Project-Id-Version: gajim 0.12 svn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-29 15:27+0200\n" -"PO-Revision-Date: 2011-05-30 08:28+0100\n" -"Last-Translator: Florent Le Coz <louizatakk(a)fedoraproject.org>\n" +"POT-Creation-Date: 2014-02-17 15:22+0100\n" +"PO-Revision-Date: 2014-02-17 15:19+0100\n" +"Last-Translator: Yann Leboulanger <asterix(a)lagaule.org>\n" "Language-Team: <>\n" -"Language: \n" +"Language: fr_FR\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-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: /home/louiz/gajim\n" -"X-Poedit-Country: FRANCE\n" -"X-Poedit-Language: French\n" +"X-Generator: Poedit 1.5.4\n" "X-Poedit-SearchPath-0: .\n" #: ../data/gui/account_context_menu.ui.h:1 @@ -33,12 +32,15 @@ msgstr "Évènements P_ersonnels" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." msgstr "Commencer une _discussion..." -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "_Rejoindre un _salon de discussion..." +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "Rejoindre un _salon de discussion" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -57,8 +59,9 @@ msgstr "_Accéder au compte Gmail" #: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "_Modifier le compte" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." +msgstr "_Modifier le compte..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -180,13 +183,13 @@ #: ../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:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748 +#: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 +#: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 +#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 +#: ../src/dialogs.py:537 ../src/roster_window.py:3158 +#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 msgid "None" msgstr "Aucun" @@ -195,26 +198,25 @@ msgstr "Comptes" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3580 msgid "Add" msgstr "Ajouter" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 +#: ../src/dialogs.py:3635 msgid "Delete" msgstr "Supprimer" -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "Re_nommer" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "Activ_er" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4188 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "Actif" #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" @@ -361,9 +363,9 @@ #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 -#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5842 +#: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 +#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 +#: ../src/roster_window.py:5871 msgid "General" msgstr "Général" @@ -423,8 +425,8 @@ msgid "Connection" msgstr "Connexion" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 -#: ../src/config.py:2436 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1846 +#: ../src/config.py:2446 msgid "No key selected" msgstr "Pas de clé sélectionnée" @@ -501,8 +503,8 @@ msgstr "Courriel :" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 -#: ../src/dialogs.py:841 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1873 +#: ../src/dialogs.py:842 msgid "Jabber ID:" msgstr "Identifiant Jabber :" @@ -590,7 +592,6 @@ msgstr "Revérifier" #: ../data/gui/adhoc_commands_window.ui.h:5 -#, fuzzy msgid "Please wait while the command is being sent..." msgstr "Merci de patienter pendant l'envoi de la commande..." @@ -634,9 +635,8 @@ "de vos modifications." #: ../data/gui/advanced_configuration_window.ui.h:5 -#, fuzzy msgid "_Reset to default" -msgstr "Utilise_r les couleurs par défaut" +msgstr "Utilise_r la valeur par défaut" #: ../data/gui/advanced_menuitem_menu.ui.h:1 msgid "Show _XML Console" @@ -744,7 +744,7 @@ #: ../data/gui/atom_entry_window.ui.h:6 msgid "Next entry" -msgstr "" +msgstr "Prochaine entrée" #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" @@ -752,8 +752,8 @@ #: ../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/roster_window.py:5811 -#: ../src/roster_window.py:5938 ../src/roster_window.py:6071 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:676 +#: ../src/roster_window.py:5840 ../src/roster_window.py:5974 msgid "_Unblock" msgstr "_Débloquer" @@ -827,14 +827,9 @@ #: ../data/gui/chat_context_menu.ui.h:5 #: ../data/gui/subscription_request_popup_menu.ui.h:1 -#: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat" msgstr "Commencer une _discussion" -#: ../data/gui/chat_context_menu.ui.h:6 -msgid "Join _Group Chat" -msgstr "Rejoindre un _salon de discussion" - #: ../data/gui/chat_context_menu.ui.h:7 #: ../data/gui/contact_context_menu.ui.h:24 msgid "_Add to Roster..." @@ -853,75 +848,72 @@ msgstr "Inviter des contacts dans la conversation (Ctrl+G)" #: ../data/gui/chat_control.ui.h:4 -#, fuzzy msgid "View contact information (Ctrl+I)" -msgstr "Inviter des contacts dans la conversation (Ctrl+G)" +msgstr "Voir les informations du contact (Ctrl+I)" #: ../data/gui/chat_control.ui.h:5 ../data/gui/groupchat_control.ui.h:6 msgid "Browse the chat history (Ctrl+H)" msgstr "Parcourir l'historique des conversations (Ctrl+H)" #: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 -#, fuzzy msgid "Show advanced functions (Alt+D)" -msgstr "Affiche un menu de fonctions avancées (Alt+A)" +msgstr "Afficher les fonctions avancées (Alt+D)" #: ../data/gui/chat_control.ui.h:7 msgid "#" msgstr "#" #: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8 +#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 +msgid "_Send" +msgstr "En_voyer" + +#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" msgstr "Envoyer le message" -#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) -#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10 -#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 -msgid "_Send" -msgstr "En_voyer" - -#: ../data/gui/chat_control.ui.h:11 +#: ../data/gui/chat_control.ui.h:10 msgid "1" msgstr "1" -#: ../data/gui/chat_control.ui.h:12 +#: ../data/gui/chat_control.ui.h:11 msgid "2" msgstr "2" -#: ../data/gui/chat_control.ui.h:13 +#: ../data/gui/chat_control.ui.h:12 msgid "3" msgstr "3" -#: ../data/gui/chat_control.ui.h:14 +#: ../data/gui/chat_control.ui.h:13 msgid "4" msgstr "4" -#: ../data/gui/chat_control.ui.h:15 +#: ../data/gui/chat_control.ui.h:14 msgid "5" msgstr "5" -#: ../data/gui/chat_control.ui.h:16 +#: ../data/gui/chat_control.ui.h:15 msgid "6" msgstr "6" -#: ../data/gui/chat_control.ui.h:17 +#: ../data/gui/chat_control.ui.h:16 msgid "7" msgstr "7" -#: ../data/gui/chat_control.ui.h:18 +#: ../data/gui/chat_control.ui.h:17 msgid "8" msgstr "8" -#: ../data/gui/chat_control.ui.h:19 +#: ../data/gui/chat_control.ui.h:18 msgid "9" msgstr "9" -#: ../data/gui/chat_control.ui.h:20 +#: ../data/gui/chat_control.ui.h:19 msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3 +#: ../data/gui/chat_control.ui.h:20 ../data/gui/single_message_window.ui.h:3 msgid "0" msgstr "0" @@ -953,7 +945,9 @@

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