Commits October 2009

commits@gajim.org

6 participants
172 discussions

gajim: fix german translation
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 25f06ccd84b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25f06ccd84b7 description: fix german translation diffstat: po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 46f99f9ac8ec -r 25f06ccd84b7 po/de.po --- a/po/de.po Sat Oct 31 23:30:16 2009 +0100 +++ b/po/de.po Sat Oct 31 23:58:51 2009 +0100 @@ -4983,7 +4983,7 @@ #: ../src/common/fuzzyclock.py:45 #, python-format msgid "twenty five past %(0)s" -msgstr "fünf vor %(1)s" +msgstr "fünf vor halb %(1)s" #: ../src/common/fuzzyclock.py:46 #, python-format

1 0

gajim: replace all %d / %s things in SQL queries by ? for securi...
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset f169c518cd8d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f169c518cd8d description: replace all %d / %s things in SQL queries by ? for security reasons diffstat: src/common/logger.py | 81 ++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 41 deletions(-) diffs (185 lines): diff -r 680037f23ca5 -r f169c518cd8d src/common/logger.py --- a/src/common/logger.py Sat Oct 31 23:22:12 2009 +0100 +++ b/src/common/logger.py Sat Oct 31 23:57:14 2009 +0100 @@ -149,9 +149,12 @@ self.open_db() self.get_jids_already_in_db() - def simple_commit(self, sql_to_commit): + def simple_commit(self, sql_to_commit, values=None): '''helper to commit''' - self.cur.execute(sql_to_commit) + if values: + self.cur.execute(sql_to_commit, values) + else: + self.cur.execute(sql_to_commit) try: self.con.commit() except sqlite.OperationalError, e: @@ -383,21 +386,19 @@ def insert_unread_events(self, message_id, jid_id): ''' add unread message with id: message_id''' - sql = 'INSERT INTO unread_messages VALUES (%d, %d, 0)' % (message_id, - jid_id) - self.simple_commit(sql) + sql = 'INSERT INTO unread_messages VALUES (?, ?, 0)' + self.simple_commit(sql, values=(message_id, jid_id)) def set_read_messages(self, message_ids): ''' mark all messages with ids in message_ids as read''' ids = ','.join([str(i) for i in message_ids]) - sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids - self.simple_commit(sql) + sql = 'DELETE FROM unread_messages WHERE message_id IN (?)' + self.simple_commit(sql, values=(ids,)) def set_shown_unread_msgs(self, msg_id): ''' mark unread message as shown un GUI ''' - sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \ - msg_id - self.simple_commit(sql) + sql = 'UPDATE unread_messages SET shown = 1 where message_id = ?' + self.simple_commit(sql, values=(msg_id,)) def reset_shown_unread_messages(self): ''' Set shown field to False in unread_messages table ''' @@ -423,8 +424,8 @@ SELECT logs.log_line_id, logs.message, logs.time, logs.subject, jids.jid FROM logs, jids - WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id - ''' % msg_id + WHERE logs.log_line_id = ? AND logs.jid_id = jids.jid_id + ''', (msg_id,) ) results = self.cur.fetchall() if len(results) == 0: @@ -536,9 +537,9 @@ try: self.cur.execute(''' SELECT time, kind, message FROM logs - WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d - ORDER BY time DESC LIMIT %d OFFSET %d - ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, + WHERE (?) AND kind IN (?, ?, ?, ?, ?) AND time > ? + ORDER BY time DESC LIMIT ? OFFSET ? + ''', (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timed_out, restore_how_many_rows, pending_how_many) @@ -577,10 +578,10 @@ self.cur.execute(''' SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d + WHERE (?) + AND time BETWEEN ? AND ? ORDER BY time - ''' % (where_sql, start_of_day, last_second_of_day)) + ''', (where_sql, start_of_day, last_second_of_day)) results = self.cur.fetchall() return results @@ -607,9 +608,9 @@ like_sql = '%' + query.replace("'", "''") + '%' self.cur.execute(''' SELECT contact_name, time, kind, show, message, subject FROM logs - WHERE (%s) AND message LIKE '%s' + WHERE (?) AND message LIKE '?' ORDER BY time - ''' % (where_sql, like_sql)) + ''', (where_sql, like_sql)) results = self.cur.fetchall() return results @@ -635,11 +636,11 @@ # Now we have timestamps of time 0:00 of every day with logs self.cur.execute(''' SELECT DISTINCT time/(86400)*86400 FROM logs - WHERE (%s) - AND time BETWEEN %d AND %d - AND kind NOT IN (%d, %d) + WHERE (?) + AND time BETWEEN ? AND ? + AND kind NOT IN (?, ?) ORDER BY time - ''' % (where_sql, start_of_month, last_second_of_month, + ''', (where_sql, start_of_month, last_second_of_month, constants.KIND_STATUS, constants.KIND_GCSTATUS)) result = self.cur.fetchall() @@ -664,9 +665,9 @@ where_sql = 'jid_id = %s' % jid_id self.cur.execute(''' SELECT MAX(time) FROM logs - WHERE (%s) - AND kind NOT IN (%d, %d) - ''' % (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS)) + WHERE (?) + AND kind NOT IN (?, ?) + ''', (where_sql, constants.KIND_STATUS, constants.KIND_GCSTATUS)) results = self.cur.fetchone() if results is not None: @@ -686,8 +687,8 @@ where_sql = 'jid_id = %s' % jid_id self.cur.execute(''' SELECT time FROM rooms_last_message_time - WHERE (%s) - ''' % (where_sql)) + WHERE (?) + ''', (where_sql,)) results = self.cur.fetchone() if results is not None: @@ -701,9 +702,8 @@ we had logs for that room in rooms_last_message_time table''' jid_id = self.get_jid_id(jid, 'ROOM') # jid_id is unique in this table, create or update : - sql = 'REPLACE INTO rooms_last_message_time VALUES (%d, %d)' % \ - (jid_id, time) - self.simple_commit(sql) + sql = 'REPLACE INTO rooms_last_message_time VALUES (?, ?)' + self.simple_commit(sql, (jid_id, time)) def _build_contact_where(self, account, jid): '''build the where clause for a jid, including metacontacts @@ -733,18 +733,17 @@ # unknown type return self.cur.execute( - 'SELECT type from transports_cache WHERE transport = "%s"' % jid) + 'SELECT type from transports_cache WHERE transport = "?"', (jid,)) results = self.cur.fetchall() if results: result = results[0][0] if result == type_id: return - sql = 'UPDATE transports_cache SET type = %d WHERE transport = "%s"' %\ - (type_id, jid) - self.simple_commit(sql) + sql = 'UPDATE transports_cache SET type = ? WHERE transport = "?"' + self.simple_commit(sql, values=(type_id, jid)) return - sql = 'INSERT INTO transports_cache VALUES ("%s", %d)' % (jid, type_id) - self.simple_commit(sql) + sql = 'INSERT INTO transports_cache VALUES ("?", ?)' + self.simple_commit(sql, values=(jid, type_id)) def get_transports_type(self): '''return all the type of the transports in DB''' @@ -815,9 +814,9 @@ # yield the row yield hash_method, hash_, identities, features for hash_method, hash_ in to_be_removed: - sql = '''DELETE FROM caps_cache WHERE hash_method = "%s" AND - hash = "%s"''' % (hash_method, hash_) - self.simple_commit(sql) + sql = '''DELETE FROM caps_cache WHERE hash_method = "?" AND + hash = "?"''' + self.simple_commit(sql, values=(hash_method, hash_)) def add_caps_entry(self, hash_method, hash_, identities, features): data = []

