Commits

commits@gajim.org

17632 discussions

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 11bc6f2ffb08 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=11bc6f2ffb08 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 179 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 89 insertions(+), 90 deletions(-) diffs (truncated from 592 to 300 lines): diff -r 99458c13a65d -r 11bc6f2ffb08 po/he.po --- a/po/he.po Fri Aug 16 23:29:48 2013 +0400 +++ b/po/he.po Sat Aug 17 21:59:24 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-16 02:05+0000\n" -"PO-Revision-Date: 2013-08-16 08:26+0200\n" +"POT-Creation-Date: 2013-08-17 02:05+0000\n" +"PO-Revision-Date: 2013-08-17 21:05+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -574,9 +574,9 @@ "protocol. Click on register button to\n" "proceed." msgstr "" -"נרשמת באמצעות מוביל זה\n" +"עליך להירשם באמצעות מוביל זה\n" "כדי שתהיה באפשרותך להוסיף איש\n" -"קשר מפרוטוקול זה. הקלק על\n" +"קשר מתוך פרוטוקול זה. הקלק על\n" "לחצן רישום כדי להמשיך." #: ../data/gui/add_new_contact_window.ui.h:13 @@ -2749,7 +2749,7 @@ # אחזור #: ../data/gui/search_window.ui.h:2 msgid "Please wait while retrieving search form..." -msgstr "אנא המתן בעת אחזרת תבנית חיפוש..." +msgstr "אנא המתן בעת אחזרת טופס חיפוש..." #: ../data/gui/search_window.ui.h:3 msgid "_Add contact" @@ -2998,15 +2998,15 @@ #: ../data/gajim.desktop.in.in.h:2 msgid "Jabber IM Client" -msgstr "לקוח מסרים מיידיים ג׳אבּר" +msgstr "לקוח מסרים מידיים Jabber" #: ../data/gajim.desktop.in.in.h:3 msgid "A GTK+ Jabber client" -msgstr "לקוח ג׳אבּר ‭GTK+‬" +msgstr "לקוח ג׳אבּר GTK+‎" #: ../data/gajim.desktop.in.in.h:4 msgid "chat;messaging;im;jabber;xmpp;bonjour;voip" -msgstr "" +msgstr "צ'אט;מסרים;מסנג'ר;jabber;xmpp;bonjour;voip" #: ../src/adhoc_commands.py:325 msgid "Cancel confirmation" @@ -3020,19 +3020,19 @@ #: ../src/adhoc_commands.py:372 msgid "Invalid Form" -msgstr "תבנית שגויה" +msgstr "טופס שגוי" #: ../src/adhoc_commands.py:373 msgid "The form is not filled correctly." -msgstr "התבנית לא מולאה כראוי." +msgstr "הטופס אינו ממולא כראוי." #: ../src/adhoc_commands.py:392 ../src/adhoc_commands.py:416 msgid "Service sent malformed data" -msgstr "השירות שלח מידע פגום" +msgstr "שירות שלח מידע פגום" #: ../src/adhoc_commands.py:401 msgid "Service changed the session identifier." -msgstr "השירות שינה את המזהה של הסשן." +msgstr "שירות שינה את מזהה הסשן." #: ../src/adhoc_commands.py:421 #, python-format @@ -3042,7 +3042,7 @@ #. when stanza doesn't have error description #: ../src/adhoc_commands.py:516 msgid "Service returned an error." -msgstr "השירות החזיר שגיאה." +msgstr "שירות החזיר שגיאה." #. For i18n #: ../src/advanced_configuration_window.py:92 @@ -3084,7 +3084,7 @@ #. we talk about option description in advanced configuration editor #: ../src/advanced_configuration_window.py:177 msgid "(None)" -msgstr "(ללא)" +msgstr "(אין)" # Needs to be tested #: ../src/advanced_configuration_window.py:303 @@ -3105,7 +3105,7 @@ #: ../src/chat_control.py:214 #, python-format msgid "Pong! (%s s.)" -msgstr "פונג! (%s s.)" +msgstr "פונג! (%s ש.)" #: ../src/chat_control.py:219 msgid "Error." @@ -3337,7 +3337,7 @@ #: ../src/common/connection_handlers.py:1145 #: ../src/common/connection_handlers.py:1269 #: ../src/common/connection_handlers_events.py:913 -#: ../src/common/logger.py:1161 ../src/gajim.py:216 ../src/session.py:98 +#: ../src/common/logger.py:1161 ../src/gajim.py:217 ../src/session.py:98 msgid "Database Error" msgstr "שגיאת מסד נתונים" @@ -4837,9 +4837,8 @@ msgstr "‏redirect_url עבור אימות Oauth2." #: ../src/common/config.py:415 -#, fuzzy -msgid "" -"Space separated list of JIDsfor which we want to re-open a chat window on " +msgid "" +"Space separated list of JIDs for which we want to re-open a chat window on " "next startup." msgstr "" "רשימה אשר מופרדת עם רווח, של כתובות JID עבורן אנו רוצים לפתוח מחדש חלון שיחה " @@ -5181,14 +5180,14 @@ #: ../src/common/connection_handlers.py:1143 #: ../src/common/connection_handlers.py:1267 #: ../src/common/connection_handlers_events.py:910 -#: ../src/common/logger.py:1159 ../src/gajim.py:422 ../src/session.py:95 +#: ../src/common/logger.py:1159 ../src/gajim.py:423 ../src/session.py:95 msgid "Disk Write Error" msgstr "שגיאת כתיבת כונן" #: ../src/common/connection.py:524 ../src/common/connection_handlers.py:1146 #: ../src/common/connection_handlers.py:1270 #: ../src/common/connection_handlers_events.py:914 -#: ../src/common/logger.py:1162 ../src/gajim.py:217 ../src/session.py:99 +#: ../src/common/logger.py:1162 ../src/gajim.py:218 ../src/session.py:99 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it (see http://trac." @@ -5217,7 +5216,7 @@ #: ../src/common/connection.py:984 #, python-format msgid "Server %s provided a different registration form" -msgstr "שרת %s סיפק צורת רישום שונה" +msgstr "שרת %s סיפק טופס רישום שונה" #: ../src/common/connection.py:1001 msgid "Invalid answer" @@ -5571,7 +5570,7 @@ #: ../src/common/exceptions.py:56 msgid "Service not available: Gajim is not running, or remote_control is False" -msgstr "שירות לא זמין: Gajim לא מורץ, או שהאפשרות remote_control מנוטרלת" +msgstr "שירות לא זמין: Gajim לא מורץ, או שההעדפה remote_control הינה מנוטרלת" #: ../src/common/exceptions.py:67 ../src/gajim-remote.py:56 msgid "D-Bus is not present on this machine or python module is missing" @@ -6049,7 +6048,7 @@ msgstr "שגיאה בטעינת תמונה" # Needs to be tested -#: ../src/common/jingle_rtp.py:112 +#: ../src/common/jingle_rtp.py:114 #, python-format msgid "%s configuration error" msgstr "שגיאת תצורת %s" @@ -6057,7 +6056,7 @@ # ההתקנה # הצינור (Pipeline) היה # השגיאה היתה -#: ../src/common/jingle_rtp.py:113 +#: ../src/common/jingle_rtp.py:115 #, python-format msgid "" "Couldn't setup %s. Check your configuration.\n" @@ -6076,11 +6075,11 @@ "Error was:\n" "%s" -#: ../src/common/jingle_rtp.py:218 +#: ../src/common/jingle_rtp.py:220 msgid "GStreamer error" msgstr "שגיאת ‫GStreamer" -#: ../src/common/jingle_rtp.py:218 +#: ../src/common/jingle_rtp.py:220 #, python-format msgid "" "Error: %s\n" @@ -6089,19 +6088,19 @@ "שגיאה: %s\n" "ניפוי שגיאות: %s" -#: ../src/common/jingle_rtp.py:352 +#: ../src/common/jingle_rtp.py:354 msgid "audio input" msgstr "קלט שמע" -#: ../src/common/jingle_rtp.py:355 +#: ../src/common/jingle_rtp.py:357 msgid "audio output" msgstr "פלט שמע" -#: ../src/common/jingle_rtp.py:410 +#: ../src/common/jingle_rtp.py:412 msgid "video input" msgstr "קלט וידאו" -#: ../src/common/jingle_rtp.py:419 +#: ../src/common/jingle_rtp.py:421 msgid "video output" msgstr "פלט וידאו" @@ -6110,54 +6109,54 @@ msgid "%s is not a valid loglevel" msgstr "cli" -#: ../src/common/multimedia_helpers.py:39 +#: ../src/common/multimedia_helpers.py:41 msgid " Default device" msgstr "מכשיר משתמט" #. Test src -#: ../src/common/multimedia_helpers.py:60 +#: ../src/common/multimedia_helpers.py:62 msgid "Audio test" msgstr "בדיקת שמע" #. Auto src #. Auto sink #. Auto src -#: ../src/common/multimedia_helpers.py:63 -#: ../src/common/multimedia_helpers.py:79 -#: ../src/common/multimedia_helpers.py:93 -#: ../src/common/multimedia_helpers.py:111 +#: ../src/common/multimedia_helpers.py:65 +#: ../src/common/multimedia_helpers.py:81 +#: ../src/common/multimedia_helpers.py:95 +#: ../src/common/multimedia_helpers.py:113 msgid "Autodetect" msgstr "איתור אוטומטי" #. Alsa src #. Alsa sink -#: ../src/common/multimedia_helpers.py:66 -#: ../src/common/multimedia_helpers.py:81 +#: ../src/common/multimedia_helpers.py:68 +#: ../src/common/multimedia_helpers.py:83 #, python-format msgid "ALSA: %s" msgstr "‏ALSA: ‏%s" #. Pulseaudio src #. Pulseaudio sink -#: ../src/common/multimedia_helpers.py:69 -#: ../src/common/multimedia_helpers.py:83 +#: ../src/common/multimedia_helpers.py:71 +#: ../src/common/multimedia_helpers.py:85 #, python-format msgid "Pulse: %s" msgstr "‏Pulse: ‏%s" # מעושה, מלאכותי #. Fake sink -#: ../src/common/multimedia_helpers.py:77 +#: ../src/common/multimedia_helpers.py:79 msgid "Fake audio output" msgstr "פלט שמע מזויף" #. Test src -#: ../src/common/multimedia_helpers.py:90 +#: ../src/common/multimedia_helpers.py:92 msgid "Video test" msgstr "בדיקת וידאו" #. V4L2 src -#: ../src/common/multimedia_helpers.py:95 +#: ../src/common/multimedia_helpers.py:97 #, python-format msgid "V4L2: %s" msgstr "‏V4L2: ‏%s" @@ -6165,22 +6164,22 @@ # not sure מרקע #. Funny things, just to test... #. self.devices['GOOM'] = 'audiotestsrc ! goom' -#: ../src/common/multimedia_helpers.py:98 +#: ../src/common/multimedia_helpers.py:100 msgid "Screen" msgstr "אקרן" #. Fake video output -#: ../src/common/multimedia_helpers.py:105 +#: ../src/common/multimedia_helpers.py:107 msgid "Fake video output" msgstr "פלט וידאו מזויף"

