Commits May 2009

commits@gajim.org

3 participants
53 discussions

gajim: clean gpg call when we list keys. Fixes #5043
by Yann Leboulanger 22 May '09

22 May '09

changeset 96d895501b0b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=96d895501b0b description: clean gpg call when we list keys. Fixes #5043 diffstat: src/common/GnuPG.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (19 lines): diff -r b658b62c74e2 -r 96d895501b0b src/common/GnuPG.py --- a/src/common/GnuPG.py Fri May 22 19:19:23 2009 +0200 +++ b/src/common/GnuPG.py Fri May 22 19:44:43 2009 +0200 @@ -194,6 +194,9 @@ output = proc.handles['stdout'].read() proc.handles['stdout'].close() + try: proc.wait() + except IOError: pass + keys = {} lines = output.split('\n') for line in lines: @@ -234,4 +237,4 @@ out = out + "-----END PGP %s-----\n" % type_ return out -# vim: se ts=3: +# vim: set ts=3:

1 0

gajim: prevent traceback when writing avatar file to HD fails. F...
by Yann Leboulanger 22 May '09

22 May '09

changeset b658b62c74e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b658b62c74e2 description: prevent traceback when writing avatar file to HD fails. Fixes #5005 diffstat: src/gajim.py | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diffs (37 lines): diff -r ce8ed2a7c080 -r b658b62c74e2 src/gajim.py --- a/src/gajim.py Thu May 21 21:12:11 2009 +0200 +++ b/src/gajim.py Fri May 22 19:19:23 2009 +0200 @@ -3091,18 +3091,30 @@ typ = 'png' extension = '.png' path_to_original_file = path_to_file + extension - pixbuf.save(path_to_original_file, typ) + try: + pixbuf.save(path_to_original_file, typ) + except Exception, e: + log.error('Error writing avatar file %s: %s' % (path_to_original_file, + str(e))) # Generate and save the resized, color avatar pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'notification') if pixbuf: path_to_normal_file = path_to_file + '_notif_size_colored' + extension - pixbuf.save(path_to_normal_file, 'png') + try: + pixbuf.save(path_to_normal_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e))) # Generate and save the resized, black and white avatar bwbuf = gtkgui_helpers.get_scaled_pixbuf( gtkgui_helpers.make_pixbuf_grayscale(pixbuf), 'notification') if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension - bwbuf.save(path_to_bw_file, 'png') + try: + bwbuf.save(path_to_bw_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e))) def remove_avatar_files(self, jid, puny_nick = None, local = False): '''remove avatar files of a jid'''

1 0

gajim: [Jeff Bailes] updated british translatio nfor 0.12.2
by Yann Leboulanger 22 May '09

22 May '09

