Commits

commits@gajim.org

17632 discussions

gajim: use a "gajim" logger name for gnupg.py. see #7149
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 09a2941b3132 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=09a2941b3132 description: use a "gajim" logger name for gnupg.py. see #7149 diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 29cea7237598 -r 09a2941b3132 src/common/gnupg.py --- a/src/common/gnupg.py Thu Aug 09 21:55:35 2012 +0400 +++ b/src/common/gnupg.py Fri Aug 10 08:06:41 2012 +0200 @@ -64,7 +64,7 @@ except NameError: _py3k = True -logger = logging.getLogger(__name__) +logger = logging.getLogger('gajim.c.gnupg') if not logger.handlers: logger.addHandler(NullHandler())

1 0

gajim: first load the plugins of the user directory. does not l...
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 2b9665a0d5ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b9665a0d5ed description: first load the plugins of the user directory. does not load the module twice. diffstat: src/plugins/pluginmanager.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 1ec7b818e2c8 -r 2b9665a0d5ed src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in gajim.PLUGINS_DIRS: + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() @@ -433,6 +433,9 @@ elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name + if module_name in sys.modules: + # do not load the module twice + continue file_path += os.path.sep try: module = __import__(module_name)

1 0

gajim: typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 29cea7237598 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=29cea7237598 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b9665a0d5ed -r 29cea7237598 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:55:35 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' - for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): + for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]]: pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config()

1 0

gajim: hide invite contacts buttons in zeroconf chat controls. F...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 1ec7b818e2c8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ec7b818e2c8 description: hide invite contacts buttons in zeroconf chat controls. Fixes #7188 diffstat: src/chat_control.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (21 lines): diff -r 0ec91ae95834 -r 1ec7b818e2c8 src/chat_control.py --- a/src/chat_control.py Thu Aug 02 21:52:20 2012 +0400 +++ b/src/chat_control.py Sat Aug 04 17:14:34 2012 +0200 @@ -1735,10 +1735,14 @@ "him or her a file.")) # Convert to GC - if self.contact.supports(NS_MUC): - self._convert_to_gc_button.set_sensitive(True) + if gajim.config.get_per('accounts', self.account, 'is_zeroconf'): + self._convert_to_gc_button.set_no_show_all(True) + self._convert_to_gc_button.hide() else: - self._convert_to_gc_button.set_sensitive(False) + if self.contact.supports(NS_MUC): + self._convert_to_gc_button.set_sensitive(True) + else: + self._convert_to_gc_button.set_sensitive(False) # Information if gajim.account_is_disconnected(self.account):

1 0

gajim: [Darlan]. fix typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 0ec91ae95834 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec91ae95834 description: [Darlan]. fix typo diffstat: src/common/zeroconf/client_zeroconf.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4eb2a1c69e3f -r 0ec91ae95834 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sat Jul 28 22:46:11 2012 +0400 +++ b/src/common/zeroconf/client_zeroconf.py Thu Aug 02 21:52:20 2012 +0400 @@ -447,7 +447,7 @@ self._owner.Dispatcher.Event('', DATA_ERROR, ( self.client.to, thread_id)) else: - self._owner.on_not_ok('conenction timeout') + self._owner.on_not_ok('connection timeout') ids[self.fd] = [] self.pollend()

1 0