1 0

gajim: easy way to clear plugin_description_textview
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 7d1ec0d3757f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7d1ec0d3757f description: easy way to clear plugin_description_textview diffstat: src/plugins/gui.py | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diffs (28 lines): diff -r 11bc6f2ffb08 -r 7d1ec0d3757f src/plugins/gui.py --- a/src/plugins/gui.py Sat Aug 17 21:59:24 2013 +0400 +++ b/src/plugins/gui.py Mon Aug 19 11:28:50 2013 +0400 @@ -35,6 +35,7 @@ from common import gajim from plugins.helpers import log_calls, log from plugins.helpers import GajimPluginActivateException +from plugins.plugins_i18n import _ from common.exceptions import PluginsystemError ( @@ -142,14 +143,8 @@ self.plugin_homepage_linkbutton.set_uri(plugin.homepage) self.plugin_homepage_linkbutton.set_label(plugin.homepage) self.plugin_homepage_linkbutton.set_property('sensitive', True) - - sw = self.xml.get_object('scrolledwindow2') - old_tv = sw.get_children()[0] - old_tv.destroy() - self.plugin_description_textview = HtmlTextView() - sw.add(self.plugin_description_textview) - sw.show_all() - from plugins.plugins_i18n import _ + desc_textbuffer = self.plugin_description_textview.get_buffer() + desc_textbuffer.set_text('') txt = plugin.description txt.replace('</body>', '') if plugin.available_text:

1 0

gajim: [axcel] update AcronymsExpanderPlugin
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 41c36fc95a3f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=41c36fc95a3f description: [axcel] update AcronymsExpanderPlugin diffstat: plugins/acronyms_expander/acronyms | 69 ++++++++++++++++++++++++++ plugins/acronyms_expander/acronyms_expander.py | 16 ++++- 2 files changed, 82 insertions(+), 3 deletions(-) diffs (106 lines): diff -r 7d1ec0d3757f -r 41c36fc95a3f plugins/acronyms_expander/acronyms --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/plugins/acronyms_expander/acronyms Tue Aug 20 14:08:54 2013 +0400 @@ -0,0 +1,69 @@ +{"afaik": "as far as I know", +"afaict": "as far as I can tell", +"afk": "away from keyboard", +"atm": "at the moment", +"bbiab": "be back in a bit", +"bbiaf": "be back in a few (minutes)", +"bbl": "be back later", +"bbs": "be back soon", +"b/c": "because", +"bf": "boyfriend", +"bfo": "blinding flash of the obvious", +"brb": "be right back", +"bsod": "blue screen of death", +"btw": "by the way", +"ciao": "Italian for goodbye", +"ctrn": "can't talk right now", +"cul8r": "see you later", +"cya": "see ya", +"dhtb": "don't have the bandwidth", +"f2f": "face to face", +"fubar": "fucked up beyond all recognition", +"fwiw": "for what it's worth", +"fyi": "for your information", +"gmta": "great minds think alike", +"iam": "in a meeting", +"ianal": "I am not a lawyer", +"ihmb": "I hate my boss", +"iirc": "if I recall correctly", +"imho": "in my humble opinion", +"imo": "in my opinion", +"iow": "in other words", +"irl": "in real life", +"<g>": "grin", +"*g*": "grin", +"gf": "girlfriend", +"gmta": "great minds think alike", +"g2g": "got to go", +"jid": "jabber identifier", +"j/k": "just kidding", +"ok": "okay", +"lol": "laugh out loud", +"l8r": "later", +"msg": "message", +"n/m": "never mind", +"n/p": "no problem", +"oAo": "over and out!", +"omg": "oh my god", +"oob": "out of band", +"otoh": "on the other hand", +"oww": "oops, wrong window!", +"otp": "on the phone", +"pita": "pain in the ass", +"pov": "point of view", +"pw": "password", +"rotfl": "rolling on the floor laughing", +"rsn": "real soon now", +"rtfm": "read the friendly manual", +"slap": "sounds like a plan", +"thx": "thanks", +"tia": "thanks in advance", +"tla": "three-letter arconym", +"ttfn": "ta ta for now", +"ttyl": "talk to you later", +"wb": "welcome back", +"wfm": "works for me", +"wtf": "what the fuck?!", +"wtg": "way to go!", +"xfer": "transfer", +"ymmv": "your mileage may vary",} diff -r 7d1ec0d3757f -r 41c36fc95a3f plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Mon Aug 19 11:28:50 2013 +0400 +++ b/plugins/acronyms_expander/acronyms_expander.py Tue Aug 20 14:08:54 2013 +0400 @@ -47,16 +47,26 @@ self.config_default_values = { 'INVOKER': (' ', ''), - 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual', - '/slap': '/me slaps', + 'ACRONYMS': ({'/slap': '/me slaps', 'PS-': 'plug-in system', 'G-': 'Gajim', 'GNT-': 'http://trac.gajim.org/newticket', 'GW-': 'http://trac.gajim.org/', 'GTS-': 'http://trac.gajim.org/report', }, - ''), + ''), } + if 'ACRONYMS' not in self.config: + myAcronyms = self.get_own_acronyms_list() + self.config['ACRONYMS'].update(myAcronyms) + + @log_calls('AcronymsExpanderPlugin') + def get_own_acronyms_list(self): + data_file = self.local_file_path('acronyms') + data = open(data_file, 'r') + acronyms = eval(data.read()) + data.close() + return acronyms @log_calls('AcronymsExpanderPlugin') def textbuffer_live_acronym_expander(self, tb):

1 0

gajim: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 24 Aug '13

24 Aug '13

changeset f5ed6f0e44fc in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f5ed6f0e44fc description: Change history icon if theme have 'document-open-recent' icon. Fixes #6893 diffstat: src/roster_window.py | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diffs (47 lines): diff -r 41c36fc95a3f -r f5ed6f0e44fc src/roster_window.py --- a/src/roster_window.py Tue Aug 20 14:08:54 2013 +0400 +++ b/src/roster_window.py Fri Aug 23 11:26:48 2013 +0400 @@ -5219,6 +5219,12 @@ """ if not force and not self.actions_menu_needs_rebuild: return + history_menuitem = self.xml.get_object('history_menuitem') + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + history_icon = gtk.Image() + history_icon.set_from_icon_name('document-open-recent', + gtk.ICON_SIZE_MENU) + history_menuitem.set_image(history_icon) new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem') @@ -6141,8 +6147,13 @@ menu.append(item) history_menuitem = gtk.ImageMenuItem(_('_History')) - history_icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, \ - gtk.ICON_SIZE_MENU) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + history_icon = gtk.Image() + history_icon.set_from_icon_name('document-open-recent', + gtk.ICON_SIZE_MENU) + else: + history_icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, + gtk.ICON_SIZE_MENU) history_menuitem.set_image(history_icon) history_menuitem .connect('activate', self.on_history, contact, account) menu.append(history_menuitem) @@ -6219,8 +6230,12 @@ # History manager item = gtk.ImageMenuItem(_('History Manager')) - icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, - gtk.ICON_SIZE_MENU) + if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): + icon = gtk.Image() + icon.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + else: + icon = gtk.image_new_from_stock(gtk.STOCK_JUSTIFY_FILL, + gtk.ICON_SIZE_MENU) item.set_image(icon) menu.append(item) item.connect('activate', self.on_history_manager_menuitem_activate)

1 0

gajim: Coding standards
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 72c5162f12c8 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=72c5162f12c8 description: Coding standards diffstat: src/groupchat_control.py | 14 ++++++-------- src/gui_menu_builder.py | 4 +--- src/roster_window.py | 6 ++---- 3 files changed, 9 insertions(+), 15 deletions(-) diffs (62 lines): diff -r f5ed6f0e44fc -r 72c5162f12c8 src/groupchat_control.py --- a/src/groupchat_control.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/groupchat_control.py Fri Aug 23 12:23:10 2013 +0400 @@ -348,8 +348,8 @@ widget.show() if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = self.xml.get_object('image8') - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) + img = self.xml.get_object('image8') + img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -823,13 +823,11 @@ request_voice_separator = xml.get_object('request_voice_separator') if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): - img = gtk.Image() - img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - bookmark_room_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(bookmark_room_menuitem, + 'bookmark-new') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = gtk.Image() - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) - history_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent') if hide_buttonbar_items: change_nick_menuitem.hide() diff -r f5ed6f0e44fc -r 72c5162f12c8 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/gui_menu_builder.py Fri Aug 23 12:23:10 2013 +0400 @@ -253,9 +253,7 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - img = gtk.Image() - img.set_from_icon_name('document-open-recent', gtk.ICON_SIZE_MENU) - history_menuitem.set_image(img) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, 'bookmark-new') if control: convert_to_gc_menuitem.connect('activate', diff -r f5ed6f0e44fc -r 72c5162f12c8 src/roster_window.py --- a/src/roster_window.py Fri Aug 23 11:26:48 2013 +0400 +++ b/src/roster_window.py Fri Aug 23 12:23:10 2013 +0400 @@ -5221,10 +5221,8 @@ return history_menuitem = self.xml.get_object('history_menuitem') if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - history_icon = gtk.Image() - history_icon.set_from_icon_name('document-open-recent', - gtk.ICON_SIZE_MENU) - history_menuitem.set_image(history_icon) + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent') new_chat_menuitem = self.xml.get_object('new_chat_menuitem') single_message_menuitem = self.xml.get_object( 'send_single_message_menuitem')

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 24 Aug '13