changeset bb6682f2b598 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bb6682f2b598 description: [Jeff Bailes] updated british translatio nfor 0.12.2 diffstat: po/en_GB.po | 943 +++++++++++++++----------------------------------------------- 1 files changed, 228 insertions(+), 715 deletions(-) diffs (truncated from 1784 to 300 lines): diff -r 13340a35f36998b69928cf66a1f139e503b59954 -r bb6682f2b5982846ad011eeee4c2bcbd1818af66 po/en_GB.po --- a/po/en_GB.po Fri May 22 00:23:18 2009 +0200 +++ b/po/en_GB.po Fri May 22 13:09:57 2009 +0200 @@ -1,14 +1,14 @@ # English translations for Gajim - A Jabber Instant Messager package. # Copyright (C) 2006 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package. -# Jeff Bailes <thepizzaking(a)gmail.com>, 2006. # +# Jeff Bailes <thepizzaking(a)gmail.com>, 2006, 2009. msgid "" msgstr "" "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-21 22:39+0200\n" -"PO-Revision-Date: 2008-12-02 10:09+1100\n" +"POT-Creation-Date: 2009-05-22 13:07+0200\n" +"PO-Revision-Date: 2009-05-22 20:06+1000\n" "Last-Translator: Jeff Bailes <thepizzaking(a)gmail.com>\n" "Language-Team: English <en_gb(a)li.org>\n" "MIME-Version: 1.0\n" @@ -347,7 +347,7 @@ #: ../data/glade/account_modification_window.glade.h:27 #: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1605 -#: ../src/config.py:2108 +#: ../src/config.py:2110 msgid "No key selected" msgstr "No key selected" @@ -356,8 +356,8 @@ #: ../data/glade/accounts_window.glade.h:36 #: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1192 #: ../src/config.py:1263 ../src/config.py:1510 ../src/config.py:1515 -#: ../src/config.py:2016 ../src/config.py:2094 ../src/config.py:2107 -#: ../src/config.py:3200 ../src/config.py:3268 ../src/dialogs.py:293 +#: ../src/config.py:2018 ../src/config.py:2096 ../src/config.py:2109 +#: ../src/config.py:3202 ../src/config.py:3270 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:524 ../src/roster_window.py:2753 #: ../src/roster_window.py:2759 ../src/roster_window.py:2764 msgid "None" @@ -469,9 +469,8 @@ msgstr "Proxy" #: ../data/glade/accounts_window.glade.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "_Adjust to status" +msgstr "A_djust to status" #: ../data/glade/accounts_window.glade.h:7 msgid "Accounts" @@ -486,9 +485,8 @@ "insecure connection." #: ../data/glade/accounts_window.glade.h:16 -#, fuzzy msgid "Co_nnect on Gajim startup" -msgstr "C_onnect on Gajim startup" +msgstr "Co_nnect on Gajim startup" #: ../data/glade/accounts_window.glade.h:18 #: ../data/glade/zeroconf_information_window.glade.h:2 @@ -534,63 +532,52 @@ msgstr "Re_name" #: ../data/glade/accounts_window.glade.h:46 -#, fuzzy msgid "Send _keep-alive packets" -msgstr "Send keep-alive packets" +msgstr "Send _keep-alive packets" #: ../data/glade/accounts_window.glade.h:48 -#, fuzzy msgid "Synchroni_ze account status with global status" -msgstr "Synch_ronise account status with global status" +msgstr "Synchroni_se account status with global status" #: ../data/glade/accounts_window.glade.h:50 -#, fuzzy msgid "Use G_PG Agent" -msgstr "Use GPG _Agent" +msgstr "Use G_PG Agent" #: ../data/glade/accounts_window.glade.h:51 -#, fuzzy msgid "Use cust_om hostname/port" -msgstr "Use custom hostname/port" +msgstr "Use cust_om hostname/port" #: ../data/glade/accounts_window.glade.h:52 -#, fuzzy msgid "Use cust_om port:" -msgstr "Use custom port:" +msgstr "Use cust_om port:" #: ../data/glade/accounts_window.glade.h:54 -#, fuzzy msgid "_Edit Personal Information..." -msgstr "Edit Personal Information..." +msgstr "_Edit Personal Information..." #: ../data/glade/accounts_window.glade.h:55 -#, fuzzy msgid "_Enable" -msgstr "Enable" +msgstr "_Enable" #: ../data/glade/accounts_window.glade.h:56 -#, fuzzy msgid "_Hostname: " -msgstr "_Hostname:" +msgstr "_Hostname: " #: ../data/glade/accounts_window.glade.h:58 -#, fuzzy msgid "_Manage..." -msgstr "Manage..." +msgstr "_Manage..." #: ../data/glade/accounts_window.glade.h:60 -#, fuzzy msgid "_Port: " -msgstr "_Port:" +msgstr "_Port: " #: ../data/glade/accounts_window.glade.h:61 msgid "_Warn before using an insecure connection" msgstr "_Warn before using an insecure connection" #: ../data/glade/accounts_window.glade.h:62 -#, fuzzy msgid "_use HTTP__PROXY environment variable" -msgstr "use HTTP_PROXY environment variable" +msgstr "_use HTTP__PROXY environment variable" #: ../data/glade/accounts_window.glade.h:63 msgid "gtk-add" @@ -2971,7 +2958,7 @@ #: ../src/common/contacts.py:113 ../src/common/helpers.py:67 #: ../src/common/helpers.py:238 ../src/conversation_textview.py:847 #: ../src/dialogs.py:906 ../src/dialogs.py:1630 ../src/dialogs.py:1655 -#: ../src/gajim.py:1047 ../src/gajim.py:1745 ../src/roster_window.py:915 +#: ../src/gajim.py:1051 ../src/gajim.py:1749 ../src/roster_window.py:915 #: ../src/roster_window.py:1542 ../src/roster_window.py:1544 #: ../src/roster_window.py:1888 ../src/roster_window.py:3123 #: ../src/roster_window.py:3150 ../src/roster_window.py:5307 @@ -3172,10 +3159,10 @@ "If you close this tab and you have history disabled, this message will be " "lost." -#: ../src/chat_control.py:2399 ../src/common/connection_handlers.py:1865 -#: ../src/common/connection_handlers.py:1911 -#: ../src/common/connection_handlers.py:2099 -#: ../src/common/connection_handlers.py:2232 ../src/common/connection.py:1298 +#: ../src/chat_control.py:2399 ../src/common/connection_handlers.py:1867 +#: ../src/common/connection_handlers.py:1913 +#: ../src/common/connection_handlers.py:2104 +#: ../src/common/connection_handlers.py:2237 ../src/common/connection.py:1298 #: ../src/gajim.py:194 msgid "Database Error" msgstr "Database Error" @@ -3333,7 +3320,7 @@ #. sorted alphanum #: ../src/common/config.py:111 ../src/common/config.py:451 #: ../src/common/optparser.py:217 ../src/common/optparser.py:435 -#: ../src/common/optparser.py:469 ../src/gajim.py:3275 +#: ../src/common/optparser.py:469 ../src/gajim.py:3279 msgid "default" msgstr "default" @@ -3899,20 +3886,19 @@ #: ../src/common/config.py:307 msgid "Whitespace sent after inactivity" -msgstr "" +msgstr "Whitespace sent after inactivity" #: ../src/common/config.py:308 msgid "XMPP ping sent after inactivity" -msgstr "" +msgstr "XMPP ping sent after inactivity" #: ../src/common/config.py:312 -#, fuzzy msgid "" "How many seconds to wait for the answer of ping alive packet before we try " "to reconnect." msgstr "" -"How many seconds to wait for the answer of keepalive packet before we try to " -"reconnect." +"How many seconds to wait for the answer of ping alive packet before we try " +"to reconnect." #. yes, no, ask #: ../src/common/config.py:316 @@ -4097,48 +4083,47 @@ msgstr "Registration information for transport %s has not arrived in time" #: ../src/common/connection_handlers.py:647 -#, fuzzy msgid "Registration succeeded" -msgstr "Register to %s" +msgstr "Registration succeeded" #: ../src/common/connection_handlers.py:648 #, python-format msgid "Resgitration with agent %s succeeded" -msgstr "" +msgstr "Resgitration with agent %s succeeded" #: ../src/common/connection_handlers.py:650 -#, fuzzy msgid "Registration failed" -msgstr "Connection Failed" +msgstr "Registration failed" #: ../src/common/connection_handlers.py:650 #, python-format msgid "" "Resgitration with agent %(agent)s failed with error %(error)s: %(error_msg)s" msgstr "" - -#: ../src/common/connection_handlers.py:942 -#: ../src/common/connection_handlers.py:1863 -#: ../src/common/connection_handlers.py:1909 -#: ../src/common/connection_handlers.py:2097 -#: ../src/common/connection_handlers.py:2230 ../src/common/connection.py:1296 +"Resgitration with agent %(agent)s failed with error %(error)s: %(error_msg)s" + +#: ../src/common/connection_handlers.py:944 +#: ../src/common/connection_handlers.py:1865 +#: ../src/common/connection_handlers.py:1911 +#: ../src/common/connection_handlers.py:2102 +#: ../src/common/connection_handlers.py:2235 ../src/common/connection.py:1296 #: ../src/gajim.py:416 msgid "Disk Write Error" msgstr "Disk Write Error" -#: ../src/common/connection_handlers.py:1149 ../src/common/connection.py:889 +#: ../src/common/connection_handlers.py:1151 ../src/common/connection.py:889 msgid "Invisibility not supported" msgstr "Invisibility not supported" -#: ../src/common/connection_handlers.py:1150 ../src/common/connection.py:890 +#: ../src/common/connection_handlers.py:1152 ../src/common/connection.py:890 #, python-format msgid "Account %s doesn't support invisibility." msgstr "Account %s doesn't support invisibility." -#: ../src/common/connection_handlers.py:1866 -#: ../src/common/connection_handlers.py:1912 -#: ../src/common/connection_handlers.py:2100 -#: ../src/common/connection_handlers.py:2233 ../src/common/connection.py:1299 +#: ../src/common/connection_handlers.py:1868 +#: ../src/common/connection_handlers.py:1914 +#: ../src/common/connection_handlers.py:2105 +#: ../src/common/connection_handlers.py:2238 ../src/common/connection.py:1299 #: ../src/gajim.py:195 #, python-format msgid "" @@ -4148,7 +4133,7 @@ "The database file (%s) cannot be read. Try to repair it (see http://trac." "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)." -#: ../src/common/connection_handlers.py:1984 +#: ../src/common/connection_handlers.py:1989 #, python-format msgid "Nickname not allowed: %s" msgstr "Nickname not allowed: %s" @@ -4156,70 +4141,70 @@ #. we are banned #. group chat does not exist #. user may close the window before we are here -#: ../src/common/connection_handlers.py:2059 -#: ../src/common/connection_handlers.py:2062 -#: ../src/common/connection_handlers.py:2065 -#: ../src/common/connection_handlers.py:2068 -#: ../src/common/connection_handlers.py:2072 ../src/gajim.py:594 +#: ../src/common/connection_handlers.py:2064 +#: ../src/common/connection_handlers.py:2067 +#: ../src/common/connection_handlers.py:2070 +#: ../src/common/connection_handlers.py:2073 +#: ../src/common/connection_handlers.py:2077 ../src/gajim.py:594 msgid "Unable to join group chat" msgstr "Unable to join group chat" -#: ../src/common/connection_handlers.py:2060 +#: ../src/common/connection_handlers.py:2065 #, python-format msgid "You are banned from group chat %s." msgstr "You are banned from group chat %s." -#: ../src/common/connection_handlers.py:2063 +#: ../src/common/connection_handlers.py:2068 #, python-format msgid "Group chat %s does not exist." msgstr "Group chat %s does not exist." -#: ../src/common/connection_handlers.py:2066