1 0

gajim: better german translation for fuzzyclock
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 46f99f9ac8ec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=46f99f9ac8ec description: better german translation for fuzzyclock diffstat: po/de.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 7b5e9f72be40 -r 46f99f9ac8ec po/de.po --- a/po/de.po Sat Oct 31 22:51:13 2009 +0100 +++ b/po/de.po Sat Oct 31 23:30:16 2009 +0100 @@ -4983,12 +4983,12 @@ #: ../src/common/fuzzyclock.py:45 #, python-format msgid "twenty five past %(0)s" -msgstr "fünfundzwanzig nach %(0)s" +msgstr "fünf vor %(1)s" #: ../src/common/fuzzyclock.py:46 #, python-format msgid "half past %(0)s" -msgstr "dreißig nach %(0)s" +msgstr "halb %(1)s" #: ../src/common/fuzzyclock.py:46 #, python-format

1 0

gajim: ignore unknown show types when we receive strange stanza.
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 680037f23ca5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=680037f23ca5 description: ignore unknown show types when we receive strange stanza. diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2aeef7498c6d -r 680037f23ca5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Oct 31 22:57:14 2009 +0100 +++ b/src/common/connection_handlers.py Sat Oct 31 23:22:12 2009 +0100 @@ -2259,7 +2259,7 @@ is_gc = True status = prs.getStatus() or '' show = prs.getShow() - if not show in gajim.SHOW_LIST: + if show not in ('chat', 'away', 'xa', 'dnd'): show = '' # We ignore unknown show if not ptype and not show: show = 'online'

1 0

gajim: [Grigroy] align colors buttons. Fixes #5385
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 2aeef7498c6d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2aeef7498c6d description: [Grigroy] align colors buttons. Fixes #5385 diffstat: data/glade/preferences_window.glade | 52 ++++++++++++++++---------- 1 files changed, 32 insertions(+), 20 deletions(-) diffs (153 lines): diff -r b1e34857211d -r 2aeef7498c6d data/glade/preferences_window.glade --- a/data/glade/preferences_window.glade Sat Oct 31 19:35:46 2009 +0100 +++ b/data/glade/preferences_window.glade Sat Oct 31 22:57:14 2009 +0100 @@ -1709,6 +1709,8 @@ <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> </widget> <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -1747,6 +1749,8 @@ <signal name="color_set" handler="on_outgoing_msg_colorbutton_color_set"/> </widget> <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> @@ -1764,6 +1768,9 @@ <widget class="GtkHBox" id="hbox9"> <property name="visible">True</property> <child> + <placeholder/> + </child> + <child> <widget class="GtkColorButton" id="incoming_nick_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1773,17 +1780,16 @@ <signal name="color_set" handler="on_incoming_msg_colorbutton_color_set"/> </widget> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options"></property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1791,6 +1797,9 @@ <widget class="GtkHBox" id="hbox10"> <property name="visible">True</property> <child> + <placeholder/> + </child> + <child> <widget class="GtkColorButton" id="status_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1800,19 +1809,18 @@ <signal name="color_set" handler="on_status_msg_colorbutton_color_set"/> </widget> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1820,6 +1828,9 @@ <widget class="GtkHBox" id="hbox11"> <property name="visible">True</property> <child> + <placeholder/> + </child> + <child> <widget class="GtkColorButton" id="outgoing_nick_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1829,17 +1840,16 @@ <signal name="color_set" handler="on_outgoing_nick_colorbutton_color_set"/> </widget> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="x_options"></property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1847,6 +1857,9 @@ <widget class="GtkHBox" id="hbox12"> <property name="visible">True</property> <child> + <placeholder/> + </child> + <child> <widget class="GtkColorButton" id="url_msg_colorbutton"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -1856,19 +1869,18 @@ <signal name="color_set" handler="on_url_msg_colorbutton_color_set"/> </widget> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </widget> <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child>