24 Aug '13

changeset db4dbea2b7b2 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=db4dbea2b7b2 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 333 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 164 insertions(+), 169 deletions(-) diffs (truncated from 1027 to 300 lines): diff -r 72c5162f12c8 -r db4dbea2b7b2 po/he.po --- a/po/he.po Fri Aug 23 12:23:10 2013 +0400 +++ b/po/he.po Sat Aug 24 10:18:23 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-17 02:05+0000\n" -"PO-Revision-Date: 2013-08-17 21:05+0200\n" +"POT-Creation-Date: 2013-08-24 08:22+0300\n" +"PO-Revision-Date: 2013-08-24 08:34+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -211,7 +211,7 @@ msgstr "מחק" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5790 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5794 msgid "Re_name" msgstr "_שנה שם" @@ -382,7 +382,7 @@ #: ../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:3091 ../src/roster_window.py:4217 -#: ../src/roster_window.py:5840 +#: ../src/roster_window.py:5844 msgid "General" msgstr "כללית" @@ -777,8 +777,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:5809 -#: ../src/roster_window.py:5936 ../src/roster_window.py:6069 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5813 +#: ../src/roster_window.py:5940 ../src/roster_window.py:6073 msgid "_Unblock" msgstr "_בטל חסימה" @@ -988,8 +988,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5745 -#: ../src/roster_window.py:5904 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5749 +#: ../src/roster_window.py:5908 msgid "In_vite to" msgstr "ה_זמן אל" @@ -1009,8 +1009,8 @@ msgid "Toggle End to End Encryption" msgstr "הפעל הצפנת E2E" -#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5755 -#: ../src/roster_window.py:5993 +#: ../data/gui/contact_context_menu.ui.h:8 ../src/roster_window.py:5759 +#: ../src/roster_window.py:5997 msgid "Send Cus_tom Status" msgstr "שלח מצב חיבור מו_תאם" @@ -1059,10 +1059,10 @@ msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 -#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5817 -#: ../src/roster_window.py:5942 ../src/roster_window.py:6072 +#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5821 +#: ../src/roster_window.py:5946 ../src/roster_window.py:6076 msgid "_Block" -msgstr "_אסור" +msgstr "_חסום" #: ../data/gui/contact_context_menu.ui.h:22 msgid "_Unignore" @@ -1079,7 +1079,7 @@ #: ../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:6143 +#: ../src/roster_window.py:6147 msgid "_History" msgstr "_היסטוריה" @@ -1180,7 +1180,7 @@ msgid "_Continue" msgstr "ה_משך" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3345 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3350 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_פתח תיקיה מכילה" @@ -1342,7 +1342,7 @@ msgid "_Add to Roster" msgstr "הו_סף אל רשימה" -#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1717 +#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:1722 msgid "Show a list of formattings" msgstr "הצגת רשימת עיצובים" @@ -1551,7 +1551,7 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3380 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3385 #: ../src/disco.py:1396 ../src/disco.py:1847 msgid "_Join" msgstr "_כנס" @@ -2638,8 +2638,8 @@ #. Remove group #. Remove -#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5827 -#: ../src/roster_window.py:5952 ../src/roster_window.py:6082 +#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5831 +#: ../src/roster_window.py:5956 ../src/roster_window.py:6086 msgid "_Remove" msgstr "הס_ר" @@ -2756,7 +2756,7 @@ msgstr "הוסף _איש קשר" #. Information -#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6094 +#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:6098 msgid "_Information" msgstr "_מידע" @@ -3146,24 +3146,24 @@ msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובתך (מזהה Jabber) המלאה." -#: ../src/chat_control.py:1659 ../src/chat_control.py:2243 +#: ../src/chat_control.py:1664 ../src/chat_control.py:2248 msgid "OpenPGP encryption enabled" msgstr "הצפנת OpenPGP מאופשרת" -#: ../src/chat_control.py:1721 +#: ../src/chat_control.py:1726 msgid "Formattings are not available when GPG is active" msgstr "עיצובים אינם נתמכים כאשר GPG הינו פעיל" -#: ../src/chat_control.py:1724 +#: ../src/chat_control.py:1729 msgid "This contact does not support HTML" msgstr "איש קשר זה לא תומך HTML" #. Add to roster -#: ../src/chat_control.py:1729 ../src/common/contacts.py:152 +#: ../src/chat_control.py:1734 ../src/common/contacts.py:152 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 #: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310 #: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485 -#: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421 +#: ../src/gui_menu_builder.py:264 ../src/gui_menu_builder.py:419 #: ../src/roster_window.py:771 ../src/roster_window.py:1734 #: ../src/roster_window.py:1736 ../src/roster_window.py:2084 #: ../src/roster_window.py:3620 ../src/roster_window.py:3647 @@ -3172,53 +3172,53 @@ #. change tooltip text for audio and video buttons if python-farstream is #. not installed -#: ../src/chat_control.py:1754 +#: ../src/chat_control.py:1759 #: ../src/command_system/implementation/standard.py:215 msgid "Toggle audio session" msgstr "הפעלת סשן שמע" -#: ../src/chat_control.py:1755 +#: ../src/chat_control.py:1760 #: ../src/command_system/implementation/standard.py:225 msgid "Toggle video session" msgstr "הפעלת סשן וידאו" -#: ../src/chat_control.py:1757 +#: ../src/chat_control.py:1762 msgid "Feature not available, see Help->Features" msgstr "תכונה זו לא זמינה, ראו עזרה->תכונות." -#: ../src/chat_control.py:1761 +#: ../src/chat_control.py:1766 msgid "Feature not supported by remote client" msgstr "תכונה אינה נתמכת על ידי לקוח מרוחק" -#: ../src/chat_control.py:1774 +#: ../src/chat_control.py:1779 msgid "Send files" msgstr "שליחת קבצים" -#: ../src/chat_control.py:1779 +#: ../src/chat_control.py:1784 msgid "This contact does not support file transfer." msgstr "איש קשר זה אינו תומך בהעברת קבצים." -#: ../src/chat_control.py:1782 +#: ../src/chat_control.py:1787 msgid "You need to know the real JID of the contact to send him or her a file." msgstr "" "יש צורך לדעת את הכתובת המממשת (JID) של איש הקשר כדי לשלוח אליו או אליה קובץ." -#: ../src/chat_control.py:1900 +#: ../src/chat_control.py:1905 #, python-format msgid "%(type)s state : %(state)s, reason: %(reason)s" msgstr "%(type)s מצב : %(state)s, סיבה: %(reason)s" -#: ../src/chat_control.py:2092 +#: ../src/chat_control.py:2097 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2223 ../src/dialogs.py:5194 +#: ../src/chat_control.py:2228 ../src/dialogs.py:5194 msgid "No OpenPGP key assigned" msgstr "לא הוקצה מפתח OpenPGP" -#: ../src/chat_control.py:2224 +#: ../src/chat_control.py:2229 msgid "" "No OpenPGP key is assigned to this contact. So you cannot encrypt messages " "with OpenPGP." @@ -3226,50 +3226,50 @@ "אין מפתח OpenPGP אשר מוקצה לאיש קשר זה. כך שאין אין באפשרותך להצפין הודעות " "באמצעות OpenPGP." -#: ../src/chat_control.py:2233 +#: ../src/chat_control.py:2238 msgid "OpenPGP encryption disabled" msgstr "הצפנת OpenPGP מנוטרלת" -#: ../src/chat_control.py:2259 +#: ../src/chat_control.py:2264 msgid "Session WILL be logged" msgstr "הסשן יירשם" -#: ../src/chat_control.py:2261 +#: ../src/chat_control.py:2266 msgid "Session WILL NOT be logged" msgstr "הסשן לא יירשם" #. encryption %s active -#: ../src/chat_control.py:2278 +#: ../src/chat_control.py:2283 msgid "is" msgstr "הינה" -#: ../src/chat_control.py:2278 +#: ../src/chat_control.py:2283 msgid "is NOT" msgstr "*אינה*" #. chat session %s be logged -#: ../src/chat_control.py:2280 +#: ../src/chat_control.py:2285 msgid "will" msgstr "יירשם" -#: ../src/chat_control.py:2280 +#: ../src/chat_control.py:2285 msgid "will NOT" msgstr "*לא* יירשם" #. About encrypted chat session -#: ../src/chat_control.py:2284 +#: ../src/chat_control.py:2289 msgid "and authenticated" msgstr "והינה מאומת" #. About encrypted chat session -#: ../src/chat_control.py:2288 +#: ../src/chat_control.py:2293 msgid "and NOT authenticated" msgstr "ו*אינה* מאומתת" #. status will become 'is' or 'is not', authentificaed will become #. 'and authentificated' or 'and not authentificated', logged will become #. 'will' or 'will not' -#: ../src/chat_control.py:2295 +#: ../src/chat_control.py:2300 #, python-format msgid "" "%(type)s encryption %(status)s active %(authenticated)s.\n" @@ -3278,62 +3278,62 @@ "הצפנת %(type)s %(status)s מופעלת %(authenticated)s.\n" "סשן שיחתך %(logged)s ברשומות ההיסטוריה." -#: ../src/chat_control.py:2433 +#: ../src/chat_control.py:2438 msgid "Session negotiation cancelled" msgstr "משא ומתן סשן בוטל"