1 0

gajim: updated po files for 0.12.2 release
by Yann Leboulanger 21 May '09

21 May '09

changeset f5ab2efba179 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f5ab2efba179 description: updated po files for 0.12.2 releaseX-Hg-Repo: gajim Subject: gajim: prevent traceback when we click on Rename in accounts window, but no account is selected. Fixes #5019 From: asterix changeset 0bd1e951d8d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0bd1e951d8d0 description: prevent traceback when we click on Rename in accounts window, but no account is selected. Fixes #5019X-Hg-Repo: gajim Subject: gajim: prevent traceback when receiving wrong E2E negotiation stanza. Fixes #5015 From: asterix changeset b81a423d4cd7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b81a423d4cd7 description: prevent traceback when receiving wrong E2E negotiation stanza. Fixes #5015X-Hg-Repo: gajim Subject: gajim: prevent traceback when negociating E2E. see #5015 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 19bcf551c737 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19bcf551c737 description: prevent traceback when negociating E2E. see #5015X-Hg-Repo: gajim Subject: gajim: prevent traceback when trying to print error message in a non existing message window. Fixes #5036 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 9f339554aad1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9f339554aad1 description: prevent traceback when trying to print error message in a non existing message window. Fixes #5036X-Hg-Repo: gajim Subject: gajim: [egaz] prevent GTK Warning about color. Fixes #5035 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 112e7684469d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=112e7684469d description: [egaz] prevent GTK Warning about color. Fixes #5035X-Hg-Repo: gajim Subject: gajim: prevent traceback when we receive a presence but we are no more connected. Fixes #5028 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 9578f45378a8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9578f45378a8 description: prevent traceback when we receive a presence but we are no more connected. Fixes #5028X-Hg-Repo: gajim Subject: gajim: prevent traceback when trying to show event from gajim-remote while there is no event. Fixes #5031 From: Yann Leboulanger <asterix(a)lagaule.org> changeset b5971e06ca9e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5971e06ca9e description: prevent traceback when trying to show event from gajim-remote while there is no event. Fixes #5031X-Hg-Repo: gajim Subject: gajim: prevent traceback when receiving a disco info while we are disconnected. Fixes #5042 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 8ccb889debae in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ccb889debae description: prevent traceback when receiving a disco info while we are disconnected. Fixes #5042X-Hg-Repo: gajim Subject: gajim: [Djavan Fagundes] updated brazilian translation. Fixes #5025 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 13340a35f369 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=13340a35f369 description: [Djavan Fagundes] updated brazilian translation. Fixes #5025 diffstat: po/be.po | 2722 +++++++++++---------- po/be(a)latin.po | 2748 +++++++++++---------- po/bg.po | 2606 ++++++++++--------- po/cs.po | 2603 ++++++++++--------- po/da.po | 2612 ++++++++++--------- po/de.po | 2562 ++++++++++--------- po/en_GB.po | 2633 ++++++++++---------- po/eo.po | 2725 +++++++++++---------- po/es.po | 2437 +++++++++--------- po/eu.po | 2725 +++++++++++---------- po/fr.po | 2638 ++++++++++---------- po/gl.po | 2736 +++++++++++---------- po/hr.po | 2617 ++++++++++--------- po/it.po | 2639 ++++++++++---------- po/lt.po | 2722 +++++++++++---------- po/nb.po | 2618 ++++++++++--------- po/no.po | 2618 ++++++++++--------- po/pl.po | 2618 ++++++++++--------- po/pt_BR.po | 5206 ++++++++++++++++++++-------------------- po/ru.po | 2604 ++++++++++--------- po/sk.po | 2622 ++++++++++--------- po/sr.po | 2611 ++++++++++--------- po/sr(a)Latn.po | 2612 ++++++++++--------- po/sv.po | 2748 +++++++++++---------- po/uk.po | 2550 ++++++++++--------- po/zh_CN.po | 2728 +++++++++++---------- src/common/connection_handlers.py | 5 + src/common/stanza_session.py | 5 +- src/config.py | 4 +- src/gajim.py | 4 + src/systray.py | 2 + 31 files changed, 36737 insertions(+), 34543 deletions(-) diffs (truncated from 178684 to 300 lines): diff -r 206c7c3c9f9724d7761ab55a9e2928afb16b510a -r 13340a35f36998b69928cf66a1f139e503b59954 po/be.po --- a/po/be.po Thu May 07 11:32:02 2009 +0000 +++ b/po/be.po Fri May 22 00:23:18 2009 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-10 09:44+0100\n" +"POT-Creation-Date: 2009-05-21 22:39+0200\n" "PO-Revision-Date: 2007-01-20 00:01+0300\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -122,13 +122,12 @@ #: ../data/glade/account_creation_wizard_window.glade.h:14 #: ../data/glade/account_modification_window.glade.h:20 -#: ../data/glade/accounts_window.glade.h:25 +#: ../data/glade/accounts_window.glade.h:24 msgid "If checked, Gajim will remember the password for this account" msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка" #: ../data/glade/account_creation_wizard_window.glade.h:15 #: ../data/glade/account_modification_window.glade.h:26 -#: ../data/glade/accounts_window.glade.h:34 msgid "Manage..." msgstr "Кіраванне..." @@ -139,7 +138,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:17 #: ../data/glade/account_modification_window.glade.h:40 -#: ../data/glade/accounts_window.glade.h:48 +#: ../data/glade/accounts_window.glade.h:45 msgid "Save pass_word" msgstr "Захоўваць па_роль" @@ -149,7 +148,6 @@ #: ../data/glade/account_creation_wizard_window.glade.h:19 #: ../data/glade/account_modification_window.glade.h:45 -#: ../data/glade/accounts_window.glade.h:53 msgid "Use custom hostname/port" msgstr "Адмысловы вузел / порт" @@ -181,7 +179,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:26 #: ../data/glade/account_modification_window.glade.h:50 -#: ../data/glade/accounts_window.glade.h:58 +#: ../data/glade/accounts_window.glade.h:59 msgid "_Password:" msgstr "_Пароль:" @@ -207,18 +205,16 @@ #: ../data/glade/account_modification_window.glade.h:2 #: ../data/glade/accounts_window.glade.h:2 -#: ../data/glade/zeroconf_properties_window.glade.h:1 msgid "OpenPGP" msgstr "OpenPGP" #: ../data/glade/account_modification_window.glade.h:3 #: ../data/glade/accounts_window.glade.h:3 -#: ../data/glade/zeroconf_properties_window.glade.h:2 msgid "Personal Information" msgstr "Асабістыя звесткі" #: ../data/glade/account_modification_window.glade.h:4 -#: ../data/glade/accounts_window.glade.h:5 +#: ../data/glade/accounts_window.glade.h:6 msgid "Account" msgstr "Рахунак" @@ -227,24 +223,23 @@ msgstr "Змяненне рахунка" #: ../data/glade/account_modification_window.glade.h:6 -#: ../data/glade/accounts_window.glade.h:7 +#: ../data/glade/accounts_window.glade.h:8 #, fuzzy msgid "Administration operations" msgstr "Спіс адміністратараў" #: ../data/glade/account_modification_window.glade.h:7 -#: ../data/glade/accounts_window.glade.h:8 +#: ../data/glade/accounts_window.glade.h:9 msgid "Auto-reconnect when connection is lost" msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне" #: ../data/glade/account_modification_window.glade.h:8 -#: ../data/glade/accounts_window.glade.h:9 -#: ../data/glade/zeroconf_properties_window.glade.h:3 +#: ../data/glade/accounts_window.glade.h:10 msgid "C_onnect on Gajim startup" msgstr "_Злучацца па старце Gajim" #: ../data/glade/account_modification_window.glade.h:9 -#: ../data/glade/accounts_window.glade.h:10 +#: ../data/glade/accounts_window.glade.h:11 msgid "Chan_ge Password" msgstr "З_мяніць пароль" @@ -261,37 +256,35 @@ "да сервера, а гэтая опцыя адключыць выкарыстанне TLS" #: ../data/glade/account_modification_window.glade.h:11 -#: ../data/glade/accounts_window.glade.h:12 -#: ../data/glade/zeroconf_properties_window.glade.h:4 +#: ../data/glade/accounts_window.glade.h:13 msgid "Choose _Key..." msgstr "Выберыце _ключ..." #: ../data/glade/account_modification_window.glade.h:12 -#: ../data/glade/accounts_window.glade.h:13 +#: ../data/glade/accounts_window.glade.h:14 msgid "Click to change account's password" msgstr "Пстрыкніце, каб змяніць пароль рахунка" #: ../data/glade/account_modification_window.glade.h:13 -#: ../data/glade/accounts_window.glade.h:14 +#: ../data/glade/accounts_window.glade.h:15 msgid "Click to request authorization to all contacts of another account" msgstr "" #: ../data/glade/account_modification_window.glade.h:14 -#: ../data/glade/accounts_window.glade.h:15 +#: ../data/glade/accounts_window.glade.h:17 msgid "Connection" msgstr "Злучэнне" #: ../data/glade/account_modification_window.glade.h:15 -#: ../data/glade/accounts_window.glade.h:17 msgid "Edit Personal Information..." msgstr "Змяніць асабістыя звесткі..." #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043 -#: ../src/common/helpers.py:1055 ../src/notify.py:513 ../src/notify.py:544 -#: ../src/notify.py:556 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1159 +#: ../src/common/helpers.py:1171 ../src/notify.py:517 ../src/notify.py:553 +#: ../src/notify.py:565 msgid "Gajim" msgstr "Gajim" @@ -300,21 +293,18 @@ #. General group cannot be changed #: ../data/glade/account_modification_window.glade.h:17 #: ../data/glade/accounts_window.glade.h:21 -#: ../data/glade/preferences_window.glade.h:49 -#: ../data/glade/zeroconf_properties_window.glade.h:7 -#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111 -#: ../src/dialogs.py:166 ../src/roster_window.py:2672 -#: ../src/roster_window.py:5157 +#: ../data/glade/preferences_window.glade.h:49 ../src/common/contacts.py:98 +#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2683 +#: ../src/roster_window.py:5207 msgid "General" msgstr "Агульная" #: ../data/glade/account_modification_window.glade.h:18 -#: ../data/glade/accounts_window.glade.h:22 msgid "Hostname: " msgstr "Назва вузла: " #: ../data/glade/account_modification_window.glade.h:19 -#: ../data/glade/accounts_window.glade.h:23 +#: ../data/glade/accounts_window.glade.h:22 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -323,7 +313,7 @@ "правільнай перадачы файлаў падвысіцца." #: ../data/glade/account_modification_window.glade.h:21 -#: ../data/glade/accounts_window.glade.h:26 +#: ../data/glade/accounts_window.glade.h:25 msgid "" "If checked, Gajim will send keep-alive packets to prevent connection timeout " "which results in disconnection" @@ -332,7 +322,6 @@ "для запэўнівання сервера ў Вашым існаванні" #: ../data/glade/account_modification_window.glade.h:22 -#: ../data/glade/zeroconf_properties_window.glade.h:8 msgid "" "If checked, Gajim will store the password in ~/.gajim/config with 'read' " "permission only for you" @@ -341,8 +330,7 @@ "config з правамі чытання толькі для Вас" #: ../data/glade/account_modification_window.glade.h:23 -#: ../data/glade/accounts_window.glade.h:27 -#: ../data/glade/zeroconf_properties_window.glade.h:9 +#: ../data/glade/accounts_window.glade.h:26 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " "this account" @@ -351,8 +339,7 @@ "гэтага рахунка" #: ../data/glade/account_modification_window.glade.h:24 -#: ../data/glade/accounts_window.glade.h:28 -#: ../data/glade/zeroconf_properties_window.glade.h:10 +#: ../data/glade/accounts_window.glade.h:27 msgid "" "If checked, any change to the global status (handled by the combobox at the " "bottom of the roster window) will change the status of this account " @@ -362,48 +349,45 @@ "спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам" #: ../data/glade/account_modification_window.glade.h:25 -#: ../data/glade/accounts_window.glade.h:31 +#: ../data/glade/accounts_window.glade.h:30 msgid "Information about you, as stored in the server" msgstr "Звесткі аб Вас, якія захоўваюцца на серверы" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:36 -#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557 -#: ../src/config.py:2057 +#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1605 +#: ../src/config.py:2108 msgid "No key selected" msgstr "Ключ не выбраны" #. None means no proxy profile selected #: ../data/glade/account_modification_window.glade.h:29 -#: ../data/glade/accounts_window.glade.h:38 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147 -#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470 -#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056 -#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294 -#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741 -#: ../src/roster_window.py:2747 ../src/roster_window.py:2752 +#: ../data/glade/accounts_window.glade.h:36 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1192 +#: ../src/config.py:1263 ../src/config.py:1510 ../src/config.py:1515 +#: ../src/config.py:2016 ../src/config.py:2094 ../src/config.py:2107 +#: ../src/config.py:3200 ../src/config.py:3268 ../src/dialogs.py:293 +#: ../src/dialogs.py:295 ../src/dialogs.py:524 ../src/roster_window.py:2753 +#: ../src/roster_window.py:2759 ../src/roster_window.py:2764 msgid "None" msgstr "Ніякі" #: ../data/glade/account_modification_window.glade.h:30 -#: ../data/glade/accounts_window.glade.h:39 +#: ../data/glade/accounts_window.glade.h:37 #: ../data/glade/profile_window.glade.h:36 -#: ../data/glade/zeroconf_properties_window.glade.h:17 msgid "Personal Information" msgstr "Асабістыя звесткі" #: ../data/glade/account_modification_window.glade.h:31 -#: ../data/glade/accounts_window.glade.h:40 msgid "Port: " msgstr "Порт: " #: ../data/glade/account_modification_window.glade.h:32 -#: ../data/glade/accounts_window.glade.h:41 +#: ../data/glade/accounts_window.glade.h:38 msgid "Priori_ty:" msgstr "Прыяры_тэт:" #: ../data/glade/account_modification_window.glade.h:33 -#: ../data/glade/accounts_window.glade.h:42 +#: ../data/glade/accounts_window.glade.h:39 msgid "" "Priority is used in Jabber to determine who gets the events from the jabber " "server when two or more clients are connected using the same account; The " @@ -414,7 +398,7 @@ "атрымлівае гэтыя падзеі" #: ../data/glade/account_modification_window.glade.h:34 -#: ../data/glade/accounts_window.glade.h:43 +#: ../data/glade/accounts_window.glade.h:40 msgid "Priority will change automatically according to your status." msgstr "Прыярытэт будзе змяняцца згодна з станам." @@ -423,12 +407,12 @@ msgstr "Проксі:" #: ../data/glade/account_modification_window.glade.h:36 -#: ../data/glade/accounts_window.glade.h:45 +#: ../data/glade/accounts_window.glade.h:42 msgid "Resour_ce:" msgstr "Рэ_сурс:" #: ../data/glade/account_modification_window.glade.h:37 -#: ../data/glade/accounts_window.glade.h:46 +#: ../data/glade/accounts_window.glade.h:43 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 " @@ -442,29 +426,25 @@ "накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)" #: ../data/glade/account_modification_window.glade.h:38

