Commits

commits@gajim.org

17632 discussions

gajim: Fix AcronymsExpander plugin
by Gajim 31 May '14

31 May '14

changeset 24cfe0ae65b8 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=24cfe0ae65b8 description: Fix AcronymsExpander plugin diffstat: plugins/acronyms_expander/acronyms_expander.py | 3 +++ 1 файлов изменено, 3 вставок(+), 0 удалений(-) различия (20 строк): diff -r 7afa8676d335 -r 24cfe0ae65b8 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Fri May 30 20:37:19 2014 +0200 +++ b/plugins/acronyms_expander/acronyms_expander.py Sat May 31 11:46:47 2014 +0400 @@ -25,6 +25,7 @@ ''' import sys +import os import gtk import gobject @@ -63,6 +64,8 @@ @log_calls('AcronymsExpanderPlugin') def get_own_acronyms_list(self): data_file = self.local_file_path('acronyms') + if not os.path.isfile(data_file): + return {} data = open(data_file, 'r') acronyms = eval(data.read()) data.close()

1 0

gajim: fix sending codecs
by Gajim 30 May '14

30 May '14

changeset 7afa8676d335 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=7afa8676d335 description: fix sending codecs diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 813f346d466b -r 7afa8676d335 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon May 12 21:40:41 2014 +0400 +++ b/src/common/jingle_rtp.py Fri May 30 20:37:19 2014 +0200 @@ -156,7 +156,7 @@ def _fill_content(self, content): content.addChild(nbxmpp.NS_JINGLE_RTP + ' description', - attrs={'media': self.media}, payload=self.iter_codecs()) + attrs={'media': self.media}, payload=list(self.iter_codecs())) def _setup_funnel(self): self.funnel = gst.element_factory_make('fsfunnel')

1 0

gajim: add a not to not translate an example string
by Gajim 29 May '14

29 May '14

changeset 097ac847b4b7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=097ac847b4b7 description: add a not to not translate an example string diffstat: src/command_system/implementation/custom.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 2ab884979ec1 -r 097ac847b4b7 src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Thu May 29 22:46:48 2014 +0200 +++ b/src/command_system/implementation/custom.py Thu May 29 23:28:25 2014 +0200 @@ -102,6 +102,7 @@ HOSTS = PrivateChatCommands, @command + #Example string. Do not translate @doc(_("The same as using a doc-string, except it supports translation")) def make_coffee(self): return "I'm not a coffee machine!" @@ -118,4 +119,4 @@ @command def fetch(self): - return "Buy yourself a dog." \ No newline at end of file + return "Buy yourself a dog."

1 0

gajim: add a warning icon next to warning message in ACE. Fixes ...
by Gajim 29 May '14

29 May '14

changeset 2ab884979ec1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2ab884979ec1 description: add a warning icon next to warning message in ACE. Fixes #7759 diffstat: data/gui/advanced_configuration_window.ui | 135 +++++++++++++++++------------ src/advanced_configuration_window.py | 9 +- 2 files changed, 82 insertions(+), 62 deletions(-) diffs (271 lines): diff -r 9dbca6d480c4 -r 2ab884979ec1 data/gui/advanced_configuration_window.ui --- a/data/gui/advanced_configuration_window.ui Tue Apr 08 22:47:43 2014 +0200 +++ b/data/gui/advanced_configuration_window.ui Thu May 29 22:46:48 2014 +0200 @@ -1,40 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> + <interface> - <requires lib="gtk+" version="2.16"/> + <requires lib="gtk+" version="3.10"/> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-warning</property> + </object> <object class="GtkWindow" id="advanced_configuration_window"> <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Configuration Editor</property> + <property name="role">ace</property> <property name="window_position">center-on-parent</property> - <property name="role">ace</property> <property name="default_width">650</property> <property name="default_height">540</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> <child> - <object class="GtkVBox" id="vbox70"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkTable" id="table26"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">7</property> + <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label248"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Filter:</property> </object> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> @@ -44,41 +47,41 @@ <signal name="changed" handler="on_advanced_entry_changed" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow36"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow36"> + <object class="GtkTreeView" id="advanced_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="advanced_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="rules_hint">True</property> - <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <property name="rules_hint">True</property> + <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> </child> </object> - <packing> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="padding">1</property> + <property name="position">1</property> </packing> </child> <child> @@ -116,25 +119,46 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="restart_label"> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">NOTE: You should restart Gajim for some settings to take effect</property> - <property name="use_markup">True</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkHButtonBox" id="hbuttonbox18"> + <object class="GtkBox" id="restart_box"> + <property name="can_focus">False</property> + <child> + <object class="GtkImage" id="image3"> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-warning</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="restart_label"> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">NOTE: You should restart Gajim for some settings to take effect</property> + <property name="use_markup">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -142,12 +166,10 @@ <child> <object class="GtkButton" id="reset_button"> <property name="label" translatable="yes">_Reset to default</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="image">image1</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> @@ -161,12 +183,10 @@ <child> <object class="GtkButton" id="advanced_close_button"> <property name="label">gtk-close</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> <signal name="clicked" handler="on_advanced_close_button_clicked" swapped="no"/> </object> @@ -180,14 +200,13 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> </child> </object> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-undo</property> diff -r 9dbca6d480c4 -r 2ab884979ec1 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Apr 08 22:47:43 2014 +0200 +++ b/src/advanced_configuration_window.py Thu May 29 22:46:48 2014 +0200 @@ -81,7 +81,7 @@ gajim.interface.instances['preferences'].window) self.entry = self.xml.get_object('advanced_entry') self.desc_label = self.xml.get_object('advanced_desc_label') - self.restart_label = self.xml.get_object('restart_label') + self.restart_box = self.xml.get_object('restart_box') self.reset_button = self.xml.get_object('reset_button') # Format: @@ -133,8 +133,8 @@ self.on_advanced_treeview_selection_changed) self.xml.connect_signals(self) + self.restart_box.set_no_show_all(True) self.window.show_all() - self.restart_label.hide() gajim.interface.instances['advanced_config'] = self def cb_value_column_data(self, col, cell, model, iter_, data): @@ -218,7 +218,7 @@ self.check_for_restart() def check_for_restart(self): - self.restart_label.hide() + self.restart_box.hide() for opt in self.changed_opts: opt_path = opt.split('\n') if len(opt_path)==3: @@ -228,7 +228,8 @@ restart = gajim.config.get_restart(opt_path[0]) if restart: if self.changed_opts[opt][0] != self.changed_opts[opt][1]: - self.restart_label.show() + self.restart_box.set_no_show_all(False) + self.restart_box.show_all() break def on_config_edited(self, cell, path, text):

1 0

gajim: [Davide Pizzetti] Updated italian translation
by Gajim 12 May '14

12 May '14

changeset 813f346d466b 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=813f346d466b description: [Davide Pizzetti] Updated italian translation diffstat: po/it.po | 835 +++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 415 вставок(+), 420 удалений(-) различия (урезанные с 2473 до 300 строк): diff -r 87aff98e45e5 -r 813f346d466b po/it.po --- a/po/it.po Fri Apr 25 12:48:39 2014 +0200 +++ b/po/it.po Mon May 12 21:40:41 2014 +0400 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-21 21:07+0200\n" -"PO-Revision-Date: 2014-04-16 23:42+0200\n" +"POT-Creation-Date: 2014-02-25 14:36+0100\n" +"PO-Revision-Date: 2014-05-12 12:00+0200\n" "Last-Translator: Davide Pizzetti <erpizzo(a)alice.it>\n" "Language-Team: Gajim Translators\n" "Language: it\n" @@ -187,8 +187,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:3161 -#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 +#: ../src/dialogs.py:537 ../src/roster_window.py:3158 +#: ../src/roster_window.py:3164 ../src/roster_window.py:3169 msgid "None" msgstr "Nessuno" @@ -363,8 +363,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:3103 ../src/roster_window.py:4229 -#: ../src/roster_window.py:5874 +#: ../src/roster_window.py:3100 ../src/roster_window.py:4226 +#: ../src/roster_window.py:5871 msgid "General" msgstr "Generale" @@ -655,7 +655,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:6 msgid "Sends a message to users currently connected to this server" -msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server" +msgstr "Invia un messaggio agli utenti attualmente connessi a questo server" #: ../data/gui/advanced_menuitem_menu.ui.h:7 msgid "Sets Message of the Day" @@ -747,8 +747,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:674 -#: ../src/roster_window.py:5843 ../src/roster_window.py:5977 +#: ../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 "_Sblocca" @@ -836,11 +836,11 @@ #: ../data/gui/chat_control.ui.h:2 msgid "Add this contact to roster (Ctrl+D)" -msgstr "Aggiungi questo contatto alla lista contatti (Ctrl+D)" +msgstr "Aggiungi questo contatto all'elenco dei tuoi contatti (Ctrl+D)" #: ../data/gui/chat_control.ui.h:3 msgid "Invite contacts to the conversation (Ctrl+G)" -msgstr "Invita dei contatti alla conversazione (Ctrl+G)" +msgstr "Invita dei contatti nella conversazione (Ctrl+G)" #: ../data/gui/chat_control.ui.h:4 msgid "View contact information (Ctrl+I)" @@ -866,7 +866,7 @@ #: ../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 "Invia messaggio" +msgstr "Invia il messaggio" #: ../data/gui/chat_control.ui.h:10 msgid "1" @@ -942,7 +942,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:584 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:586 msgid "Send Single _Message..." msgstr "Invia un _messaggio singolo..." @@ -952,8 +952,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5773 -#: ../src/roster_window.py:5944 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5770 +#: ../src/roster_window.py:5941 msgid "In_vite to" msgstr "In_vita a" @@ -970,13 +970,13 @@ msgstr "Attiva la cifratura End-to-End" #. Send Custom Status -#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:598 -#: ../src/roster_window.py:5784 +#: ../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 "Invia uno s_tato personalizzato" #. Execute Command -#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:634 +#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:636 msgid "E_xecute Command..." msgstr "E_segui un comando..." @@ -985,13 +985,13 @@ msgstr "_Gestisci il contatto" #. Rename -#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:661 -#: ../src/roster_window.py:5824 +#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:663 +#: ../src/roster_window.py:5821 msgid "_Rename..." msgstr "_Rinomina..." #. Edit Groups -#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5966 +#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5963 msgid "Edit _Groups..." msgstr "Modifica i _gruppi..." @@ -1024,8 +1024,8 @@ msgstr "_Proibisci al contatto di vedere il mio stato" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:677 -#: ../src/roster_window.py:5851 ../src/roster_window.py:5983 +#: ../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 "_Blocca" @@ -1039,15 +1039,15 @@ #. Remove #. Remove group -#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:687 -#: ../src/roster_window.py:5861 +#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:689 +#: ../src/roster_window.py:5858 msgid "Remo_ve" msgstr "_Elimina" #: ../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:6059 +#: ../src/roster_window.py:6056 msgid "_History" msgstr "_Cronologia" @@ -1089,7 +1089,7 @@ #: ../data/gui/filetransfers.ui.h:3 msgid "file transfers list" -msgstr "lista trasferimenti file" +msgstr "elenco dei trasferimenti di file" #: ../data/gui/filetransfers.ui.h:4 msgid "A list of active, completed and stopped file transfers" @@ -1301,7 +1301,7 @@ msgid "_Add to Roster" msgstr "_Aggiungi all'elenco dei tuoi contatti" -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1728 +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1730 msgid "Show a list of formattings" msgstr "Mostra un elenco di formattazioni" @@ -1503,7 +1503,7 @@ msgid "Bro_wse Rooms" msgstr "Esp_lora le stanze" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3421 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3414 #: ../src/disco.py:1412 ../src/disco.py:1854 msgid "_Join" msgstr "_Unisciti" @@ -1777,20 +1777,20 @@ "name in roster window and in group chats" msgstr "" "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro nella " -"finestra contatti e le conversazioni di gruppo sotto il suo nome" +"finestra dei tuoi contatti e le conversazioni di gruppo sotto il suo nome" #: ../data/gui/preferences_window.ui.h:23 msgid "Display e_xtra information of contacts in roster (mood, activity, ...)" msgstr "" -"Mostra informazioni ag_giuntive dei contatti nella lista contatti (stato " -"d'animo, attività, ...)" +"Mostra informazioni ag_giuntive dei contatti nell'elenco dei tuoi contatti " +"(stato d'animo, attività, ...)" #: ../data/gui/preferences_window.ui.h:24 msgid "" "If checked, Gajim will display the mood of contacts in the roster window" msgstr "" -"Se marcato, Gajim mostrerà lo stato d'animo dei contatti nella finestra " -"contatti" +"Se marcato, Gajim mostrerà lo stato d'animo dei contatti nella finestra dei " +"tuoi contatti" #: ../data/gui/preferences_window.ui.h:25 msgid "Sort contacts by status" @@ -1806,7 +1806,7 @@ #: ../data/gui/preferences_window.ui.h:28 msgid "Roster Appearance" -msgstr "Aspetto dell'elenco dei tuo contatti" +msgstr "Aspetto dell'elenco dei tuoi contatti" #: ../data/gui/preferences_window.ui.h:29 msgid "_Window behavior:" @@ -2242,7 +2242,7 @@ #: ../data/gui/preferences_window.ui.h:124 msgid "_Ignore events from contacts not in the roster" -msgstr "_Ignora gli eventi da contatti non appartenenti alla lista contatti" +msgstr "_Ignora gli eventi da contatti non appartenenti al tuo elenco" #: ../data/gui/preferences_window.ui.h:125 msgid "" @@ -2250,9 +2250,9 @@ "Use with caution, because it blocks all messages from any contact that is " "not in the roster" msgstr "" -"Se marcato, Gajim ignorerà gli eventi in arrivo da parte di contatti non " -"autorizzati. Usare con cautela, perchè blocca tutti i messaggi da parte di " -"contatti che non sono nella lista contatti" +"Se marcato, Gajim ignorerà gli eventi in arrivo da parte dei contatti non " +"autorizzati. Usalo con cautela, perché blocca tutti i messaggi da parte dei " +"contatti che non sono nel tuo elenco" #: ../data/gui/preferences_window.ui.h:126 msgid "Allow client / _OS information to be sent" @@ -2575,7 +2575,7 @@ msgstr "Cosa vuoi fare?" #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5993 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5990 msgid "_Remove" msgstr "_Rimuovi" @@ -2589,7 +2589,7 @@ "your roster." msgstr "" "qualcuno(a)da_qualche_parte.com vorrebbe che tu aggiungessi dei " -"contatti alla tua lista contatti." +"contatti al tuo elenco." #: ../data/gui/roster_item_exchange_window.ui.h:3 #: ../data/gui/service_registration_window.ui.h:3 @@ -2646,7 +2646,7 @@ #: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:359 msgid "Show _Roster" -msgstr "Mostra l'elenco dei _contatti" +msgstr "Mostra l'elenco dei tuoi _contatti" #: ../data/gui/roster_window.ui.h:18 msgid "File _Transfers" @@ -2693,7 +2693,7 @@ msgstr "_Aggiungi un contatto" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:699 +#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:701 msgid "_Information" msgstr "_Informazioni" @@ -2854,7 +2854,7 @@ #: ../data/gui/xml_console_window.ui.h:1 msgid "Jabber Traffic" -msgstr "Traffico Jabber" +msgstr "Traffico di Jabber" #. XML Console enable checkbutton #: ../data/gui/xml_console_window.ui.h:3 @@ -3069,79 +3069,79 @@ msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "Se invii un file a %s, lui/lei conoscerà il tuo vero ID Jabber." -#: ../src/chat_control.py:1670 ../src/chat_control.py:2275 +#: ../src/chat_control.py:1672 ../src/chat_control.py:2268 msgid "OpenPGP encryption enabled" msgstr "Cifratura OpenPGP abilitata"

1 0

gajim-plugins: OfflineBookmarksPlugin. Fix missed attr.
by Gajim Plugins 27 Apr '14

27 Apr '14

changeset 858f5aa3401f in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=858f5aa3401f description: OfflineBookmarksPlugin. Fix missed attr. diffstat: offline_bookmarks/manifest.ini | 2 +- offline_bookmarks/offline_bookmarks.py | 3 ++- 2 файлов изменено, 3 вставок(+), 2 удалений(-) различия (25 строк): diff -r e7c89d164d05 -r 858f5aa3401f offline_bookmarks/manifest.ini --- a/offline_bookmarks/manifest.ini Wed Apr 23 22:38:41 2014 +0200 +++ b/offline_bookmarks/manifest.ini Sun Apr 27 16:43:50 2014 +0400 @@ -1,7 +1,7 @@ [info] name: Offline Bookmarks short_name: offline_bookmarks -version: 0.2.1 +version: 0.2.2 description: Saving bookmarks inside the plugin configuration file. Allows the use of locally stored bookmarks if the server does not support the storage of bookmarks (eg talk.google.com). Support to import bookmarks from one account to another. authors = Denis Fomin <fominde(a)gmail.com> diff -r e7c89d164d05 -r 858f5aa3401f offline_bookmarks/offline_bookmarks.py --- a/offline_bookmarks/offline_bookmarks.py Wed Apr 23 22:38:41 2014 +0200 +++ b/offline_bookmarks/offline_bookmarks.py Sun Apr 27 16:43:50 2014 +0400 @@ -215,7 +215,8 @@ self.server_entry = self.xml.get_object('server_entry') self.server_entry.connect('changed', self.on_server_entry_changed) self.room_entry = self.xml.get_object('room_entry') - self.room_entry.connect('changed', self.on_room_entry_changed) + self.room_entry_changed_id = self.room_entry.connect('changed', + self.on_room_entry_changed) self.pass_entry = self.xml.get_object('pass_entry') self.pass_entry.connect('changed', self.on_pass_entry_changed) self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton')

1 0

gajim: fix sending candidates and computing hash in jingle file ...
by Gajim 25 Apr '14

25 Apr '14

changeset 87aff98e45e5 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=87aff98e45e5 description: fix sending candidates and computing hash in jingle file transfer. Fixes #7669 diffstat: src/common/jingle_ft.py | 5 +++-- src/common/jingle_transport.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (39 lines): diff -r ebdd75803280 -r 87aff98e45e5 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Apr 24 22:08:01 2014 +0200 +++ b/src/common/jingle_ft.py Fri Apr 25 12:48:39 2014 +0200 @@ -110,7 +110,7 @@ STATE_TRANSPORT_REPLACE : StateTransportReplace(self), STATE_CAND_SENT_AND_RECEIVED : StateCandSentAndRecv(self) } - + if jingle_xtls.PYOPENSSL_PRESENT: cert_name = os.path.join(configpaths.gajimpaths['MY_CERT'], jingle_xtls.SELF_SIGNED_CERTIFICATE) @@ -160,12 +160,13 @@ if self.file_props.algo == None: return try: - file_ = open(self.file_props.file_name, 'r') + file_ = open(self.file_props.file_name, 'rb') except: # can't open file return h = nbxmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) + file_.close() # DEBUG #hash_ = '1294809248109223' if not hash_: diff -r ebdd75803280 -r 87aff98e45e5 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Apr 24 22:08:01 2014 +0200 +++ b/src/common/jingle_transport.py Fri Apr 25 12:48:39 2014 +0200 @@ -69,7 +69,7 @@ candidates is None) """ if not candidates: - candidates = self._iter_candidates() + candidates = list(self._iter_candidates()) else: candidates = (self.make_candidate(candidate) for candidate in candidates) transport = nbxmpp.Node('transport', payload=candidates)

1 0

gajim: fix some encoding issues
by Gajim 24 Apr '14

24 Apr '14

changeset ebdd75803280 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=ebdd75803280 description: fix some encoding issues diffstat: src/common/stanza_session.py | 52 +++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 24 deletions(-) diffs (177 lines): diff -r c00f54ba7271 -r ebdd75803280 src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Apr 23 21:53:40 2014 +0200 +++ b/src/common/stanza_session.py Thu Apr 24 22:08:01 2014 +0200 @@ -410,21 +410,21 @@ c = stanza.NT.c c.setNamespace('http://www.xmpp.org/extensions/xep-0200.html#ns') - c.NT.data = base64.b64encode(m_final) + c.NT.data = base64.b64encode(m_final).decode('utf-8') # FIXME check for rekey request, handle <key/> elements - m_content = ''.join(map(str, c.getChildren())) + m_content = (''.join(map(str, c.getChildren()))).encode('utf-8') c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \ - crypto.encode_mpi(old_en_counter))) + crypto.encode_mpi(old_en_counter))).decode('utf-8') msgtxt = '[This is part of an encrypted session. ' \ 'If you see this message, something went wrong.]' lang = os.getenv('LANG') if lang is not None and lang != 'en': # we're not english msgtxt = _('[This is part of an encrypted session. ' - 'If you see this message, something went wrong.]') + ' (' + \ - msgtxt + ')' + 'If you see this message, something went wrong.]') + ' (' + \ + msgtxt + ')' stanza.setBody(msgtxt) return stanza @@ -473,6 +473,7 @@ # contents of <c>, minus <mac>, minus whitespace macable = ''.join(str(x) for x in c.getChildren() if x.getName() != 'mac') + macable = macable.encode('utf-8') received_mac = base64.b64decode(c.getTagData('mac')) calculated_mac = self.hmac(self.km_o, macable + \ @@ -483,7 +484,7 @@ m_final = base64.b64decode(c.getTagData('data')) m_compressed = self.decrypt(m_final) - plaintext = self.decompress(m_compressed) + plaintext = self.decompress(m_compressed).decode('utf-8') try: parsed = nbxmpp.Node(node='<node>' + plaintext + '</node>') @@ -536,7 +537,7 @@ if i_o == 'a' and self.sas_algs == 'sas28x5': # we don't need to calculate this if there's a verified retained secret # (but we do anyways) - self.sas = crypto.sas_28x5(m_o, self.form_s) + self.sas = crypto.sas_28x5(m_o, self.form_s.encode('utf-8')) if self.negotiated['recv_pubkey']: plaintext = self.decrypt(id_o) @@ -571,11 +572,11 @@ content = self.n_s + self.n_o + crypto.encode_mpi(dh_i) + pubkey_o if sigmai: - self.form_o = c7l_form + self.form_o = c7l_form.encode('utf-8') content += self.form_o else: - form_o2 = c7l_form - content += self.form_o + form_o2 + form_o2 = c7l_form.encode('utf-8') + content += self.form_o.encode('utf-8') + form_o2 mac_o_calculated = self.hmac(self.ks_o, content) @@ -609,7 +610,7 @@ old_c_s = self.c_s content = self.n_o + self.n_s + crypto.encode_mpi(dh_i) + pubkey_s + \ - self.form_s + form_s2 + self.form_s.encode('utf-8') + form_s2.encode('utf-8') mac_s = self.hmac(self.ks_s, content) @@ -632,14 +633,16 @@ if self.status == 'requested-e2e' and self.sas_algs == 'sas28x5': # we're alice; check for a retained secret # if none exists, prompt the user with the SAS - self.sas = crypto.sas_28x5(m_s, self.form_o) + self.sas = crypto.sas_28x5(m_s, self.form_o.encode('utf-8')) if self.sigmai: # FIXME save retained secret? self.check_identity(tuple) - return (nbxmpp.DataField(name='identity', value=base64.b64encode(id_s)), - nbxmpp.DataField(name='mac', value=base64.b64encode(m_s))) + return (nbxmpp.DataField(name='identity', + value=base64.b64encode(id_s).decode('utf-8')), + nbxmpp.DataField(name='mac', + value=base64.b64encode(m_s).decode('utf-8'))) def negotiate_e2e(self, sigmai): self.negotiated = {} @@ -695,7 +698,7 @@ self.n_s = crypto.generate_nonce() x.addChild(node=nbxmpp.DataField(name='my_nonce', - value=base64.b64encode(self.n_s), typ='hidden')) + value=base64.b64encode(self.n_s).decode('utf-8'), typ='hidden')) modp_options = [ int(g) for g in gajim.config.get('esession_modp').split( ',') ] @@ -826,7 +829,7 @@ return dhhashes = dhhashes_f.getValues() self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( - 'utf8')) + 'utf8')) bytes = int(self.n / 8) @@ -845,7 +848,7 @@ 'nonce': self.n_o} for name in to_add: - b64ed = base64.b64encode(to_add[name]) + b64ed = base64.b64encode(to_add[name]).decode('utf-8') x.addChild(node=nbxmpp.DataField(name=name, value=b64ed)) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) for \ @@ -935,7 +938,7 @@ value='urn:xmpp:ssn')) result.addChild(node=nbxmpp.DataField(name='accept', value='1')) result.addChild(node=nbxmpp.DataField(name='nonce', - value=base64.b64encode(self.n_o))) + value=base64.b64encode(self.n_o).decode('utf-8'))) self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) @@ -952,11 +955,12 @@ rshash_size = self.hash_alg().digest_size rshashes.append(crypto.random_bytes(rshash_size)) - rshashes = [base64.b64encode(rshash) for rshash in rshashes] + rshashes = [base64.b64encode(rshash).decode('utf-8') for rshash in \ + rshashes] result.addChild(node=nbxmpp.DataField(name='rshashes', value=rshashes)) result.addChild(node=nbxmpp.DataField(name='dhkeys', - value=base64.b64encode(crypto.encode_mpi(e)))) + value=base64.b64encode(crypto.encode_mpi(e)).decode('utf-8'))) self.form_o = ''.join(nbxmpp.c14n.c14n(el, self._is_buggy_gajim()) \ for el in form.getChildren()) @@ -1037,9 +1041,9 @@ x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) x.addChild(node=nbxmpp.DataField(name='nonce', value=base64.b64encode( - self.n_o))) + self.n_o).decode('utf-8'))) x.addChild(node=nbxmpp.DataField(name='srshash', value=base64.b64encode( - srshash))) + srshash).decode('utf-8'))) for datafield in self.make_identity(x, self.d): x.addChild(node=datafield) @@ -1155,11 +1159,11 @@ self.es[modp] = e if sigmai: - dhs.append(base64.b64encode(crypto.encode_mpi(e))) + dhs.append(base64.b64encode(crypto.encode_mpi(e)).decode('utf-8')) name = 'dhkeys' else: He = crypto.sha256(crypto.encode_mpi(e)) - dhs.append(base64.b64encode(He)) + dhs.append(base64.b64encode(He).decode('utf-8')) name = 'dhhashes' return nbxmpp.DataField(name=name, typ='hidden', value=dhs)

1 0

gajim-plugins: [UbuntuIntegrationPlugin] [bergschreck] fix remov...
by Gajim Plugins 23 Apr '14

23 Apr '14

changeset e7c89d164d05 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=e7c89d164d05 description: [UbuntuIntegrationPlugin] [bergschreck] fix removing events. Fixes #93 diffstat: ubuntu_integration/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aa7eb2e686b7 -r e7c89d164d05 ubuntu_integration/plugin.py --- a/ubuntu_integration/plugin.py Thu Feb 27 16:00:12 2014 +0400 +++ b/ubuntu_integration/plugin.py Wed Apr 23 22:38:41 2014 +0200 @@ -182,7 +182,7 @@ key = (event.account, event.jid) - if key not in self.events and \ + if key in self.events and \ event in self.events[key][1]: self.events[key][1].remove(event)

1 0

gajim: make string translatable in filetranfer context menu. Fix...
by Gajim 23 Apr '14

23 Apr '14

changeset c00f54ba7271 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=c00f54ba7271 description: make string translatable in filetranfer context menu. Fixes #7740 diffstat: data/gui/filetransfers.ui | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r e19ef59ed06d -r c00f54ba7271 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Tue Apr 22 13:11:00 2014 +0200 +++ b/data/gui/filetransfers.ui Wed Apr 23 21:53:40 2014 +0200 @@ -186,7 +186,7 @@ </child> <child> <object class="GtkImageMenuItem" id="continue_menuitem"> - <property name="label">_Continue</property> + <property name="label" translatable="yes">_Continue</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> @@ -196,7 +196,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pause_menuitem"> - <property name="label">_Pause</property> + <property name="label" translatable="yes">_Pause</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> @@ -219,7 +219,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_folder_menuitem"> - <property name="label">_Open Containing Folder</property> + <property name="label" translatable="yes">_Open Containing Folder</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property>

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