1 0

gajim: Change history icon if theme have 'document-open-recent' ...
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 4bb6d0fc725f in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4bb6d0fc725f description: Change history icon if theme have 'document-open-recent' icon. diffstat: src/gui_menu_builder.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r db4dbea2b7b2 -r 4bb6d0fc725f src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sat Aug 24 10:18:23 2013 +0400 +++ b/src/gui_menu_builder.py Sat Aug 24 15:17:45 2013 +0400 @@ -253,7 +253,8 @@ account) history_menuitem.connect('activate', roster.on_history, contact, account) if gtkgui_helpers.gtk_icon_theme.has_icon('document-open-recent'): - gtkgui_helpers.add_image_to_menuitem(history_menuitem, 'bookmark-new') + gtkgui_helpers.add_image_to_menuitem(history_menuitem, + 'document-open-recent') if control: convert_to_gc_menuitem.connect('activate',

1 0

gajim: [Darlan] updated man pages. Fixes #7425
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 58a622871740 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=58a622871740 description: [Darlan] updated man pages. Fixes #7425 diffstat: data/gajim-history-manager.1 | 105 ++++++++++++++++++++++----- data/gajim-remote.1 | 152 +++++++++++++++++++++++++++++++++++++--- data/gajim.1 | 159 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 356 insertions(+), 60 deletions(-) diffs (truncated from 428 to 300 lines): diff -r 4bb6d0fc725f -r 58a622871740 data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim-history-manager.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,21 +1,84 @@ -.\" 20050901 -.TH "Gajim-history-manager" "1" "September 01, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim-history-manager \- Tool to manage gajim logs -.SH "SYNOPSIS" -.B gajim-history-manager [\-c config-path] [\-h] -.SH "DESCRIPTION" -.B Gajim-history-manager -is a tool to manage (do some cleanup) log file of Gajim jabber client. -.PP -.SH "OPTIONS" -.TP -\fB\-c\fR, \fB\-\-config-path\fR path -Path where logs.db is located. ~/.gajim by default. -.TP -\fB\-h\fR, \fB\-\-help\fR -Print this help. -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: http://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.gajim.org -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM-HISTORY-MANAGER 1 URM +.Os UNIX +.Sh NAME +.Nm gajim-history-manager +.Nd a tool to manage +.Xr gajim 1 +logs +.Sh SYNOPSIS +.Nm +.Fl h +.Nm +.Op Fl c Ar directory +.Sh DESCRIPTION +.Nm +is a tool to manage +.Po do some cleanup Pc log file of +.Xr gajim 1 . +Use this program to delete or export logs. +For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. +.Sh OPTIONS +.Bl -tag -width Ds +.It Fl h Fl Fl help +Show help options +.It Fl c Fl Fl config-path Em directory +Where to look for logs file +.Sh FILES +.Bl -tag -width Ds +.It ~/.local/share/gajim/logs.db +The history database log file used when +.Op Fl c +is not specified. +.Sh AUTHORS +.An -nosplit +.Nm +is written and maintained by +.An Yann Leboulanger , +and +.An Denis Fomin , +with contributions and patches merged from many individuals around the world. +See files +.Pa AUTHORS +and +.Pa THANKS , +for a complete list. +.Sh COPYRIGHT +Copyright (C) 2003-2013 Gajim Team +.Pp +.Nm +is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. +.Pp +.Nm +is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +.Pp +You should have received a copy of the GNU General Public License along with +.Nm . +If not, see <http://www.gnu.org/licenses/>. +.Sh FEEDBACK +You can report bugs or feature requests in our bug tracker at +.Em trac.gajim.org +or in the +.Em gajim-devel +mailing list; if you want to send us a patch, please do so in our bug tracker. +You can also find us in our chat room. +.Sh WWW +http://www.gajim.org/ +.Sh XMPP +You are welcome to join us at gajim(a)conference.gajim.org +.Sh MAILING LIST +Below are public mailing lists on lists.gajim.org +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo/gajim-devel +http://lists.gajim.org/cgi-bin/listinfo/translators +.Ed +.Pp +More mailing lists at +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo +.Ed +.Sh BUGS +Please submit bugs at https://trac.gajim.org/ +.Sh SEE ALSO +.Xr gajim 1 +.Xr gajim-remote 1 diff -r 4bb6d0fc725f -r 58a622871740 data/gajim-remote.1 --- a/data/gajim-remote.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim-remote.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,14 +1,138 @@ -.\" 20050818 -.TH "Gajim-remote" "1" "August 18, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim-remote \- tool to communicate with a running instance of Gajim -.SH "SYNOPSIS" -.B gajim-remote [help] [toggle_roster_appearance] [show_next_unread] [list_contacts] [list_accounts] [change_status] [open_chat] [send_message] [send_file] [contact_info] [account_info] [send_file] [prefs_list] [prefs_put] [prefs_del] [prefs_store] [remove_contact] [add_contact] [get_status] [get_status_message] [get_unread_msgs_number] [start_chat] -.SH "DESCRIPTION" -.B Gajim-remote -is a script to control Gajim by D-Bus -.PP -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.jabber.no -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM-REMOTE 1 URM +.Os UNIX +.Sh NAME +.Nm gajim-remote +.Nd a remote control utility for +.Xr gajim 1 +.Sh SYNOPSIS +.Nm +.Ar command +.Sh DESCRIPTION +.Nm +is a script to control and communicate with a running instance of +.Xr gajim 1 +by D-Bus. +.Sh OPTIONS +.Bl -tag -width Ds +.It Available commands +.Ss account_info Aq account +Gets detailed info on a account +.Ss add_contact Ao jid Ac Bq account +Adds contact to roster +.Ss change_avatar Ao picture Ac Bq account +Change the avatar +.Ss change_status Bo status Bc Bo message Bc Bq account +Changes the status of account or accounts +.Ss check_gajim_running +Check if Gajim is running +.Ss contact_info Aq jid +Gets detailed info on a contact +.Ss get_status Bq account +Returns current status (the global one unless account is specified) +.Ss get_status_message Bq account +Returns current status message (the global one unless account is specified) +.Ss get_unread_msgs_number +Returns number of unread messages +.Ss handle_uri Ao uri Ac Bo account Bc Bq message +Handle a xmpp:/ uri +.Ss help Bq command +Shows a help on specific command +.Ss join_room Ao room Ac Bo nick Bc Bo password Bc Bq account +Join a MUC room +.Ss list_accounts +Prints a list of registered accounts +.Ss list_contacts Bq account +Prints a list of all contacts in the roster. Each contact appears on a separate line +.Ss open_chat Ao jid Ac Bo account Bc Bq message +Shows the chat dialog so that you can send messages to a contact +.Ss prefs_del Aq key +Deletes a preference item +.Ss prefs_list +Lists all preferences and their values +.Ss prefs_put Aq key=value +Sets value of 'key' to 'value'. +.Ss prefs_store +Writes the current state of Gajim preferences to the .config file +.Ss remove_contact Ao jid Ac Bq account +Removes contact from roster +.Ss send_chat_message Ao jid Ac Ao message Ac Bo pgp key Bc Bq account +Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. +.Ss send_file Ao file Ac Ao jid Ac Bq account +Sends file to a contact +.Ss send_groupchat_message Ao room_jid Ac Ao message Ac Bq account +Sends new message to a groupchat you've joined. +.Ss send_single_message Ao jid subject Ac Ao message Ac Bo pgp key Bc Bq account +Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''. +.Ss send_xml Ao xml Ac Bq account +Sends custom XML +.Ss set_priority Ao priority Ac Bq account +Changes the priority of account or accounts +.Ss show_next_pending_event +Pops up a window with the next pending event +.Ss start_chat Aq account +Opens 'Start Chat' dialog +.Ss toggle_ipython +Shows or hides the ipython window +.Ss toggle_roster_appearance +Shows or hides the roster window +.Sh EXAMPLES +Open a URI of group chat gajim +.Pp +.Dl $ gajim-remote handle_uri xmpp:gajim@conferenc.gajim.org?join +.Pp +Send custom XML +.Pp +.Dl $ gajim-remote send_xml $(cat Pa filename.xml ) Qq your(a)jabber.id +.Sh AUTHORS +.An -nosplit +.Nm +is written and maintained by +.An Yann Leboulanger , +and +.An Denis Fomin , +with contributions and patches merged from many individuals around the world. +See files +.Pa AUTHORS +and +.Pa THANKS , +for a complete list. +.Sh COPYRIGHT +Copyright (C) 2003-2013 Gajim Team +.Pp +.Nm +is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. +.Pp +.Nm +is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +.Pp +You should have received a copy of the GNU General Public License along with +.Nm . +If not, see <http://www.gnu.org/licenses/>. +.Sh FEEDBACK +You can report bugs or feature requests in our bug tracker at +.Em trac.gajim.org +or in the +.Em gajim-devel +mailing list; if you want to send us a patch, please do so in our bug tracker. +You can also find us in our chat room. +.Sh WWW +http://www.gajim.org/ +.Sh XMPP +You are welcome to join us at gajim(a)conference.gajim.org +.Sh MAILING LIST +Below are public mailing lists on lists.gajim.org +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo/gajim-devel +http://lists.gajim.org/cgi-bin/listinfo/translators +.Ed +.Pp +More mailing lists at +.Bd -literal -offset indent +http://lists.gajim.org/cgi-bin/listinfo +.Ed +.Sh BUGS +Please submit bugs at https://trac.gajim.org/ +.Sh SEE ALSO +.Xr gajim 1 +.Xr gajim-history-manager 1 diff -r 4bb6d0fc725f -r 58a622871740 data/gajim.1 --- a/data/gajim.1 Sat Aug 24 15:17:45 2013 +0400 +++ b/data/gajim.1 Sat Aug 24 17:58:22 2013 +0200 @@ -1,25 +1,134 @@ -.\" 20050901 -.TH "Gajim" "1" "September 01, 2005" "Gajim dev team" "" -.SH "NAME" -Gajim \- a jabber client -.SH "SYNOPSIS" -.B gajim [\-v] [\-p] [\-h] -.SH "DESCRIPTION" -.B Gajim -is a jabber client written in PyGTK and released under the GNU GPL. For more information on jabber, see -http://www.jabber.org and on Gajim see http://www.gajim.org -.PP -.SH "OPTIONS" -.TP -\fB\-p\fR, \fB\-\-profile\fR name -Run Gajim using ~/.gajim/config.name -.TP -\fB\-v\fR, \fB\-\-verbose\fR -Print xml stanzas and other debug information. -.TP -\fB\-h\fR, \fB\-\-help\fR -Print this help. -.SH "FEEDBACK" -You can report bugs or feature requests in http://trac.gajim.org or in the mailing list: https://lists.gajim.org/cgi\-bin/listinfo/gajim\-devel. You can also find us in our room gajim(a)conference.gajim.org -.SH "AUTHORS" -Written by Yann Le Boulanger <asterix(a)lagaule.org>, Nikos Kouremenos <kourem(a)gmail.com> and Dimitur Kirov <dkirov(a)gmail.com>. +.Dd August 11, 2013 +.Dt GAJIM 1 URM +.Os UNIX +.Sh NAME +.Nm gajim +.Nd a Jabber/XMPP client

1 0

gajim: remove external unused file
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5ec1312e237d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5ec1312e237d description: remove external unused file diffstat: src/pycallgraph.py | 410 ----------------------------------------------------- 1 files changed, 0 insertions(+), 410 deletions(-) diffs (truncated from 414 to 300 lines): diff -r aba205fac587 -r 5ec1312e237d src/pycallgraph.py --- a/src/pycallgraph.py Fri Aug 16 09:33:15 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,410 +0,0 @@ -""" -pycallgraph - -U{http://pycallgraph.slowchop.com/} - -Copyright Gerald Kaszuba 2007 - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -""" - -__version__ = '0.4.1' -__author__ = 'Gerald Kaszuba' - -import inspect -import sys -import os -import re -import tempfile -import time -from distutils import sysconfig - -# Initialise module variables. -# TODO Move these into settings -trace_filter = None -time_filter = None - - -def colourize_node(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.9) - - -def colourize_edge(calls, total_time): - value = float(total_time * 2 + calls) / 3 - return '%f %f %f' % (value / 2 + .5, value, 0.7) - - -def reset_settings(): - global settings - global graph_attributes - global __version__ - - settings = { - 'node_attributes': { - 'label': r'%(func)s\ncalls: %(hits)i\ntotal time: %(total_time)f', - 'color': '%(col)s', - }, - 'node_colour': colourize_node, - 'edge_colour': colourize_edge, - 'dont_exclude_anything': False, - 'include_stdlib': True, - } - - # TODO: Move this into settings - graph_attributes = { - 'graph': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'fontcolor': '0 0 0.5', - 'label': r'Generated by Python Call Graph v%s\n' \ - r'http://pycallgraph.slowchop.com' % __version__, - }, - 'node': { - 'fontname': 'Verdana', - 'fontsize': 7, - 'color': '.5 0 .9', - 'style': 'filled', - 'shape': 'rect', - }, - } - - -def reset_trace(): - """Resets all collected statistics. This is run automatically by - start_trace(reset=True) and when the module is loaded. - """ - global call_dict - global call_stack - global func_count - global func_count_max - global func_time - global func_time_max - global call_stack_timer - - call_dict = {} - - # current call stack - call_stack = ['__main__'] - - # counters for each function - func_count = {} - func_count_max = 0 - - # accumative time per function - func_time = {} - func_time_max = 0 - - # keeps track of the start time of each call on the stack - call_stack_timer = [] - - -class PyCallGraphException(Exception): - """Exception used for pycallgraph""" - pass - - -class GlobbingFilter(object): - """Filter module names using a set of globs. - - Objects are matched against the exclude list first, then the include list. - Anything that passes through without matching either, is excluded. - """ - - def __init__(self, include=None, exclude=None, max_depth=None, - min_depth=None): - if include is None and exclude is None: - include = ['*'] - exclude = [] - elif include is None: - include = ['*'] - elif exclude is None: - exclude = [] - self.include = include - self.exclude = exclude - self.max_depth = max_depth or 9999 - self.min_depth = min_depth or 0 - - def __call__(self, stack, module_name=None, class_name=None, - func_name=None, full_name=None): - from fnmatch import fnmatch - if len(stack) > self.max_depth: - return False - if len(stack) < self.min_depth: - return False - for pattern in self.exclude: - if fnmatch(full_name, pattern): - return False - for pattern in self.include: - if fnmatch(full_name, pattern): - return True - return False - - -def is_module_stdlib(file_name): - """Returns True if the file_name is in the lib directory.""" - # TODO: Move these calls away from this function so it doesn't have to run - # every time. - lib_path = sysconfig.get_python_lib() - path = os.path.split(lib_path) - if path[1] == 'site-packages': - lib_path = path[0] - return file_name.lower().startswith(lib_path.lower()) - - -def start_trace(reset=True, filter_func=None, time_filter_func=None): - """Begins a trace. Setting reset to True will reset all previously recorded - trace data. filter_func needs to point to a callable function that accepts - the parameters (call_stack, module_name, class_name, func_name, full_name). - Every call will be passed into this function and it is up to the function - to decide if it should be included or not. Returning False means the call - will be filtered out and not included in the call graph. - """ - global trace_filter - global time_filter - if reset: - reset_trace() - - if filter_func: - trace_filter = filter_func - else: - trace_filter = GlobbingFilter(exclude=['pycallgraph.*']) - - if time_filter_func: - time_filter = time_filter_func - else: - time_filter = GlobbingFilter() - - sys.settrace(tracer) - - -def stop_trace(): - """Stops the currently running trace, if any.""" - sys.settrace(None) - - -def tracer(frame, event, arg): - """This is an internal function that is called every time a call is made - during a trace. It keeps track of relationships between calls. - """ - global func_count_max - global func_count - global trace_filter - global time_filter - global call_stack - global func_time - global func_time_max - - if event == 'call': - keep = True - code = frame.f_code - - # Stores all the parts of a human readable name of the current call. - full_name_list = [] - - # Work out the module name - module = inspect.getmodule(code) - if module: - module_name = module.__name__ - module_path = module.__file__ - if not settings['include_stdlib'] \ - and is_module_stdlib(module_path): - keep = False - if module_name == '__main__': - module_name = '' - else: - module_name = '' - if module_name: - full_name_list.append(module_name) - - # Work out the class name. - try: - class_name = frame.f_locals['self'].__class__.__name__ - full_name_list.append(class_name) - except (KeyError, AttributeError): - class_name = '' - - # Work out the current function or method - func_name = code.co_name - if func_name == '?': - func_name = '__main__' - full_name_list.append(func_name) - - # Create a readable representation of the current call - full_name = '.'.join(full_name_list) - - # Load the trace filter, if any. 'keep' determines if we should ignore - # this call - if keep and trace_filter: - keep = trace_filter(call_stack, module_name, class_name, - func_name, full_name) - - # Store the call information - if keep: - - fr = call_stack[-1] - if fr not in call_dict: - call_dict[fr] = {} - if full_name not in call_dict[fr]: - call_dict[fr][full_name] = 0 - call_dict[fr][full_name] += 1 - - if full_name not in func_count: - func_count[full_name] = 0 - func_count[full_name] += 1 - if func_count[full_name] > func_count_max: - func_count_max = func_count[full_name] - - call_stack.append(full_name) - call_stack_timer.append(time.time()) - - else: - call_stack.append('') - call_stack_timer.append(None) - - if event == 'return': - if call_stack: - full_name = call_stack.pop(-1) - t = call_stack_timer.pop(-1) - if t and time_filter(stack=call_stack, full_name=full_name): - if full_name not in func_time: - func_time[full_name] = 0 - call_time = (time.time() - t) - func_time[full_name] += call_time - if func_time[full_name] > func_time_max: - func_time_max = func_time[full_name] - - return tracer - - -def get_dot(stop=True): - """Returns a string containing a DOT file. Setting stop to True will cause - the trace to stop. - """ - global func_time_max

1 0

gajim: disable rfilter only when we have finished getting the co...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5ea890ec4680 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5ea890ec4680 description: disable rfilter only when we have finished getting the correct iter. Fixes #7430 diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5ec1312e237d -r 5ea890ec4680 src/roster_window.py --- a/src/roster_window.py Fri Aug 16 09:34:01 2013 +0200 +++ b/src/roster_window.py Fri Aug 16 09:39:10 2013 +0200 @@ -4051,7 +4051,7 @@ self.tree.expand_row(path, False) return if self.rfilter_enabled: - self.disable_rfilter() + gobject.idle_add(self.disable_rfilter) jid = model[path][C_JID].decode('utf-8') resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

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