Commits

commits@gajim.org

17632 discussions

gajim: make error diaogs in accounts window transient for ccount...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset aa4412950028 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=aa4412950028 description: make error diaogs in accounts window transient for ccounts window. See #7185 diffstat: src/config.py | 43 ++++++++++++++++++++++++++----------------- src/dialogs.py | 6 ++++-- 2 files changed, 30 insertions(+), 19 deletions(-) diffs (166 lines): diff -r ac9c8fffc491 -r aa4412950028 src/config.py --- a/src/config.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/config.py Thu Aug 15 15:11:51 2013 +0200 @@ -2011,7 +2011,8 @@ account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), - _('Read all pending events before removing this account.')) + _('Read all pending events before removing this account.'), + transient_for=self.window) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): @@ -2054,27 +2055,30 @@ if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) + _('To change the account name, you must be disconnected.'), + transient_for=self.window) return if len(gajim.events.get_events(self.current_account)): dialogs.ErrorDialog(_('Unread events'), _('To change the account name, you must read all pending ' - 'events.')) + 'events.'), transient_for=self.window) return # Get the new name def on_renamed(new_name, old_name): if new_name in gajim.connections: dialogs.ErrorDialog(_('Account Name Already Used'), _('This name is already used by another of your accounts. ' - 'Please choose another name.')) + 'Please choose another name.'), transient_for=self.window) return if (new_name == ''): dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot be empty.')) + _('Account name cannot be empty.'), + transient_for=self.window) return if new_name.find(' ') != -1: dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot contain spaces.')) + _('Account name cannot contain spaces.'), + transient_for=self.window) return if active: # update variables @@ -2174,7 +2178,7 @@ except helpers.InvalidFormat as s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2185,7 +2189,7 @@ pritext = _('Invalid Jabber ID') sectext = \ _('A Jabber ID must be in the form "user@servername".') - dialogs.ErrorDialog(pritext, sectext) + dialogs.ErrorDialog(pritext, sectext, transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2251,7 +2255,7 @@ except helpers.InvalidFormat as s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2409,7 +2413,8 @@ except Exception: if not widget.is_focus(): dialogs.ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) + _('Custom port must be a port number.'), + transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True if self.option_changed('custom_port', custom_port): @@ -2431,7 +2436,8 @@ secret_keys = [] if not secret_keys: dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There is no OpenPGP secret key available.')) + _('There is no OpenPGP secret key available.'), + transient_for=self.window) secret_keys[_('None')] = _('None') def on_key_selected(keyID): @@ -2446,7 +2452,7 @@ gpg_name_label = self.xml.get_object('gpg_name_label' + \ wiget_name_ext) use_gpg_agent_checkbutton = self.xml.get_object( - 'use_gpg_agent_checkbutton' + wiget_name_ext) + 'use_gpg_agent_checkbutton' + wiget_name_ext) if keyID[0] == _('None'): gpg_key_label.set_text(_('No key selected')) gpg_name_label.set_text('') @@ -2479,7 +2485,7 @@ if self.current_account not in gajim.interface.instances: dlg = dialogs.ErrorDialog(_('No such account available'), _('You must create your account before editing your personal ' - 'information.')) + 'information.'), transient_for=self.window) return # show error dialog if account is newly created (not in gajim.connections) @@ -2487,12 +2493,13 @@ gajim.connections[self.current_account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not edit your personal ' - 'information.')) + 'information.'), transient_for=self.window) return if not gajim.connections[self.current_account].vcard_supported: dialogs.ErrorDialog(_("Your server doesn't support vCard"), - _("Your server can't save your personal information.")) + _("Your server can't save your personal information."), + transient_for=self.window) return jid = gajim.get_jid_from_account(self.current_account) @@ -2608,7 +2615,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return if gajim.ZEROCONF_ACC_NAME in gajim.connections and not \ gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf: @@ -2645,7 +2653,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return # add/remove account in roster and all variables if widget.get_active(): diff -r ac9c8fffc491 -r aa4412950028 src/dialogs.py --- a/src/dialogs.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 @@ -1628,8 +1628,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + on_response_cancel=None, transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None