1 0

gajim: prevent traceback when receiving a disco info while we ar...
by Yann Leboulanger 21 May '09

21 May '09

changeset ce8ed2a7c080 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce8ed2a7c080 description: prevent traceback when receiving a disco info while we are disconnected. Fixes #5042 diffstat: src/common/connection_handlers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 6f6c0ac4236de44fdcba710c8a20bdc83258bc86 -r ce8ed2a7c080bb4e8310703ca24051a25c02681d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed May 20 10:58:46 2009 +0200 +++ b/src/common/connection_handlers.py Thu May 21 21:12:11 2009 +0200 @@ -829,6 +829,8 @@ def _DiscoverInfoCB(self, con, iq_obj): log.debug('DiscoverInfoCB') + if not self.connection or self.connected < 2: + return # According to XEP-0030: # For identity: category, type is mandatory, name is optional. # For feature: var is mandatory

1 0

gajim: prevent traceback when trying to show event from gajim-re...
by Yann Leboulanger 20 May '09

20 May '09

changeset 6f6c0ac4236d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f6c0ac4236d description: prevent traceback when trying to show event from gajim-remote while there is no event. Fixes #5031 diffstat: src/systray.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 427b5a6593f9 -r 6f6c0ac4236d src/systray.py --- a/src/systray.py Wed May 20 10:33:19 2009 +0200 +++ b/src/systray.py Wed May 20 10:58:46 2009 +0200 @@ -346,6 +346,8 @@ def handle_first_event(self): account, jid, event = gajim.events.get_first_systray_event() + if not event: + return gajim.interface.handle_event(account, jid, event.type_) def on_middle_click(self):