1 0

gajim: updated Croatian translation
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 7b5e9f72be40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b5e9f72be40 description: updated Croatian translation diffstat: po/hr.po | 687 ++++++++++++++++++++++++++++++-------------------------------------- 1 files changed, 307 insertions(+), 380 deletions(-) diffs (truncated from 2053 to 300 lines): diff -r bbb472f0a482 -r 7b5e9f72be40 po/hr.po --- a/po/hr.po Sat Oct 31 19:13:07 2009 +0100 +++ b/po/hr.po Sat Oct 31 22:51:13 2009 +0100 @@ -1,17 +1,17 @@ -# Croatian translation for Gajim. -# Copyright (C) 2008 anrxc -# This file is distributed under the same license as the gajim package. -# Adrian C. <anrxc(a)sysphere.org>, 2008. -# Deni B. <baccic(a)gmail.com>, 2006. -# Armando V. <synan(a)rilinux.hr> 2006. -# Vedran M. <rivanvx(a)gmail.com> 2006. -# +# Croatian translation for Gajim. +# Copyright (C) 2008 anrxc +# This file is distributed under the same license as the gajim package. +# Adrian C. <anrxc(a)sysphere.org>, 2006-2009. +# Deni B. <baccic(a)gmail.com>, 2006. +# Armando V. <synan(a)rilinux.hr> 2006. +# Vedran M. <rivanvx(a)gmail.com> 2006. +# msgid "" msgstr "" "Project-Id-Version: gajim 0.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-28 22:17+0100\n" -"PO-Revision-Date: 2009-08-19 23:52+0200\n" +"POT-Creation-Date: 2009-10-30 19:59+0100\n" +"PO-Revision-Date: 2009-10-31 20:49+0100\n" "Last-Translator: Adrian C. <anrxc(a)sysphere.org>\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -96,7 +96,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "@" -msgstr "" +msgstr "@" #: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "" @@ -107,9 +107,8 @@ "SHA1 potpis certifikata:\n" #: ../data/glade/account_creation_wizard_window.glade.h:11 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Koristi autentifikaciju" +msgstr "Anon_imna autentifikacija" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" @@ -474,18 +473,16 @@ msgstr "Proxy" #: ../data/glade/accounts_window.glade.h:5 -#, fuzzy msgid "A_djust to status" -msgstr "_Uredi prema statusu" +msgstr "Ure_di prema statusu" #: ../data/glade/accounts_window.glade.h:7 msgid "Accounts" msgstr "Korisnički Račun" #: ../data/glade/accounts_window.glade.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "Koristi autentifikaciju" +msgstr "Anonimna autentifikacija" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -496,7 +493,6 @@ "nesigurne veze." #: ../data/glade/accounts_window.glade.h:17 -#, fuzzy msgid "Co_nnect on Gajim startup" msgstr "Sp_oji se prilikom pokretanja Gajima" @@ -545,63 +541,52 @@ msgstr "Pre_imenuj" #: ../data/glade/accounts_window.glade.h:47 -#, fuzzy msgid "Send _keep-alive packets" -msgstr "Šalji keep-alive pakete" +msgstr "Šalji _keep-alive pakete" #: ../data/glade/accounts_window.glade.h:49 -#, fuzzy msgid "Synchroni_ze account status with global status" -msgstr "Sink_roniziraj status računa sa globalnim statusom" +msgstr "Sinkroni_ziraj status računa sa globalnim statusom" #: ../data/glade/accounts_window.glade.h:51 -#, fuzzy msgid "Use G_PG Agent" -msgstr "Koristi GPG _Agent" +msgstr "Koristi G_PG Agent" #: ../data/glade/accounts_window.glade.h:52 -#, fuzzy msgid "Use cust_om hostname/port" -msgstr "Koristi vlastito ime poslužitelja/port" +msgstr "Koristi vlastit_o ime poslužitelja/port" #: ../data/glade/accounts_window.glade.h:53 -#, fuzzy msgid "Use cust_om port:" -msgstr "Koristi vlastiti port:" +msgstr "Koristi vlas_titi port:" #: ../data/glade/accounts_window.glade.h:55 -#, fuzzy msgid "_Edit Personal Information..." -msgstr "Izmjeni Osobne Informacije" +msgstr "_Izmjeni Osobne Informacije..." #: ../data/glade/accounts_window.glade.h:56 -#, fuzzy msgid "_Enable" -msgstr "Omogući" +msgstr "_Omogući" #: ../data/glade/accounts_window.glade.h:57 -#, fuzzy msgid "_Hostname: " msgstr "_Ime poslužitelja:" #: ../data/glade/accounts_window.glade.h:59 -#, fuzzy msgid "_Manage..." -msgstr "Uredi..." +msgstr "_Uredi..." #: ../data/glade/accounts_window.glade.h:61 -#, fuzzy msgid "_Port: " -msgstr "_Port:" +msgstr "_Port: " #: ../data/glade/accounts_window.glade.h:62 msgid "_Warn before using an insecure connection" msgstr "_Upozori prije korištenja nesigurne veze" #: ../data/glade/accounts_window.glade.h:63 -#, fuzzy msgid "_use HTTP__PROXY environment variable" -msgstr "koristi HTTP_PROXY varijablu okruženja" +msgstr "_koristi HTTP__PROXY varijablu okruženja" #: ../data/glade/accounts_window.glade.h:64 msgid "gtk-add" @@ -787,7 +772,7 @@ #: ../data/glade/advanced_notifications_window.glade.h:4 #: ../data/glade/preferences_window.glade.h:15 msgid "Sounds" -msgstr "Zvukovi" +msgstr "Zvuci" #: ../data/glade/advanced_notifications_window.glade.h:5 msgid "Advanced Actions" @@ -1077,9 +1062,8 @@ msgstr "Pridruži Open_PGP Ključ..." #: ../data/glade/contact_context_menu.glade.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Izvrši Naredbu..." +msgstr "I_zvrši Naredbu..." #: ../data/glade/contact_context_menu.glade.h:5 msgid "Edit _Groups..." @@ -1511,9 +1495,8 @@ msgstr "_Pamti povijest razgovora" #: ../data/glade/join_groupchat_window.glade.h:2 -#, fuzzy msgid "Bookmark this room" -msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)" +msgstr "Postavi knjižnu oznaku za sobu" #: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972 msgid "Join Group Chat" @@ -1601,14 +1584,14 @@ msgstr "Postavke" #: ../data/glade/manage_proxies_window.glade.h:3 -#, fuzzy msgid "" "HTTP Connect\n" "SOCKS5\n" "BOSH" msgstr "" "HTTP Spoj\n" -"SOCKS5" +"SOCKS5\n" +"BOSH" #: ../data/glade/manage_proxies_window.glade.h:6 msgid "Manage Proxy Profiles" @@ -1619,34 +1602,28 @@ msgstr "Lo_zinka:" #: ../data/glade/manage_proxies_window.glade.h:8 -#, fuzzy msgid "Proxy _Host:" -msgstr "Proxy:" +msgstr "Proxy _Računalo:" #: ../data/glade/manage_proxies_window.glade.h:9 -#, fuzzy msgid "Proxy _Port:" -msgstr "_Port:" +msgstr "Proxy _Port:" #: ../data/glade/manage_proxies_window.glade.h:10 -#, fuzzy msgid "Use HTTP prox_y" -msgstr "_Koristi proxy" +msgstr "Koristi HTTP prox_y" #: ../data/glade/manage_proxies_window.glade.h:11 -#, fuzzy msgid "Use proxy auth_entication" -msgstr "Koristi autentifikaciju" +msgstr "Koristi proxy aut_entifikaciju" #: ../data/glade/manage_proxies_window.glade.h:12 -#, fuzzy msgid "_BOSH URL:" -msgstr "_URL:" +msgstr "_BOSH URL:" #: ../data/glade/manage_proxies_window.glade.h:14 -#, fuzzy msgid "_Type:" -msgstr "Vrsta:" +msgstr "_Vrsta:" #: ../data/glade/manage_proxies_window.glade.h:15 msgid "_Username:" @@ -1685,9 +1662,8 @@ msgstr "Prikaži popis emoticona (Alt+M)" #: ../data/glade/message_window.glade.h:9 -#, fuzzy msgid "Show a list of formattings" -msgstr "Prikaži popis emoticona (Alt+M)" +msgstr "Prikaži popis formata" #: ../data/glade/message_window.glade.h:10 msgid "Show a menu of advanced functions (Alt+A)" @@ -1797,7 +1773,7 @@ #: ../data/glade/preferences_window.glade.h:26 msgid "Allow sound when I'm _busy" -msgstr "" +msgstr "Dozvoli zvuk kada sam _zauzet" #: ../data/glade/preferences_window.glade.h:27 msgid "Ask status message when I:" @@ -2043,6 +2019,9 @@ "Only when pending events\n" "Always" msgstr "" +"Nikad\n" +"Samo kod događaja na čekanju\n" +"Uvijek" #: ../data/glade/preferences_window.glade.h:74 msgid "Notifications" @@ -2083,9 +2062,8 @@ msgstr "Postavke" #: ../data/glade/preferences_window.glade.h:84 -#, fuzzy msgid "Show systray:" -msgstr "_Prikaži događaj u traci radne površine" +msgstr "Prikaži ikonu u traci radne površine:" #: ../data/glade/preferences_window.glade.h:85 msgid "Sign _in" @@ -2124,7 +2102,6 @@ msgstr "_Tema:" #: ../data/glade/preferences_window.glade.h:93 -#, fuzzy msgid "" "The auto away status message. If empty, Gajim will not change the current " "status message\n" @@ -2132,10 +2109,11 @@ "$T will be replaced by auto-away timeout" msgstr "" "Statusna poruka kod automatske odsutnosti. Ukoliko je prazno Gajim neće " -"promjeniti trenutnu statusnu poruku" +"promjeniti trenutnu statusnu poruku\n" +"$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away " +"vremenskim ograničenjem"