1 0

gajim: make very E2E code transient for the calling window. See ...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5cddd914a01a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5cddd914a01a description: make very E2E code transient for the calling window. See #7185 diffstat: src/dialogs.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (29 lines): diff -r aa4412950028 -r 5cddd914a01a src/dialogs.py --- a/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 19:45:34 2013 +0200 @@ -1646,10 +1646,13 @@ """ def __init__(self, pritext, sectext='', checktext='', text_label=None, - on_response_yes=None, on_response_no=None, type_=Gtk.MessageType.QUESTION): + on_response_yes=None, on_response_no=None, type_=Gtk.MessageType.QUESTION, + transient_for=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -5195,7 +5198,8 @@ self.session.verified_identity = False self.update_info() - YesNoDialog(pritext, sectext, on_response_yes=on_yes, on_response_no=on_no) + YesNoDialog(pritext, sectext, on_response_yes=on_yes, + on_response_no=on_no, transient_for=self.window) class GPGInfoWindow: """

1 0

gajim: add translator notes. Fixes #7427
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset cc08ebd15953 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cc08ebd15953 description: add translator notes. Fixes #7427 diffstat: src/command_system/implementation/standard.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (27 lines): diff -r 66fa208e84c7 -r cc08ebd15953 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Aug 16 09:52:33 2013 +0200 +++ b/src/command_system/implementation/standard.py Wed Aug 14 14:56:15 2013 +0200 @@ -126,6 +126,7 @@ self.echo(formatted) @command(raw=True, empty=True) + #Do not translate online, away, chat, xa, dnd @doc(_(""" Set the current status @@ -353,6 +354,7 @@ self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) @command(raw=True) + #Do not translate moderator, participant, visitor, none @doc(_("""Set occupant role in group chat. Role can be given as one of the following values: moderator, participant, visitor, none""")) @@ -364,6 +366,7 @@ self.connection.gc_set_role(self.room_jid, who, role) @command(raw=True) + #Do not translate owner, admin, member, outcast, none @doc(_("""Set occupant affiliation in group chat. Affiliation can be given as one of the following values: owner, admin, member, outcast, none"""))

1 0

gajim: fix error when there is a ' char in the config path. Fixe...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset ae1f7b8bf059 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ae1f7b8bf059 description: fix error when there is a ' char in the config path. Fixes #7344 diffstat: src/common/logger.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r cc08ebd15953 -r ae1f7b8bf059 src/common/logger.py --- a/src/common/logger.py Wed Aug 14 14:56:15 2013 +0200 +++ b/src/common/logger.py Wed Aug 14 18:58:48 2013 +0200 @@ -149,7 +149,8 @@ def attach_cache_database(self): try: - self.cur.execute("ATTACH DATABASE '%s' AS cache" % CACHE_DB_PATH) + self.cur.execute("ATTACH DATABASE '%s' AS cache" % \ + CACHE_DB_PATH.replace("'", "''")) except sqlite.Error as e: log.debug("Failed to attach cache database: %s" % str(e))

1 0

gajim: prevent bug when forming a jid. Fixes #7428
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 3659896732e4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3659896732e4 description: prevent bug when forming a jid. Fixes #7428 diffstat: src/common/stanza_session.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (14 lines): diff -r ae1f7b8bf059 -r 3659896732e4 src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Aug 14 18:58:48 2013 +0200 +++ b/src/common/stanza_session.py Thu Aug 15 10:00:42 2013 +0200 @@ -83,9 +83,7 @@ def get_to(self): to = str(self.jid) - if self.resource and not to.endswith(self.resource): - to += '/' + self.resource - return to + return gajim.get_jid_without_resource(to) + self.resource def remove_events(self, types): """

1 0