gajim: [Darlan]. typo
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 4eb2a1c69e3f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4eb2a1c69e3f description: [Darlan]. typo diffstat: src/command_system/implementation/standard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1f8e1c86b81e -r 4eb2a1c69e3f src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Thu Jul 19 22:47:47 2012 +0400 +++ b/src/command_system/implementation/standard.py Sat Jul 28 22:46:11 2012 +0400 @@ -127,7 +127,7 @@ @command(raw=True, empty=True) @doc(_(""" - Set current the status + Set the current status Status can be given as one of the following values: online, away, chat, xa, dnd.

1 0

gajim: update Copyright
by Fomin Denis 14 Aug '12

14 Aug '12

changeset 1f8e1c86b81e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1f8e1c86b81e description: update Copyright diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d2a181d87d20 -r 1f8e1c86b81e src/dialogs.py --- a/src/dialogs.py Sun Jul 15 22:44:02 2012 +0200 +++ b/src/dialogs.py Thu Jul 19 22:47:47 2012 +0400 @@ -1264,7 +1264,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2011 Gajim Team' + s = u'Copyright © 2003-2012 Gajim Team' dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path:

1 0

gajim: set plugin error dialog transient for Plugins Window. Fix...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset d2a181d87d20 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2a181d87d20 description: set plugin error dialog transient for Plugins Window. Fixes #7184 diffstat: src/plugins/gui.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r ac3ef0852cf7 -r d2a181d87d20 src/plugins/gui.py --- a/src/plugins/gui.py Sun Jul 15 22:33:33 2012 +0200 +++ b/src/plugins/gui.py Sun Jul 15 22:44:02 2012 +0200 @@ -166,7 +166,8 @@ try: gajim.plugin_manager.activate_plugin(plugin) except GajimPluginActivateException, e: - WarningDialog(_('Plugin failed'), str(e)) + WarningDialog(_('Plugin failed'), str(e), + transient_for=self.window) return self.installed_plugins_model[path][2] = not is_active

1 0

gajim: [Isratine Citizen]. Add Hebrew translation.
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset 705c3ff07f57 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=705c3ff07f57 description: [Isratine Citizen]. Add Hebrew translation. diffstat: po/LINGUAS | 1 + po/he.po | 12423 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 12424 insertions(+), 0 deletions(-) diffs (truncated from 12436 to 300 lines): diff -r 59edb542b13f -r 705c3ff07f57 po/LINGUAS --- a/po/LINGUAS Thu Jun 21 14:10:01 2012 +0200 +++ b/po/LINGUAS Tue Aug 14 11:47:00 2012 +0200 @@ -31,4 +31,5 @@ uk ja kk +he zh_TW diff -r 59edb542b13f -r 705c3ff07f57 po/he.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/he.po Tue Aug 14 11:47:00 2012 +0200 @@ -0,0 +1,12423 @@ +# Hebrew translations for gajim +# Copyright (C) Copyright © 2003-2012 Gajim Team +# This file is distributed under the same license as the gajim package. +# Darlan <xmpp:israeli@failar.nu>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: gajim 0.15\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-07-04 22:54+0400\n" +"PO-Revision-Date: 2012-07-26 14:47+0200\n" +"Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" +"Language-Team: Rahut\n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Hebrew\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_מצב־חיבור" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_אירועים אישיים" + +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "התחלת _שיחה..." + +# הצטרפות אך/ל +# שיחה מרובת משתתפים +# שיחה קבוצתית +# קבוצת שיחה +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/roster_window.ui.h:5 +msgid "Join _Group Chat..." +msgstr "שיחת _קבוצה..." + +#: ../data/gui/account_context_menu.ui.h:5 +msgid "_Add Contact..." +msgstr "הוספת _איש־קשר..." + +# איתור +#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/roster_window.ui.h:7 +msgid "_Discover Services" +msgstr "מציאת _שירותים" + +#: ../data/gui/account_context_menu.ui.h:7 +msgid "_Execute Command..." +msgstr "הרצת _פקודה..." + +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_פתיחת תיבת דואר נכנס של GMail" + +#: ../data/gui/account_context_menu.ui.h:9 +msgid "_Modify Account" +msgstr "ה_תאמת חשבון" + +#: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "‏Gajim: אשף יצירת חשבון" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"יש צורך בחשבון בכדי להתחבר\n" +"אל רשת התקשורת Jabber." + +# בו אני רוצה לעשות +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "כבר קיים ברשותי _חשבון שברצוני לעשות שימוש בו" + +# I want to _register a new account +# אני רוצה _לרשום חשבון חדש +# I want to _register for a new account +# אני רוצה _להירשם לחשבון חדש +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "ברצוני ל_רשום חשבון חדש" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "נא לבחור באחת מהאפשרויות הבאות:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "נא להזין מידע עבור חשבונך הקיים" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_מילת־מעבר:" + +# שמירת סיסמא +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "שמירת _מילת־מעבר" + +# BUG: a dot at the end +# From: Clipman +# If checked, this option allows to store one image inside the history +# במידה והמשבצת/והאפשרות מסומנת +# במידה ומשבצת/ואפשרות זו מסומנת +# בבוחרך באפשרות זו, Wicd +#: ../data/gui/account_creation_wizard_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:21 +msgid "If checked, Gajim will remember the password for this account" +msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את מילת־המעבר עבור חשבון זה" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:23 +msgid "_Jabber ID:" +msgstr "_JID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Anon_ymous authentication" +msgstr "אימות _אלמוני" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Please select a server" +msgstr "נא לבחור שרת" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/manage_bookmarks_window.ui.h:3 +msgid "_Server:" +msgstr "_שרת:" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "Prox_y:" +msgstr "_פרוקסי:" + +# BUG: _underline +#: ../data/gui/account_creation_wizard_window.ui.h:16 +msgid "Manage..." +msgstr "ניהול..." + +# BUG: _underline +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Use custom hostname/port" +msgstr "התאמת שם מארח\\פתחה" + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +msgid "_Hostname:" +msgstr "שם מ_ארח:" + +# _פתחה: +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "_Port:" +msgstr "_פתחה:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/roster_window.ui.h:8 +msgid "_Advanced" +msgstr "מת_קדם" + +# הוספת אישור זה לרשימת האישורים המהימנים.\n +# טביעת אצבע (מסוג) SHA1 של האישור:\n +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"הוספת תעודה זו אל רשימת התעודות המהימנות.\n" +"טביעת אצבע SHA1 של התעודה:\n" + +# מתחבר כעת +#: ../data/gui/account_creation_wizard_window.ui.h:24 +msgid "" +"Connecting to server\n" +"\n" +"Please wait..." +msgstr "" +"מתחבר אל השרת\n" +"\n" +"נא להמתין..." + +# מיידית לאחר ש +#: ../data/gui/account_creation_wizard_window.ui.h:27 +msgid "Connect when I press Finish" +msgstr "התחבר מיד כאשר אני אלחץ על סיום" + +#: ../data/gui/account_creation_wizard_window.ui.h:28 +msgid "Set my profile when I connect" +msgstr "הגדר את הדיוקן שלי כאשר אני מתחבר/ת" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +msgid "_Finish" +msgstr "_סיום" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +#: ../data/gui/accounts_window.ui.h:1 +#: ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1253 +#: ../src/config.py:1267 +#: ../src/config.py:1272 +#: ../src/config.py:1320 +#: ../src/config.py:1423 +#: ../src/config.py:1738 +#: ../src/config.py:1743 +#: ../src/config.py:2319 +#: ../src/config.py:2398 +#: ../src/config.py:2411 +#: ../src/config.py:3691 +#: ../src/config.py:3766 +#: ../src/dialogs.py:311 +#: ../src/dialogs.py:313 +#: ../src/dialogs.py:519 +#: ../src/dialogs.py:532 +#: ../src/roster_window.py:3202 +#: ../src/roster_window.py:3208 +#: ../src/roster_window.py:3213 +msgid "None" +msgstr "ללא" + +#: ../data/gui/accounts_window.ui.h:2 +msgid "Accounts" +msgstr "חשבונות" + +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:3 +#: ../src/dialogs.py:3389 +#: ../src/dialogs.py:3435 +msgid "Add" +msgstr "הוספה" + +#. Change label for accept_button to action name instead of 'OK'. +#: ../data/gui/accounts_window.ui.h:4 +#: ../src/dialogs.py:3393 +#: ../src/dialogs.py:3490 +msgid "Delete" +msgstr "מחיקה" + +#. Rename +#: ../data/gui/accounts_window.ui.h:5 +#: ../src/roster_window.py:5784 +msgid "Re_name" +msgstr "_שינוי שם" + +#. XML Console enable checkbutton +#: ../data/gui/accounts_window.ui.h:6 +#: ../data/gui/xml_console_window.ui.h:3 +msgid "_Enable" +msgstr "_אפשור" + +# אימות אלמוני +#: ../data/gui/accounts_window.ui.h:7 +msgid "Anonymous authentication" +msgstr "התאמתות אלמונית" + +#: ../data/gui/accounts_window.ui.h:8 +msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" +msgstr "משאב נשלח אל שרת ה־Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, תלוי במספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" + +# In Hebrew: גאג'ים +#. No configured account +#: ../data/gui/accounts_window.ui.h:9 +#: ../data/gui/roster_window.ui.h:1 +#: ../src/common/helpers.py:1168 +#: ../src/common/helpers.py:1180 +#: ../src/notify.py:317 +#: ../src/notify.py:340 +#: ../src/notify.py:390 +#: ../src/notify.py:406 +msgid "Gajim" +msgstr "Gajim" + +# BUG: _underline +# אישי־קשר +#: ../data/gui/accounts_window.ui.h:10 +msgid "Synchronize contacts" +msgstr "סנכרון אנשי־קשר" + +#: ../data/gui/accounts_window.ui.h:11 +msgid "Click to request authorization to all contacts of another account" +msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי־הקשר שבחשבון אחר"

1 0

gajim: make "invite to" menuitem insensitive when account if off...
by Yann Leboulanger 14 Aug '12

14 Aug '12

changeset ac3ef0852cf7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ac3ef0852cf7 description: make "invite to" menuitem insensitive when account if offline. Fixes #7082 diffstat: src/gui_menu_builder.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 705c3ff07f57 -r ac3ef0852cf7 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Aug 14 11:47:00 2012 +0200 +++ b/src/gui_menu_builder.py Sun Jul 15 22:33:33 2012 +0200 @@ -386,6 +386,9 @@ else: build_invite_submenu(invite_menuitem, [(contact, account)]) + if gajim.account_is_disconnected(account): + invite_menuitem.set_sensitive(False) + # One or several resource, we do the same for send_custom_status status_menuitems = gtk.Menu() send_custom_status_menuitem.set_submenu(status_menuitems)

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