1 0

gajim: [Mattj] improve join groupchat behaviour. Fixes #5383
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset b1e34857211d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b1e34857211d description: [Mattj] improve join groupchat behaviour. Fixes #5383 diffstat: src/conversation_textview.py | 2 +- src/dialogs.py | 38 ++++++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 17 deletions(-) diffs (67 lines): diff -r d5afbd93ca80 -r b1e34857211d src/conversation_textview.py --- a/src/conversation_textview.py Sat Oct 31 19:15:18 2009 +0100 +++ b/src/conversation_textview.py Sat Oct 31 19:35:46 2009 +0100 @@ -853,7 +853,7 @@ gajim.interface.instances[self.account]['join_gc'].window.present() else: try: - dialogs.JoinGroupchatWindow(account=None, room_jid=room_jid) + dialogs.JoinGroupchatWindow(account=self.account, room_jid=room_jid) except GajimGeneralException: pass diff -r d5afbd93ca80 -r b1e34857211d src/dialogs.py --- a/src/dialogs.py Sat Oct 31 19:15:18 2009 +0100 +++ b/src/dialogs.py Sat Oct 31 19:35:46 2009 +0100 @@ -1922,7 +1922,7 @@ '''automatic is a dict like {'invities': []} If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited''' - self.xml = gtkgui_helpers.get_glade('join_groupchat_window.glade') + if account: if room_jid != '' and room_jid in gajim.gc_connected[account] and\ gajim.gc_connected[account][room_jid]: @@ -1934,21 +1934,27 @@ ErrorDialog(_('You are not connected to the server'), _('You can not join a group chat unless you are connected.')) raise GajimGeneralException, 'You must be connected to join a groupchat' - else: - account_label = self.xml.get_widget('account_label') - account_combobox = self.xml.get_widget('account_combobox') - account_label.set_no_show_all(False) - account_combobox.set_no_show_all(False) - liststore = gtk.ListStore(str) - account_combobox.set_model(liststore) - cell = gtk.CellRendererText() - account_combobox.pack_start(cell, True) - account_combobox.add_attribute(cell, 'text', 0) - for acct in [a for a in gajim.connections if \ - gajim.account_is_connected(a)]: - account_combobox.append_text(acct) - account_combobox.set_active(-1) - + + self.xml = gtkgui_helpers.get_glade('join_groupchat_window.glade') + + account_label = self.xml.get_widget('account_label') + account_combobox = self.xml.get_widget('account_combobox') + account_label.set_no_show_all(False) + account_combobox.set_no_show_all(False) + liststore = gtk.ListStore(str) + account_combobox.set_model(liststore) + cell = gtk.CellRendererText() + account_combobox.pack_start(cell, True) + account_combobox.add_attribute(cell, 'text', 0) + account_combobox.set_active(-1) + + # Add accounts, set current as active if it matches 'account' + for acct in [a for a in gajim.connections if \ + gajim.account_is_connected(a)]: + account_combobox.append_text(acct) + if account and account == acct: + account_combobox.set_active(liststore.iter_n_children(None)-1) + self.account = account self.automatic = automatic self._empty_required_widgets = []