gajim: [Darlan] improve some strings. Fixes #7239
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 960f04f73a68 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=960f04f73a68 description: [Darlan] improve some strings. Fixes #7239 diffstat: data/gui/adhoc_commands_window.ui | 2 +- data/gui/filetransfers.ui | 2 +- data/gui/history_window.ui | 2 +- data/gui/preferences_window.ui | 4 ++-- src/common/config.py | 28 ++++++++++++++-------------- src/common/connection.py | 2 +- src/config.py | 2 +- src/dialogs.py | 6 +++--- src/groupchat_control.py | 4 ++-- src/profile_window.py | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diffs (243 lines): diff -r 3659896732e4 -r 960f04f73a68 data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/adhoc_commands_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -171,7 +171,7 @@ <child> <object class="GtkLabel" id="notes_label"> <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while the command is sending...</property> + <property name="label" translatable="yes">Please wait while the command is being sent...</property> <property name="selectable">True</property> </object> <packing> diff -r 3659896732e4 -r 960f04f73a68 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/filetransfers.ui Thu Aug 15 10:33:27 2013 +0200 @@ -196,7 +196,7 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete file</property> + <property name="tooltip_text" translatable="yes">Cancels the selected file transfer and removes incomplete files</property> <property name="use_stock">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cancel_button-atkobject"> diff -r 3659896732e4 -r 960f04f73a68 data/gui/history_window.ui --- a/data/gui/history_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/history_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -74,7 +74,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">searching only in the selected day </property> + <property name="tooltip_text" translatable="yes">Searching only in the selected day </property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0.5</property> diff -r 3659896732e4 -r 960f04f73a68 data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu Aug 15 10:00:42 2013 +0200 +++ b/data/gui/preferences_window.ui Thu Aug 15 10:33:27 2013 +0200 @@ -766,7 +766,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of the new emails</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will also include information about the sender of new emails</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> @@ -1752,7 +1752,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will use protocol-specific status icons. (e.g. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)</property> <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> diff -r 3659896732e4 -r 960f04f73a68 src/common/config.py --- a/src/common/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -80,10 +80,10 @@ 'show_transports_group': [ opt_bool, True ], 'autoaway': [ opt_bool, True ], 'autoawaytime': [ opt_int, 5, _('Time in minutes, after which your status changes to away.') ], - 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoaway time.') ], + 'autoaway_message': [ opt_str, _('$S (Away as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoawaytime.') ], 'autoxa': [ opt_bool, True ], 'autoxatime': [ opt_int, 15, _('Time in minutes, after which your status changes to not available.') ], - 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxa time.') ], + 'autoxa_message': [ opt_str, _('$S (Not available as a result of being idle more than $T min)'), _('$S will be replaced by current status message, $T by autoxatime.') ], 'ask_online_status': [ opt_bool, False ], 'ask_offline_status': [ opt_bool, False ], 'trayicon': [opt_str, 'always', _("When to show notification area icon. Can be 'never', 'on_event', 'always'."), False], @@ -157,7 +157,7 @@ 'single-msg-y-position': [opt_int, 0], 'single-msg-width': [opt_int, 400], 'single-msg-height': [opt_int, 280], - 'save-roster-position': [opt_bool, True, _('If true, Gajim will save roster position when hiding roster, and restore it when showing roster.')], + 'save-roster-position': [opt_bool, True, _('If True, Gajim will save roster position when hiding roster, and restore it when showing roster.')], 'roster_x-position': [ opt_int, 0 ], 'roster_y-position': [ opt_int, 0 ], 'roster_width': [ opt_int, 200 ], @@ -177,10 +177,10 @@ 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], - 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], + 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened?')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')], - 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')], + 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when entering a groupchat. -1 means no limit')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], 'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')], 'send_on_ctrl_enter': [opt_bool, False, _('Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour).')], @@ -198,9 +198,9 @@ 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], - 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat jids.')], - 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)')], + 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask before closing group chat tab/window in this space separated list of group chat JIDs.')], + 'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are controls that can lose data (chat, private chat, groupchat that will not be minimized)')], 'notify_on_file_complete': [opt_bool, True], 'file_transfers_port': [opt_int, 28011], 'ft_add_hosts_to_send': [opt_str, '', _('Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding.')], @@ -256,7 +256,7 @@ 'avatar_position_in_roster': [opt_str, 'right', _('Define the position of the avatar in roster. Can be left or right'), True], 'ask_avatars_on_startup': [opt_bool, True, _('If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old.')], 'print_status_in_chats': [opt_bool, True, _('If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message.')], - 'print_status_in_muc': [opt_str, 'in_and_out', _('can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], + 'print_status_in_muc': [opt_str, 'in_and_out', _('Can be "none", "all" or "in_and_out". If "none", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If "all" Gajim will print all status messages. If "in_and_out", Gajim will only print FOO enters/leaves group chat.')], 'log_contact_status_changes': [opt_bool, False], 'log_xhtml_messages': [opt_bool, False, _('Log XHTML messages instead of plain text messages.')], 'just_connected_bg_color': [opt_str, '#adc3c6', _('Background color of contacts when they just signed in.')], @@ -270,7 +270,7 @@ 'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences.')], 'one_message_window': [opt_str, 'always', #always, never, peracct, pertype should not be translated - _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g., chats vs. groupchats) are sent to a specific window.')], + _('Controls the window where new messages are placed.\n\'always\' - All messages are sent to a single window.\n\'always_with_roster\' - Like \'always\' but the messages are in a single window along with the roster.\n\'never\' - All messages get their own window.\n\'peracct\' - Messages for each account are sent to a specific window.\n\'pertype\' - Each message type (e.g. chats vs. groupchats) is sent to a specific window.')], 'show_roster_on_startup':[opt_str, 'always', _('Show roster on startup.\n\'always\' - Always show roster.\n\'never\' - Never show roster.\n\'last_state\' - Restore the last state roster.')], 'show_avatar_in_chat': [opt_bool, True, _('If False, you will no longer see the avatar in the chat window.')], 'escape_key_closes': [opt_bool, True, _('If True, pressing the escape key closes a tab/window.')], @@ -297,7 +297,7 @@ 'attach_notifications_to_systray': [opt_bool, False, _('If True, notification windows from notification-daemon will be attached to notification icon.')], 'check_idle_every_foo_seconds': [opt_int, 2, _('Choose interval between 2 checks of idleness.')], 'uri_schemes': [opt_str, 'aaa:// aaas:// acap:// cap:// cid: crid:// data: dav: dict:// dns: fax: file:/ ftp:// geo: go: gopher:// h323: http:// https:// iax: icap:// im: imap:// info: ipp:// iris: iris.beep: iris.xpc: iris.xpcs: iris.lwz: ldap:// mid: modem: msrp:// msrps:// mtqp:// mupdate:// news: nfs:// nntp:// opaquelocktoken: pop:// pres: prospero:// rtsp:// service: shttp:// sip: sips: sms: snmp:// soap.beep:// soap.beeps:// tag: tel: telnet:// tftp:// thismessage:/ tip:// tv: urn:// vemmi:// xmlrpc.beep:// xmlrpc.beeps:// z39.50r:// z39.50s:// about: apt: cvs:// daap:// ed2k:// feed: fish:// git:// iax2: irc:// ircs:// ldaps:// magnet: mms:// rsync:// ssh:// svn:// sftp:// smb:// webcal://', _('Valid uri schemes. Only schemes in this list will be accepted as "real" uri. (mailto and xmpp are handled separately)'), True], - 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!') ], + 'ask_offline_status_on_connection': [ opt_bool, False, _('Ask offline status message to all offline contacts when connection to an account is established. WARNING: This causes a lot of requests to be sent!') ], 'shell_like_completion': [ opt_bool, False, _('If True, completion in groupchats will be like a shell auto-completion')], 'show_self_contact': [opt_str, 'when_other_resource', _('When is self contact row displayed. Can be "always", "when_other_resource" or "never"'), True], 'audio_input_device': [opt_str, 'autoaudiosrc ! volume name=gajim_vol'], @@ -368,7 +368,7 @@ # send keepalive every N seconds of inactivity 'keep_alive_every_foo_secs': [ opt_int, 55 ], 'ping_alive_every_foo_secs': [ opt_int, 120 ], - 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect.') ], + 'time_for_ping_alive_answer': [ opt_int, 60, _('How many seconds to wait for the answer of ping alive packet before we try to reconnect?') ], # try for 1 minutes before giving up (aka. timeout after those seconds) 'try_connecting_for_foo_secs': [ opt_int, 60 ], 'http_auth': [opt_str, 'ask'], # yes, no, ask @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of jid for which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ], @@ -481,7 +481,7 @@ 'rooms': ({ 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], 'muc_restore_lines': [opt_int, -2, _('How many lines to request from server when entering a groupchat. -1 means no limit, -2 means global value')], - 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit, -2 means global value')], + 'muc_restore_timeout': [opt_int, -2, _('How many minutes back to request logs when entering a groupchat. -1 means no limit, -2 means global value')], }, {}), 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], diff -r 3659896732e4 -r 960f04f73a68 src/common/connection.py --- a/src/common/connection.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/common/connection.py Thu Aug 15 10:33:27 2013 +0200 @@ -1460,7 +1460,7 @@ self.disconnect(on_purpose=True) gajim.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, title=_('Could not connect to "%s"') % self._hostname, - msg=_('Check your connection or try again later'))) + msg=_('Check your connection or try again later.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None diff -r 3659896732e4 -r 960f04f73a68 src/config.py --- a/src/config.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/config.py Thu Aug 15 10:33:27 2013 +0200 @@ -2471,7 +2471,7 @@ return if not gajim.connections[self.current_account].vcard_supported: - dialogs.ErrorDialog(_("Your server doesn't support Vcard"), + dialogs.ErrorDialog(_("Your server doesn't support vCard"), _("Your server can't save your personal information.")) return diff -r 3659896732e4 -r 960f04f73a68 src/dialogs.py --- a/src/dialogs.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 10:33:27 2013 +0200 @@ -2163,7 +2163,7 @@ except Exception: # invalid char ErrorDialog(_('Invalid nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return self.on_ok(nick, self.is_checked()) @@ -2623,7 +2623,7 @@ nickname = helpers.parse_resource(nickname) except Exception: ErrorDialog(_('Invalid Nickname'), - _('The nickname has not allowed characters.')) + _('The nickname contains invalid characters.')) return user, server, resource = helpers.decompose_jid(room_jid) if not user or not server or resource: @@ -2634,7 +2634,7 @@ room_jid = helpers.parse_jid(room_jid) except Exception: ErrorDialog(_('Invalid group chat Jabber ID'), - _('The group chat Jabber ID has not allowed characters.')) + _('The group chat Jabber ID contains invalid characters.')) return if gajim.contacts.get_contact(self.account, room_jid) and \ diff -r 3659896732e4 -r 960f04f73a68 src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 10:33:27 2013 +0200 @@ -1296,9 +1296,9 @@ changes.append(_('Any occupant is allowed to see your full JID')) self.is_anonymous = False if '102' in obj.status_code: - changes.append(_('Room now shows unavailable member')) + changes.append(_('Room now shows unavailable members')) if '103' in obj.status_code: - changes.append(_('room now does not show unavailable members')) + changes.append(_('Room now does not show unavailable members')) if '104' in obj.status_code: changes.append(_('A non-privacy-related room configuration change ' 'has occurred')) diff -r 3659896732e4 -r 960f04f73a68 src/profile_window.py --- a/src/profile_window.py Thu Aug 15 10:00:42 2013 +0200 +++ b/src/profile_window.py Thu Aug 15 10:33:27 2013 +0200 @@ -372,7 +372,7 @@ return if gajim.connections[self.account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), - _('Without a connection you can not publish your contact ' + _('Without a connection, you can not publish your contact ' 'information.')) return vcard_ = self.make_vcard()