1 0

gajim: prevent traceback when we receive a presence but we are n...
by Yann Leboulanger 20 May '09

20 May '09

changeset 427b5a6593f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=427b5a6593f9 description: prevent traceback when we receive a presence but we are no more connected. Fixes #5028 diffstat: src/common/connection_handlers.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 8ae0a55caafe -r 427b5a6593f9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue May 19 15:27:33 2009 +0200 +++ b/src/common/connection_handlers.py Wed May 20 10:33:19 2009 +0200 @@ -2072,6 +2072,9 @@ if ptype and not ptype in rfc_types: ptype = None log.debug('PresenceCB: %s' % ptype) + if not self.connection or self.connected < 2: + log.debug('account is no more connected') + return try: who = helpers.get_full_jid_from_iq(prs) except Exception:

1 0

gajim: [Sławomir Domagała] updated polish translation
by Yann Leboulanger 19 May '09

19 May '09

changeset 8ae0a55caafe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ae0a55caafe description: [Sławomir Domagała] updated polish translation diffstat: po/pl.po | 647 +++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 319 insertions(+), 328 deletions(-) diffs (truncated from 1928 to 300 lines): diff -r 7781bf518cb4 -r 8ae0a55caafe po/pl.po --- a/po/pl.po Tue May 19 14:34:57 2009 +0200 +++ b/po/pl.po Tue May 19 15:27:33 2009 +0200 @@ -5,17 +5,12 @@ # Automatically generated, 2005. # # -#. app_name (string) -#. replaces_id (uint) -#. event_id (string) -#. app_icon (string) -#: ../src/notify.py:563 msgid "" msgstr "" "Project-Id-Version: gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-01 19:06+0200\n" -"PO-Revision-Date: 2009-04-25 17:11+0100\n" +"POT-Creation-Date: 2009-05-19 15:25+0200\n" +"PO-Revision-Date: 2009-05-15 14:38+0100\n" "Last-Translator: Sławomir Domagała <godlark(a)gmail.com>\n" "Language-Team: Polish <translation-team-pl(a)lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -281,9 +276,9 @@ #. No configured account #: ../data/glade/account_modification_window.glade.h:16 #: ../data/glade/accounts_window.glade.h:20 -#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1192 -#: ../src/common/helpers.py:1204 ../src/notify.py:559 ../src/notify.py:580 -#: ../src/notify.py:619 ../src/notify.py:631 +#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1233 +#: ../src/common/helpers.py:1245 ../src/notify.py:561 ../src/notify.py:582 +#: ../src/notify.py:621 ../src/notify.py:633 msgid "Gajim" msgstr "Gajim" @@ -353,8 +348,8 @@ msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze" #: ../data/glade/account_modification_window.glade.h:27 -#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1575 -#: ../src/config.py:2078 +#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1577 +#: ../src/config.py:2082 msgid "No key selected" msgstr "Nie wybrano żadnego klucza" @@ -365,10 +360,10 @@ #. self.on_useauth_checkbutton_toggled(useauth_checkbutton) #: ../data/glade/account_modification_window.glade.h:29 #: ../data/glade/accounts_window.glade.h:36 -#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1123 -#: ../src/config.py:1212 ../src/config.py:1480 ../src/config.py:1485 -#: ../src/config.py:1986 ../src/config.py:2064 ../src/config.py:2077 -#: ../src/config.py:3166 ../src/config.py:3234 ../src/dialogs.py:293 +#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1125 +#: ../src/config.py:1214 ../src/config.py:1482 ../src/config.py:1487 +#: ../src/config.py:1990 ../src/config.py:2068 ../src/config.py:2081 +#: ../src/config.py:3170 ../src/config.py:3238 ../src/dialogs.py:293 #: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511 #: ../src/roster_window.py:2754 ../src/roster_window.py:2760 #: ../src/roster_window.py:2765 @@ -450,7 +445,6 @@ #: ../data/glade/account_modification_window.glade.h:43 #: ../data/glade/accounts_window.glade.h:49 -#: ../data/glade/synchronise_contacts_dialog.glade.h:2 #: ../data/glade/synchronise_select_account_dialog.glade.h:2 msgid "Synchronise contacts" msgstr "Synchronizuj kontakty" @@ -1197,7 +1191,7 @@ "Kontakt\n" "Banner" -#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:761 +#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768 msgid "Bold" msgstr "Wytłuszczone" @@ -1221,7 +1215,7 @@ msgid "Inactive" msgstr "Nieaktywny" -#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:762 +#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769 msgid "Italic" msgstr "Kursywa" @@ -2681,10 +2675,6 @@ msgid "_Deny" msgstr "O_dmów" -#: ../data/glade/synchronise_contacts_dialog.glade.h:1 -msgid "Select the account with which to synchronise" -msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty" - #: ../data/glade/synchronise_select_account_dialog.glade.h:1 msgid "Select the account with which you want to synchronise" msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty" @@ -2894,7 +2884,7 @@ msgid "Text" msgstr "Tekst" -#: ../src/advanced.py:102 ../src/chat_control.py:781 +#: ../src/advanced.py:102 ../src/chat_control.py:788 msgid "Color" msgstr "Kolor" @@ -3024,84 +3014,83 @@ msgid "Chinese (Ch)" msgstr "chiński (Ch)" -#: ../src/chat_control.py:359 +#: ../src/chat_control.py:361 msgid "Spelling language" msgstr "Wybierz słownik" #. we are not connected -#: ../src/chat_control.py:382 ../src/chat_control.py:568 +#: ../src/chat_control.py:389 ../src/chat_control.py:575 msgid "A connection is not available" msgstr "Połączenie jest niemożliwe" -#: ../src/chat_control.py:383 ../src/chat_control.py:569 +#: ../src/chat_control.py:390 ../src/chat_control.py:576 msgid "Your message can not be sent until you are connected." msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony." -#: ../src/chat_control.py:763 +#: ../src/chat_control.py:770 msgid "Underline" msgstr "Podkreślenie" -#: ../src/chat_control.py:764 +#: ../src/chat_control.py:771 msgid "Strike" msgstr "Przekreślenie" -#: ../src/chat_control.py:787 +#: ../src/chat_control.py:794 msgid "Font" msgstr "Czcionka:" -#: ../src/chat_control.py:796 +#: ../src/chat_control.py:803 msgid "Clear formating" msgstr "Usuń formatowanie" -#: ../src/chat_control.py:868 +#: ../src/chat_control.py:875 msgid "Really send file?" msgstr "Na pewno wysłać ten plik?" -#: ../src/chat_control.py:869 +#: ../src/chat_control.py:876 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID." -#: ../src/chat_control.py:1255 ../src/chat_control.py:1644 +#: ../src/chat_control.py:1262 ../src/chat_control.py:1651 msgid "GPG encryption enabled" msgstr "Szyfrowanie GPG włączone" #. Add to roster #. add_to_roster_menuitem -#: ../src/chat_control.py:1285 ../src/chat_control.py:2146 +#: ../src/chat_control.py:1292 ../src/chat_control.py:2153 #: ../src/common/contacts.py:113 ../src/common/helpers.py:56 -#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862 +#: ../src/common/helpers.py:227 ../src/conversation_textview.py:878 #: ../src/dialogs.py:1005 ../src/dialogs.py:1729 ../src/dialogs.py:1754 -#: ../src/gajim.py:988 ../src/gajim.py:1721 ../src/normal_control.py:483 -#: ../src/roster_window.py:910 ../src/roster_window.py:1542 -#: ../src/roster_window.py:1544 ../src/roster_window.py:1890 -#: ../src/roster_window.py:3121 ../src/roster_window.py:3147 -#: ../src/roster_window.py:5327 ../src/roster_window.py:5512 +#: ../src/gajim.py:992 ../src/gajim.py:1725 ../src/roster_window.py:910 +#: ../src/roster_window.py:1542 ../src/roster_window.py:1544 +#: ../src/roster_window.py:1890 ../src/roster_window.py:3121 +#: ../src/roster_window.py:3147 ../src/roster_window.py:5327 +#: ../src/roster_window.py:5512 msgid "Not in Roster" msgstr "spoza listy kontaktów" -#: ../src/chat_control.py:1298 -#, fuzzy +#: ../src/chat_control.py:1305 msgid "This contact does not support file transfer." -msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików" - -#: ../src/chat_control.py:1301 +msgstr "Ten kontakt nie może przesyłać i odbierać plików." + +#: ../src/chat_control.py:1308 msgid "You need to know the real JID of the contact to send him or her a file." -msgstr "" - -#: ../src/chat_control.py:1408 ../src/tooltips.py:626 +msgstr "Ty musisz znać prawdziwy JID kontaktu, aby wysłać jej/jemu plik." + +#: ../src/chat_control.py:1415 ../src/tooltips.py:626 msgid "Unknown Artist" msgstr "Nieznany wykonawca" -#: ../src/chat_control.py:1410 ../src/tooltips.py:631 +#: ../src/chat_control.py:1417 ../src/tooltips.py:631 msgid "Unknown Title" msgstr "Nieznany tytuł" -#: ../src/chat_control.py:1412 ../src/tooltips.py:636 +#: ../src/chat_control.py:1419 ../src/tooltips.py:636 msgid "Unknown Source" msgstr "Nieznany album" -#: ../src/chat_control.py:1415 ../src/tooltips.py:638 +#: ../src/chat_control.py:1422 ../src/tooltips.py:638 #, python-format msgid "" "\"%(title)s\" by %(artist)s\n" @@ -3110,17 +3099,17 @@ "\"%(title)s\" w wykonaniu %(artist)s\n" "z %(source)s" -#: ../src/chat_control.py:1539 +#: ../src/chat_control.py:1546 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s z pokoju %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:1624 ../src/dialogs.py:4030 +#: ../src/chat_control.py:1631 ../src/dialogs.py:4033 msgid "No GPG key assigned" msgstr "Nie ma przypisanego klucza GPG" -#: ../src/chat_control.py:1625 +#: ../src/chat_control.py:1632 msgid "" "No GPG key is assigned to this contact. So you cannot encrypt messages with " "GPG." @@ -3128,50 +3117,50 @@ "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować " "wiadomości do tego kontaktu, używając GPG." -#: ../src/chat_control.py:1634 +#: ../src/chat_control.py:1641 msgid "GPG encryption disabled" msgstr "Szyfrowanie GPG wyłączone" -#: ../src/chat_control.py:1660 +#: ../src/chat_control.py:1667 msgid "Session WILL be logged" msgstr "Sesja BĘDZIE logowana" -#: ../src/chat_control.py:1662 +#: ../src/chat_control.py:1669 msgid "Session WILL NOT be logged" msgstr "Sesja NIE BĘDZIE logowana" #. encryption %s active -#: ../src/chat_control.py:1676 +#: ../src/chat_control.py:1683 msgid "is" msgstr "jest" -#: ../src/chat_control.py:1676 +#: ../src/chat_control.py:1683 msgid "is NOT" msgstr "NIE jest" #. chat session %s be logged -#: ../src/chat_control.py:1678 +#: ../src/chat_control.py:1685 msgid "will" msgstr "będzie" -#: ../src/chat_control.py:1678 +#: ../src/chat_control.py:1685 msgid "will NOT" msgstr "NIE będzie" #. About encrypted chat session -#: ../src/chat_control.py:1682 +#: ../src/chat_control.py:1689 msgid "and authenticated" msgstr "oraz autoryzowana" #. About encrypted chat session -#: ../src/chat_control.py:1686 +#: ../src/chat_control.py:1693 msgid "and NOT authenticated" msgstr "oraz NIE autoryzowana" #. 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:1692 +#: ../src/chat_control.py:1699 #, python-format