1 0

gajim: fix typo in a string
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset d5afbd93ca80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d5afbd93ca80 description: fix typo in a string diffstat: src/gajim.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 54cea0cea7c5 -r d5afbd93ca80 src/gajim.py --- a/src/gajim.py Sat Oct 31 19:03:03 2009 +0100 +++ b/src/gajim.py Sat Oct 31 19:15:18 2009 +0100 @@ -454,8 +454,8 @@ return elif result == 'expired': dialogs.ErrorDialog(_('GPG key expired'), - _('Your GPG key has expied, you will be connected to %s without ' - 'OpenPGP.') % account) + _('Your GPG key has expired, you will be connected to %s without' + ' OpenPGP.') % account) # Don't try to connect with GPG gajim.connections[account].continue_connect_info[2] = False self.complete(None)

1 0

gajim: updated german translation
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset bbb472f0a482 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bbb472f0a482 description: updated german translation diffstat: po/de.po | 541 ++++++++++++++++++++++++++++++++----------------------------------- 1 files changed, 258 insertions(+), 283 deletions(-) diffs (truncated from 1554 to 300 lines): diff -r 1cfbaf5d1844 -r bbb472f0a482 po/de.po --- a/po/de.po Fri Oct 30 20:01:36 2009 +0100 +++ b/po/de.po Sat Oct 31 19:13:07 2009 +0100 @@ -9,10 +9,10 @@ # Niklas Hambüchen <nh2(a)deditus.de>, 2009. msgid "" msgstr "" -"Project-Id-Version: gajim 0.12\n" +"Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-28 22:17+0100\n" -"PO-Revision-Date: 2009-08-19 23:38+0200\n" +"POT-Creation-Date: 2009-10-30 19:59+0100\n" +"PO-Revision-Date: 2009-10-31 17:57+0100\n" "Last-Translator: Nico Gulden <cilugnedon(a)gmx.de>\n" "Language-Team: German <translators(a)gajim.org>\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ #: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "@" -msgstr "" +msgstr "@" #: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "" @@ -108,9 +108,8 @@ "SHA1-Fingerprint dieses Zertifikates:\n" #: ../data/glade/account_creation_wizard_window.glade.h:11 -#, fuzzy msgid "Anon_ymous authentication" -msgstr "Authentifizierung _verwenden" +msgstr "Anon_yme Authentifizierung" #: ../data/glade/account_creation_wizard_window.glade.h:12 msgid "Connect when I press Finish" @@ -488,9 +487,8 @@ msgstr "Konten" #: ../data/glade/accounts_window.glade.h:9 -#, fuzzy msgid "Anonymous authentication" -msgstr "Authentifizierung _verwenden" +msgstr "Anonyme Authentifizierung" #: ../data/glade/accounts_window.glade.h:13 msgid "" @@ -628,7 +626,7 @@ #: ../data/glade/add_new_contact_window.glade.h:4 msgid "I would like to add you to my contact list." -msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen." +msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen." #: ../data/glade/add_new_contact_window.glade.h:5 msgid "" @@ -1076,9 +1074,8 @@ msgstr "Open_PGP-Schlüssel zuweisen …" #: ../data/glade/contact_context_menu.glade.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Befehl ausführen …" +msgstr "B_efehl ausführen …" #: ../data/glade/contact_context_menu.glade.h:5 msgid "Edit _Groups..." @@ -1517,9 +1514,8 @@ # TODO: Synchronize with other strings concerning bookmarks #: ../data/glade/join_groupchat_window.glade.h:2 -#, fuzzy msgid "Bookmark this room" -msgstr "Diesen Chatraum speichern (Strg+B)" +msgstr "Diesen Chatraum merken (Strg+B)" #: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972 msgid "Join Group Chat" @@ -2292,9 +2288,8 @@ msgstr "allen" #: ../data/glade/privacy_list_window.glade.h:7 -#, fuzzy msgid "All (including subscription)" -msgstr "Kontakten, die:" +msgstr "Alle (Abonnement eingeschlossen)" #: ../data/glade/privacy_list_window.glade.h:8 msgid "Allow" @@ -2457,7 +2452,7 @@ msgstr "Namenspräfix:" #: ../data/glade/profile_window.glade.h:25 -#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327 +#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:325 msgid "Role:" msgstr "Rolle:" @@ -2527,24 +2522,26 @@ "someone(a)somewhere.com would like you to add some contacts in " "your roster." msgstr "" +"jemand(a)irgendwo.de möchte Sie als Kontakt zu seiner Kontaktliste " +"hinzufügen." #: ../data/glade/roster_item_exchange_window.glade.h:2 msgid "Message Body <currently unused, so it's hidden by default>" msgstr "" +"Nachrichtenkörper <gegenwärtig unbenutzt, so dass er standardmäßig versteckt " +"wird>" #: ../data/glade/roster_item_exchange_window.glade.h:3 msgid "Roster Item Exchange" -msgstr "" +msgstr "Austausch der Kontaktlistenelemente" #: ../data/glade/roster_item_exchange_window.glade.h:4 -#, fuzzy msgid "gtk-cancel" -msgstr "gtk-close" +msgstr "gtk-cancel" #: ../data/glade/roster_item_exchange_window.glade.h:5 -#, fuzzy msgid "gtk-ok" -msgstr "gtk-close" +msgstr "gtk-ok" #: ../data/glade/roster_window.glade.h:1 msgid "Add _Contact..." @@ -2946,9 +2943,10 @@ msgstr "Versteckt" #: ../src/atom_window.py:110 -#, fuzzy, python-format +#, python-format msgid "You have received new entries (and %(count)d not displayed):" -msgstr "Sie haben einen neuen Eintrag erhalten:" +msgstr "" +"Sie haben neue Einträge erhalten (und %(count)d werden nicht angezeigt):" #. the next script, executed in the "po" directory, #. generates the following list. @@ -3096,45 +3094,45 @@ "kennen." # TODO: GPG/PGP unification in original strings needed -#: ../src/chat_control.py:1317 ../src/chat_control.py:1718 +#: ../src/chat_control.py:1316 ../src/chat_control.py:1713 msgid "GPG encryption enabled" msgstr "GPG-Verschlüsselung aktiviert" #. Add to roster -#: ../src/chat_control.py:1346 ../src/common/contacts.py:113 +#: ../src/chat_control.py:1343 ../src/common/contacts.py:113 #: ../src/common/helpers.py:55 ../src/common/helpers.py:231 #: ../src/conversation_textview.py:903 ../src/dialogs.py:1031 #: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999 -#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243 -#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988 +#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:249 +#: ../src/gui_menu_builder.py:395 ../src/roster_window.py:988 #: ../src/roster_window.py:1622 ../src/roster_window.py:1624 #: ../src/roster_window.py:1926 ../src/roster_window.py:3187 #: ../src/roster_window.py:3213 msgid "Not in Roster" msgstr "Nicht in der Kontaktliste" +#: ../src/chat_control.py:1356 +msgid "This contact does not support file transfer." +msgstr "Der Kontakt unterstützt keine Dateiübertragung." + #: ../src/chat_control.py:1359 -#, fuzzy -msgid "This contact does not support file transfer." -msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen" - -#: ../src/chat_control.py:1362 msgid "You need to know the real JID of the contact to send him or her a file." msgstr "" - -#: ../src/chat_control.py:1469 ../src/tooltips.py:626 +"Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden." + +#: ../src/chat_control.py:1466 ../src/tooltips.py:626 msgid "Unknown Artist" msgstr "Unbekannter Künstler" -#: ../src/chat_control.py:1471 ../src/tooltips.py:631 +#: ../src/chat_control.py:1468 ../src/tooltips.py:631 msgid "Unknown Title" msgstr "Unbekannter Titel" -#: ../src/chat_control.py:1473 ../src/tooltips.py:636 +#: ../src/chat_control.py:1470 ../src/tooltips.py:636 msgid "Unknown Source" msgstr "Unbekannte Quelle" -#: ../src/chat_control.py:1476 ../src/tooltips.py:638 +#: ../src/chat_control.py:1473 ../src/tooltips.py:638 #, python-format msgid "" "\"%(title)s\" by %(artist)s\n" @@ -3143,19 +3141,19 @@ "\"%(title)s\" von %(artist)s\n" "aus %(source)s" -#: ../src/chat_control.py:1613 +#: ../src/chat_control.py:1609 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s aus dem Chatraum %(room_name)s" # TODO: GPG/PGP unification in original strings needed #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:1698 ../src/dialogs.py:4484 +#: ../src/chat_control.py:1693 ../src/dialogs.py:4484 msgid "No GPG key assigned" msgstr "Kein GPG-Schlüssel zugewiesen" # TODO: GPG/PGP unification in original strings needed -#: ../src/chat_control.py:1699 +#: ../src/chat_control.py:1694 msgid "" "No GPG key is assigned to this contact. So you cannot encrypt messages with " "GPG." @@ -3164,50 +3162,50 @@ "GPG verschlüsselt werden." # TODO: GPG/PGP unification in original strings needed -#: ../src/chat_control.py:1708 +#: ../src/chat_control.py:1703 msgid "GPG encryption disabled" msgstr "GPG-Verschlüsselung deaktiviert" -#: ../src/chat_control.py:1734 +#: ../src/chat_control.py:1729 msgid "Session WILL be logged" msgstr "Sitzung WIRD aufgezeichnet" -#: ../src/chat_control.py:1736 +#: ../src/chat_control.py:1731 msgid "Session WILL NOT be logged" msgstr "Sitzung WIRD NICHT aufgezeichnet" #. encryption %s active -#: ../src/chat_control.py:1750 +#: ../src/chat_control.py:1745 msgid "is" msgstr "ist" -#: ../src/chat_control.py:1750 +#: ../src/chat_control.py:1745 msgid "is NOT" msgstr "ist NICHT" #. chat session %s be logged -#: ../src/chat_control.py:1752 +#: ../src/chat_control.py:1747 msgid "will" msgstr "wird" -#: ../src/chat_control.py:1752 +#: ../src/chat_control.py:1747 msgid "will NOT" msgstr "wird NICHT" #. About encrypted chat session -#: ../src/chat_control.py:1756 +#: ../src/chat_control.py:1751 msgid "and authenticated" msgstr "und authentifiziert" #. About encrypted chat session -#: ../src/chat_control.py:1760 +#: ../src/chat_control.py:1755 msgid "and NOT authenticated" msgstr "und NICHT authentifiziert" #. 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:1766 +#: ../src/chat_control.py:1761 #, python-format msgid "" "%(type)s encryption %(status)s active %(authenticated)s.\n" @@ -3216,23 +3214,23 @@ "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n" "Ihre Chatsitzung %(logged)s mitgeschrieben." -#: ../src/chat_control.py:1906 +#: ../src/chat_control.py:1901 msgid "Session negotiation cancelled" msgstr "Sitzungsaushandlung abgebrochen" -#: ../src/chat_control.py:1913 +#: ../src/chat_control.py:1908 msgid "This session is encrypted"