1 0

gajim: Avoid him/her in strings. Fixes #7390
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset b5057ff53da0 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b5057ff53da0 description: Avoid him/her in strings. Fixes #7390 diffstat: data/gui/contact_context_menu.ui | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 960f04f73a68 -r b5057ff53da0 data/gui/contact_context_menu.ui --- a/data/gui/contact_context_menu.ui Thu Aug 15 10:33:27 2013 +0200 +++ b/data/gui/contact_context_menu.ui Thu Aug 15 10:36:25 2013 +0200 @@ -168,7 +168,7 @@ <object class="GtkMenu" id="subscription_menuitem_menu"> <child> <object class="GtkImageMenuItem" id="resend_authorization_to_menuitem"> - <property name="label" translatable="yes">_Allow him/her to see my status</property> + <property name="label" translatable="yes">_Allow contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image15</property> @@ -177,7 +177,7 @@ </child> <child> <object class="GtkImageMenuItem" id="rerequest_authorization_from_menuitem"> - <property name="label" translatable="yes">A_sk to see his/her status</property> + <property name="label" translatable="yes">A_sk to see contact status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image16</property> @@ -185,8 +185,8 @@ </object> </child> <child> - <object class="GtkImageMenuItem" id="forbid_him/her_to_see_my_status1"> - <property name="label" translatable="yes">_Forbid him/her to see my status</property> + <object class="GtkImageMenuItem" id="forbid_contact_to_see_my_status1"> + <property name="label" translatable="yes">_Forbid contact to see my status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image17</property>