1 0

gajim: [egaz] prevent GTK Warning about color. Fixes #5035
by Yann Leboulanger 19 May '09

19 May '09

changeset 7781bf518cb4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7781bf518cb4 description: [egaz] prevent GTK Warning about color. Fixes #5035 diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b26f9971cfc -r 7781bf518cb4 src/config.py --- a/src/config.py Tue May 19 14:12:38 2009 +0200 +++ b/src/config.py Tue May 19 14:34:57 2009 +0200 @@ -381,7 +381,7 @@ # Default Status messages self.default_msg_tree = self.xml.get_widget('default_msg_treeview') - col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE] + col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string() # (status, translated_status, message, enabled) model = gtk.ListStore(str, str, str, bool) self.default_msg_tree.set_model(model)

1 0

gajim: prevent traceback when trying to print error message in a...
by Yann Leboulanger 19 May '09

19 May '09

changeset 2b26f9971cfc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b26f9971cfc description: prevent traceback when trying to print error message in a non existing message window. Fixes #5036 diffstat: src/gajim.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 72e11f979542 -r 2b26f9971cfc src/gajim.py --- a/src/gajim.py Mon May 18 22:33:09 2009 +0200 +++ b/src/gajim.py Tue May 19 14:12:38 2009 +0200 @@ -953,6 +953,10 @@ #('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) msg = _('error while sending %(message)s ( %(error)s )') % { 'message': array[2], 'error': array[1]} + if not array[4]: + # No session. This can happen when sending a message from gajim-remote + log.warn(msg) + return array[4].roster_message(array[0], msg, array[3], account, msg_type='error')

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2009