1 0

gajim: ability to configure out/inmsgtxt color in preference win...
by Yann Leboulanger 31 Oct '09

31 Oct '09

changeset 54cea0cea7c5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=54cea0cea7c5 description: ability to configure out/inmsgtxt color in preference window. Fixes #5372 diffstat: data/glade/preferences_window.glade | 593 ++++++++++++++++++++++++++------------- src/config.py | 100 ++++-- src/dialogs.py | 6 +- src/gajim.py | 2 + 4 files changed, 466 insertions(+), 235 deletions(-) diffs (truncated from 1577 to 300 lines): diff -r 200870540a1f -r 54cea0cea7c5 data/glade/preferences_window.glade --- a/data/glade/preferences_window.glade Sat Oct 31 18:08:06 2009 +0100 +++ b/data/glade/preferences_window.glade Sat Oct 31 19:03:03 2009 +0100 @@ -1,13 +1,13 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - +<?xml version="1.0"?> <glade-interface> +  +  <widget class="GtkWindow" id="preferences_window"> <property name="border_width">6</property> <property name="title" translatable="yes">Preferences</property> <property name="role">preferences</property> + <signal name="destroy" handler="on_preferences_window_destroy"/> <signal name="key_press_event" handler="on_preferences_window_key_press_event"/> - <signal name="destroy" handler="on_preferences_window_destroy"/> <child> <widget class="GtkVBox" id="vbox13"> <property name="visible">True</property> @@ -27,7 +27,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment1"> <property name="visible">True</property> @@ -41,28 +41,29 @@ <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="show_avatars_in_roster_checkbutton"> + <property name="label" translatable="yes">Display a_vatars of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will display avatars of contacts in roster window and in group chats</property> - <property name="label" translatable="yes">Display a_vatars of contacts in roster</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_avatars_in_roster_checkbutton_toggled"/> </widget> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> <widget class="GtkCheckButton" id="show_status_msgs_in_roster_checkbutton"> + <property name="label" translatable="yes">Display status _messages of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats</property> - <property name="label" translatable="yes">Display status _messages of contacts in roster</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_status_msgs_in_roster_checkbutton_toggled"/> </widget> @@ -74,12 +75,12 @@ </child> <child> <widget class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> + <property name="label" translatable="yes">Display m_ood of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will display the mood of contacts in the roster window</property> - <property name="label" translatable="yes">Display m_ood of contacts in roster</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> </widget> @@ -91,12 +92,12 @@ </child> <child> <widget class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> + <property name="label" translatable="yes">Display _activity of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> - <property name="label" translatable="yes">Display _activity of contacts in roster</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> </widget> @@ -108,12 +109,12 @@ </child> <child> <widget class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> + <property name="label" translatable="yes">Display _tunes of contacts in roster</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> - <property name="label" translatable="yes">Display _tunes of contacts in roster</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> </widget> @@ -134,15 +135,16 @@ </widget> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> <widget class="GtkCheckButton" id="sort_by_show_in_roster_checkbutton"> + <property name="label" translatable="yes">in _roster</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">in _roster</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sort_by_show_in_roster_checkbutton_toggled"/> </widget> @@ -153,11 +155,11 @@ </child> <child> <widget class="GtkCheckButton" id="sort_by_show_in_muc_checkbutton"> + <property name="label" translatable="yes">in _group chats</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">in _group chats</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_sort_by_show_in_muc_checkbutton_toggled"/> </widget> @@ -188,6 +190,7 @@ </widget> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -195,7 +198,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment2"> <property name="visible">True</property> @@ -255,11 +258,11 @@ </child> <child> <widget class="GtkCheckButton" id="compact_view_checkbutton"> + <property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">Hide all buttons in chat windows</property> - <property name="label" translatable="yes">Ma_ke message windows compact</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_compact_view_checkbutton_toggled"/> </widget> @@ -272,12 +275,12 @@ </child> <child> <widget class="GtkCheckButton" id="xhtml_checkbutton"> + <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text.</property> - <property name="label" translatable="yes">_Ignore rich content in incoming messages</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_xhtml_checkbutton_toggled"/> </widget> @@ -290,11 +293,11 @@ </child> <child> <widget class="GtkCheckButton" id="speller_checkbutton"> + <property name="label" translatable="yes">_Highlight misspelled words</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will highlight spelling errors in input fields of chat windows. If no language is explicitly set via right click on the input field, the default language will be used for this contact or group chat.</property> - <property name="label" translatable="yes">_Highlight misspelled words</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_speller_checkbutton_toggled"/> </widget> @@ -352,8 +355,8 @@ <property name="label" translatable="yes">General</property> </widget> <packing> + <property name="tab_fill">False</property> <property name="type">tab</property> - <property name="tab_fill">False</property> </packing> </child> <child> @@ -365,7 +368,7 @@ <widget class="GtkFrame" id="frame29"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment58"> <property name="visible">True</property> @@ -389,6 +392,7 @@ </widget> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -405,15 +409,18 @@ </packing> </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> <child> <widget class="GtkCheckButton" id="notify_on_signin_checkbutton"> + <property name="label" translatable="yes">Notify me about contacts that sign _in</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Notify me about contacts that sign _in</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_on_signin_checkbutton_toggled"/> </widget> @@ -423,12 +430,12 @@ </child> <child> <widget class="GtkCheckButton" id="notify_on_signout_checkbutton"> + <property name="label" translatable="yes">Notify me about contacts that sign _out</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out</property> - <property name="label" translatable="yes">Notify me about contacts that sign _out</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_notify_on_signout_checkbutton_toggled"/> </widget> @@ -440,11 +447,11 @@ </child> <child> <widget class="GtkCheckButton" id="auto_popup_away_checkbutton"> + <property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">Allow popup/notifications when I'm _away/na/busy/invisible</property> + <property name="receives_default">False</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_auto_popup_away_checkbutton_toggled"/> </widget> @@ -460,7 +467,7 @@ <property name="sensitive">False</property> <property name="no_show_all">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> <widget class="GtkAlignment" id="alignment_gmail"> <property name="visible">True</property> @@ -471,28 +478,29 @@ <property name="spacing">6</property> <child> <widget class="GtkCheckButton" id="notify_gmail_checkbutton"> + <property name="label" translatable="yes">Notify on new _GMail email</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="tooltip" translatable="yes">If checked, Gajim will show a notification when a new e-mail is received via GMail</property> - <property name="label" translatable="yes">Notify on new _GMail email</property> <property name="use_underline">True</property> - <property name="response_id">0</property>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2009