1 0

gajim: Auto clear/hide search when open a chat. Fixes #7423
by Denis Fomin 24 Aug '13

24 Aug '13

changeset ce82a03b7b56 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ce82a03b7b56 description: Auto clear/hide search when open a chat. Fixes #7423 diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r b5057ff53da0 -r ce82a03b7b56 src/roster_window.py --- a/src/roster_window.py Thu Aug 15 10:36:25 2013 +0200 +++ b/src/roster_window.py Thu Aug 15 12:45:38 2013 +0400 @@ -4059,6 +4059,8 @@ When an iter is activated (double-click or single click if gnome is set this way) """ + if self.rfilter_enabled: + self.disable_rfilter() model = self.modelfilter account = model[path][C_ACCOUNT] type_ = model[path][C_TYPE] @@ -4125,8 +4127,6 @@ """ When an iter is double clicked: open the first event window """ - if self.rfilter_enabled: - self.disable_rfilter() if not gajim.single_click: self.on_row_activated(widget, path)

1 0

gajim: Auto clear/hide search when open a chat.
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 47a6c9bfb912 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=47a6c9bfb912 description: Auto clear/hide search when open a chat. diffstat: src/roster_window.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r ce82a03b7b56 -r 47a6c9bfb912 src/roster_window.py --- a/src/roster_window.py Thu Aug 15 12:45:38 2013 +0400 +++ b/src/roster_window.py Thu Aug 15 14:32:14 2013 +0400 @@ -4059,8 +4059,6 @@ When an iter is activated (double-click or single click if gnome is set this way) """ - if self.rfilter_enabled: - self.disable_rfilter() model = self.modelfilter account = model[path][C_ACCOUNT] type_ = model[path][C_TYPE] @@ -4070,6 +4068,8 @@ else: self.tree.expand_row(path, False) return + if self.rfilter_enabled: + self.disable_rfilter() jid = model[path][C_JID] resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid)

1 0

gajim: translate plugins descriptions
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 99458c13a65d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=99458c13a65d description: translate plugins descriptions diffstat: src/plugins/pluginmanager.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 2f25891c2c80 -r 99458c13a65d src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Aug 16 14:53:17 2013 +0200 +++ b/src/plugins/pluginmanager.py Fri Aug 16 23:29:48 2013 +0400 @@ -472,6 +472,9 @@ for option in fields: if conf.get('info', option) is '': raise ConfigParser.NoOptionError, 'field empty' + if option == 'description': + setattr(module_attr, option, _(conf.get('info', option))) + continue setattr(module_attr, option, conf.get('info', option)) conf.remove_section('info')

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