Commits

commits@gajim.org

17632 discussions

gajim: handle GUI while checking file hash. Show show re-request...
by Yann Leboulanger 18 Feb '12

18 Feb '12

changeset 8eb475cfdb1d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8eb475cfdb1d description: handle GUI while checking file hash. Show show re-request dialog when hash is incorrect. TODO: re-request file to sender. diffstat: src/dialogs.py | 7 ++-- src/filetransfers_window.py | 61 ++++++++++++++++++++++++++++++++++++++++++-- src/gui_interface.py | 52 ++++++++++++++++++++++++++++++-------- src/roster_window.py | 3 ++ 4 files changed, 104 insertions(+), 19 deletions(-) diffs (296 lines): diff -r 01e82472cc5b -r 8eb475cfdb1d src/dialogs.py --- a/src/dialogs.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/dialogs.py Sat Feb 18 21:06:08 2012 +0100 @@ -1615,16 +1615,15 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_yes=None, - on_response_no=None): + on_response_no=None, type_=gtk.MESSAGE_QUESTION): self.user_response_yes = on_response_yes self.user_response_no = on_response_no if hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None - HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, - gtk.BUTTONS_YES_NO, pritext, sectext, - on_response_yes=self.on_response_yes, + HigDialog.__init__(self, parent, type_, gtk.BUTTONS_YES_NO, pritext, + sectext, on_response_yes=self.on_response_yes, on_response_no=self.on_response_no) if checktext: diff -r 01e82472cc5b -r 8eb475cfdb1d src/filetransfers_window.py --- a/src/filetransfers_window.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/filetransfers_window.py Sat Feb 18 21:06:08 2012 +0100 @@ -46,7 +46,8 @@ C_TIME = 3 C_PROGRESS = 4 C_PERCENT = 5 -C_SID = 6 +C_PULSE = 6 +C_SID = 7 class FileTransfersWindow: @@ -65,7 +66,8 @@ shall_notify = gajim.config.get('notify_on_file_complete') self.notify_ft_checkbox.set_active(shall_notify ) - self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, str) + self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, + int, str) self.tree.set_model(self.model) col = gtk.TreeViewColumn() @@ -112,6 +114,7 @@ col.pack_start(renderer, expand=False) col.add_attribute(renderer, 'text', C_PROGRESS) col.add_attribute(renderer, 'value', C_PERCENT) + col.add_attribute(renderer, 'pulse', C_PULSE) col.set_resizable(True) col.set_expand(False) self.tree.append_column(col) @@ -125,6 +128,8 @@ 'pause': gtk.STOCK_MEDIA_PAUSE, 'continue': gtk.STOCK_MEDIA_PLAY, 'ok': gtk.STOCK_APPLY, + 'computing': gtk.STOCK_EXECUTE, + 'hash_error': gtk.STOCK_STOP, } self.tree.get_selection().set_mode(gtk.SELECTION_SINGLE) @@ -244,6 +249,21 @@ dialogs.ErrorDialog(_('File transfer stopped'), sectext) self.tree.get_selection().unselect_all() + def show_hash_error(self, jid, file_props): + def on_yes(dummy): + # TODO: Request the file to the sender + pass + + if file_props['type'] == 'r': + file_name = os.path.basename(file_props['file-name']) + else: + file_name = file_props['name'] + dialogs.YesNoDialog(('File transfer error'), + _('The file %(file)s has been fully received, but it seems to be ' + 'wrongly received.\nDo you want to reload it?') % \ + {'file': file_name}, on_response_yes=on_yes, + type_=gtk.MESSAGE_ERROR) + def show_file_send_request(self, account, contact): win = gtk.ScrolledWindow() win.set_shadow_type(gtk.SHADOW_IN) @@ -449,6 +469,36 @@ file_props['stopped'] = True elif status == 'ok': file_props['completed'] = True + text = self._format_percent(100) + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + self.model.set(iter_, C_PULSE, gobject.constants.G_MAXINT) + elif status == 'computing': + self.model.set(iter_, C_PULSE, 1) + text = _('Checking file...') + '\n' + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + def pulse(): + p = self.model.get(iter_, C_PULSE)[0] + if p == gobject.constants.G_MAXINT: + return False + self.model.set(iter_, C_PULSE, p + 1) + return True + gobject.timeout_add(100, pulse) + elif status == 'hash_error': + text = _('File error') + '\n' + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + self.model.set(iter_, C_PULSE, gobject.constants.G_MAXINT) self.model.set(iter_, C_IMAGE, self.get_icon(status)) path = self.model.get_path(iter_) self.select_func(path) @@ -589,7 +639,10 @@ status = 'stop' self.model.set(iter_, 0, self.get_icon(status)) if transfered_size == full_size: - self.set_status(typ, sid, 'ok') + if file_props['type'] == 'r': + self.set_status(typ, sid, 'computing') + else: + self.set_status(typ, sid, 'ok') elif just_began: path = self.model.get_path(iter_) self.select_func(path) @@ -655,7 +708,7 @@ file_name = file_props['name'] text_props = gobject.markup_escape_text(file_name) + '\n' text_props += contact.get_shown_name() - self.model.set(iter_, 1, text_labels, 2, text_props, C_SID, + self.model.set(iter_, 1, text_labels, 2, text_props, C_PULSE, -1, C_SID, file_props['type'] + file_props['sid']) self.set_progress(file_props['type'], file_props['sid'], 0, iter_) if 'started' in file_props and file_props['started'] is False: diff -r 01e82472cc5b -r 8eb475cfdb1d src/gui_interface.py --- a/src/gui_interface.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/gui_interface.py Sat Feb 18 21:06:08 2012 +0100 @@ -913,6 +913,12 @@ def __compare_hashes(self, account, file_props): session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props['session-sid']) + ft_win = self.instances['file_transfers'] + if not session.file_hash: + # We disn't get the hash, sender probably don't support that + jid = unicode(file_props['sender']) + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], 'ok') h = Hashes() try: file_ = open(file_props['file-name'], 'r') @@ -922,8 +928,16 @@ file_.close() # If the hash we received and the hash of the file are the same, # then the file is not corrupt - if session.file_hash == hash_: - print "they are te same" + jid = unicode(file_props['sender']) + if session.file_hash != hash_: + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], 'ok') + else: + # wrong hash, we need to get the file again! + file_props['error'] = -10 + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], + 'hash_error') # End jingle session if session: session.end_session() @@ -949,7 +963,10 @@ else: # we send a file jid = unicode(file_props['receiver']) gajim.socks5queue.remove_sender(file_props['sid'], True, True) + self.popup_ft_result(account, jid, file_props) + def popup_ft_result(self, account, jid, file_props): + ft = self.instances['file_transfers'] if helpers.allow_popup_window(account): if file_props['error'] == 0: if gajim.config.get('notify_on_file_complete'): @@ -960,6 +977,8 @@ elif file_props['error'] == -6: ft.show_stopped(jid, file_props, error_msg=_('Error opening file')) + elif file_props['error'] == -10: + ft.show_hash_error(jid, file_props) return msg_type = '' @@ -971,6 +990,9 @@ elif file_props['error'] in (-1, -6): msg_type = 'file-stopped' event_type = _('File Transfer Stopped') + elif file_props['error'] == -10: + msg_type = 'file-hash-error' + event_type = _('File Transfer Failed') if event_type == '': # FIXME: ugly workaround (this can happen Gajim sent, Gaim recvs) @@ -988,16 +1010,20 @@ # get the name of the sender, as it is in the roster sender = unicode(file_props['sender']).split('/')[0] name = gajim.contacts.get_first_contact_from_jid(account, - sender).get_shown_name() + sender).get_shown_name() filename = os.path.basename(file_props['file-name']) if event_type == _('File Transfer Completed'): txt = _('You successfully received %(filename)s from ' '%(name)s.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_done' - else: # ft stopped + elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s from %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' + else: # ft hash error + txt = _('File transfer of %(filename)s from %(name)s ' + 'failed.') % {'filename': filename, 'name': name} + img_name = 'gajim-ft_stopped' else: receiver = file_props['receiver'] if hasattr(receiver, 'jid'): @@ -1005,24 +1031,28 @@ receiver = receiver.split('/')[0] # get the name of the contact, as it is in the roster name = gajim.contacts.get_first_contact_from_jid(account, - receiver).get_shown_name() + receiver).get_shown_name() filename = os.path.basename(file_props['file-name']) if event_type == _('File Transfer Completed'): txt = _('You successfully sent %(filename)s to %(name)s.')\ - % {'filename': filename, 'name': name} + % {'filename': filename, 'name': name} img_name = 'gajim-ft_done' - else: # ft stopped + elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s to %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' + else: # ft hash error + txt = _('File transfer of %(filename)s to %(name)s ' + 'failed.') % {'filename': filename, 'name': name} + img_name = 'gajim-ft_stopped' path = gtkgui_helpers.get_icon_path(img_name, 48) else: txt = '' path = '' if gajim.config.get('notify_on_file_complete') and \ - (gajim.config.get('autopopupaway') or \ - gajim.connections[account].connected in (2, 3)): + (gajim.config.get('autopopupaway') or \ + gajim.connections[account].connected in (2, 3)): # we want to be notified and we are online/chat or we don't mind # bugged when away/na/busy notify.popup(event_type, jid, account, msg_type, path_to_image=path, @@ -1514,7 +1544,7 @@ no_queue = len(gajim.events.get_events(account, jid)) == 0 # type_ can be gc-invitation file-send-error file-error # file-request-error file-request file-completed file-stopped - # jingle-incoming + # file-hash-error jingle-incoming # event_type can be in advancedNotificationWindow.events_list event_types = {'file-request': 'ft_request', 'file-completed': 'ft_finished'} @@ -1643,7 +1673,7 @@ w = ctrl.parent_win elif type_ in ('normal', 'file-request', 'file-request-error', 'file-send-error', 'file-error', 'file-stopped', 'file-completed', - 'jingle-incoming'): + 'file-hash-error', 'jingle-incoming'): # Get the first single message event event = gajim.events.get_first_event(account, fjid, type_) if not event: diff -r 01e82472cc5b -r 8eb475cfdb1d src/roster_window.py --- a/src/roster_window.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/roster_window.py Sat Feb 18 21:06:08 2012 +0100 @@ -1917,6 +1917,9 @@ ft.show_stopped(jid, data, error_msg=msg_err) gajim.events.remove_events(account, jid, event) return True + elif event.type_ == 'file-hash-error': + ft.show_hash_error(jid, data) + gajim.events.remove_events(account, jid, event) elif event.type_ == 'file-completed': ft.show_completed(jid, data) gajim.events.remove_events(account, jid, event)

1 0

gajim: Quick fix [6de66f624e71]. print last message in room then...
by Fomin Denis 18 Feb '12

18 Feb '12

changeset 95ad415add80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95ad415add80 description: Quick fix [6de66f624e71]. print last message in room then reconnect diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6de66f624e71 -r 95ad415add80 src/common/connection.py --- a/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 +++ b/src/common/connection.py Sat Feb 18 23:06:08 2012 +0400 @@ -2357,7 +2357,7 @@ if rejoin: tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(gajim.logger.get_last_date_that_has_logs( - room_jid, is_room=True) + 1)) + room_jid, is_room=True))) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: do not duplicate messages in the room when the connection...
by Fomin Denis 18 Feb '12

18 Feb '12

changeset 6de66f624e71 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6de66f624e71 description: do not duplicate messages in the room when the connection is lost diffstat: src/common/connection.py | 7 ++++++- src/groupchat_control.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r cd12ea68f371 -r 6de66f624e71 src/common/connection.py --- a/src/common/connection.py Fri Feb 17 11:17:35 2012 +0400 +++ b/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 @@ -2304,7 +2304,8 @@ room_id=resp.getTag('unique').getData())) self.connection.SendAndCallForResponse(iq, _on_response) - def join_gc(self, nick, room_jid, password, change_nick=False): + def join_gc(self, nick, room_jid, password, change_nick=False, + rejoin=False): # FIXME: This room JID needs to be normalized; see #1364 if not gajim.account_is_connected(self.name): return @@ -2353,6 +2354,10 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date + if rejoin: + tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(gajim.logger.get_last_date_that_has_logs( + room_jid, is_room=True) + 1)) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb diff -r cd12ea68f371 -r 6de66f624e71 src/groupchat_control.py --- a/src/groupchat_control.py Fri Feb 17 11:17:35 2012 +0400 +++ b/src/groupchat_control.py Sat Feb 18 22:48:03 2012 +0400 @@ -1274,7 +1274,7 @@ gajim.gc_connected[obj.conn.name][self.room_jid]: return password = gajim.gc_passwords.get(self.room_jid, '') - obj.conn.join_gc(self.nick, self.room_jid, password) + obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1351,7 +1351,7 @@ return False password = gajim.gc_passwords.get(self.room_jid, '') gajim.connections[self.account].join_gc(self.nick, self.room_jid, - password) + password, rejoin=True) return True def draw_roster(self):

1 0

gajim: Don't cut 'xmpp:' when a copy xmpp link.
by Fomin Denis 17 Feb '12

17 Feb '12

changeset 0b35dd2016dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0b35dd2016dd description: Don't cut 'xmpp:' when a copy xmpp link. diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 35bb1da8ef7e -r 0b35dd2016dd src/conversation_textview.py --- a/src/conversation_textview.py Fri Feb 17 11:06:43 2012 +0400 +++ b/src/conversation_textview.py Fri Feb 17 11:17:35 2012 +0400 @@ -925,7 +925,8 @@ childs[7].hide() # hide add to roster menuitem if kind == 'xmpp': - id_ = childs[0].connect('activate', self.on_copy_link_activate, text) + id_ = childs[0].connect('activate', self.on_copy_link_activate, + 'xmpp:' + text) self.handlers[id_] = childs[0] childs[2].hide() # copy mail address childs[3].hide() # open mail composer

1 0

gajim: Connect signal to copy link location context menu item fo...
by Fomin Denis 17 Feb '12

17 Feb '12

changeset 35bb1da8ef7e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=35bb1da8ef7e description: Connect signal to copy link location context menu item for xmpp links. Fixes #7105 diffstat: src/conversation_textview.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 2ab9a430a6a7 -r 35bb1da8ef7e src/conversation_textview.py --- a/src/conversation_textview.py Fri Feb 17 10:58:19 2012 +0400 +++ b/src/conversation_textview.py Fri Feb 17 11:06:43 2012 +0400 @@ -925,6 +925,8 @@ childs[7].hide() # hide add to roster menuitem if kind == 'xmpp': + id_ = childs[0].connect('activate', self.on_copy_link_activate, text) + self.handlers[id_] = childs[0] childs[2].hide() # copy mail address childs[3].hide() # open mail composer childs[4].hide() # jid section separator

1 0

gajim: [Dicson] fix /away command to work when we are onln #7070.
by Yann Leboulanger 17 Feb '12

17 Feb '12

changeset 68d91a74726b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=68d91a74726b description: [Dicson] fix /away command to work when we are onln #7070. diffstat: src/command_system/implementation/standard.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 00bb34943d4d -r 68d91a74726b src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Tue Feb 14 21:49:48 2012 +0100 +++ b/src/command_system/implementation/standard.py Wed Feb 15 20:22:46 2012 +0100 @@ -139,7 +139,7 @@ if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected <= 2: + if connection.connected < 2: continue connection.change_status(status, message) @@ -153,7 +153,7 @@ if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected <= 2: + if connection.connected < 2: continue connection.change_status('away', message) @@ -167,7 +167,7 @@ if not gajim.config.get_per('accounts', connection.name, 'sync_with_global_status'): continue - if connection.connected <= 2: + if connection.connected < 2: continue connection.change_status('online', message)

1 0

gajim: Add copy link location context menu item for xmpp links. ...
by Fomin Denis 17 Feb '12

17 Feb '12

changeset 2ab9a430a6a7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2ab9a430a6a7 description: Add copy link location context menu item for xmpp links. Fixes #7105 diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 68d91a74726b -r 2ab9a430a6a7 src/conversation_textview.py --- a/src/conversation_textview.py Wed Feb 15 20:22:46 2012 +0100 +++ b/src/conversation_textview.py Fri Feb 17 10:58:19 2012 +0400 @@ -934,7 +934,8 @@ childs[6].hide() # join group chat childs[7].hide() # add to roster - childs[0].hide() # copy link location + if kind != 'xmpp': + childs[0].hide() # copy link location childs[1].hide() # open link in browser menu.popup(None, None, None, event.button, event.time)

1 0

gajim: [Dicson] Fixes #7070
by Yann Leboulanger 17 Feb '12

17 Feb '12

changeset 00bb34943d4d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=00bb34943d4d description: [Dicson] Fixes #7070 diffstat: src/command_system/implementation/standard.py | 34 +++++++++++++++----------- 1 files changed, 20 insertions(+), 14 deletions(-) diffs (65 lines): diff -r 13f1d958e835 -r 00bb34943d4d src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Feb 17 20:26:07 2012 +0100 +++ b/src/command_system/implementation/standard.py Tue Feb 14 21:49:48 2012 +0100 @@ -125,17 +125,6 @@ self.echo(formatted) - def _get_connected_accounts(self): - conns = [] - for conn in gajim.connections.itervalues(): - if not gajim.config.get_per('accounts', conn.name, - 'sync_with_global_status'): - continue - if conn.connected <= 2: - continue - conns.append(conn) - return conns - @command(raw=True, empty=True) @doc(_(""" Set current the status @@ -146,7 +135,12 @@ def status(self, status, message): if status not in ('online', 'away', 'chat', 'xa', 'dnd'): raise CommandError("Invalid status given") - for connection in self._get_connected_accounts(): + for connection in gajim.connections.itervalues(): + if not gajim.config.get_per('accounts', connection.name, + 'sync_with_global_status'): + continue + if connection.connected <= 2: + continue connection.change_status(status, message) @command(raw=True, empty=True) @@ -154,7 +148,13 @@ def away(self, message): if not message: message = _("Away") - for connection in self._get_connected_accounts(): + + for connection in gajim.connections.itervalues(): + if not gajim.config.get_per('accounts', connection.name, + 'sync_with_global_status'): + continue + if connection.connected <= 2: + continue connection.change_status('away', message) @command('back', raw=True, empty=True) @@ -162,7 +162,13 @@ def online(self, message): if not message: message = _("Available") - for connection in self._get_connected_accounts(): + + for connection in gajim.connections.itervalues(): + if not gajim.config.get_per('accounts', connection.name, + 'sync_with_global_status'): + continue + if connection.connected <= 2: + continue connection.change_status('online', message) class StandardCommonChatCommands(CommandContainer):

1 0

gajim: [Mako] updated japanese translation
by Yann Leboulanger 17 Feb '12

17 Feb '12

changeset 13f1d958e835 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=13f1d958e835 description: [Mako] updated japanese translation diffstat: po/ja.po | 715 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 350 insertions(+), 365 deletions(-) diffs (truncated from 2564 to 300 lines): diff -r 475a1baa8564 -r 13f1d958e835 po/ja.po --- a/po/ja.po Wed Feb 15 09:51:33 2012 +0100 +++ b/po/ja.po Fri Feb 17 20:26:07 2012 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: Gajim 0.15 ja\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-14 20:47+0100\n" -"PO-Revision-Date: 2012-01-22 21:59+0900\n" +"PO-Revision-Date: 2012-02-16 21:42+0900\n" "Last-Translator: Mako N <mako(a)pasero.net>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -18,23 +18,23 @@ #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7 msgid "Join _Group Chat..." -msgstr "グループチャットに参加する (_G)..." +msgstr "グループチャットに参加...(_G)" #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." -msgstr "相手先リストに追加する (_A)..." +msgstr "相手先リストに追加...(_A)" #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" -msgstr "サービスを探索する (_D)" +msgstr "サービスを探索 (_D)" #: ../data/gui/account_context_menu.ui.h:4 msgid "_Execute Command..." -msgstr "コマンドを実行する (_E)..." +msgstr "コマンドを実行...(_E)" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Modify Account" -msgstr "アカウントを修正する (_M)" +msgstr "アカウントを修正 (_M)" #: ../data/gui/account_context_menu.ui.h:6 msgid "_Open Gmail Inbox" @@ -46,7 +46,7 @@ #: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 msgid "_Start Chat..." -msgstr "チャットを開始する (_S)..." +msgstr "チャットを開始...(_S)" #: ../data/gui/account_context_menu.ui.h:9 #: ../data/gui/zeroconf_context_menu.ui.h:2 @@ -65,7 +65,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "Please choose one of the options below:" -msgstr "下の選択肢から一つ選んでください:" +msgstr "下の選択肢から1つ選んでください:" #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "Please fill in the data for your existing account" @@ -85,7 +85,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:10 msgid "Anon_ymous authentication" -msgstr "匿名の認証 (_y)" +msgstr "匿名の認証 (_Y)" #: ../data/gui/account_creation_wizard_window.ui.h:11 msgid "Connect when I press Finish" @@ -97,11 +97,11 @@ #: ../data/gui/account_creation_wizard_window.ui.h:13 msgid "I already have an account I want to _use" -msgstr "既にアカウントを持っているのでそれを使う (_u)" +msgstr "既にアカウントを持っているのでそれを使う (_U)" #: ../data/gui/account_creation_wizard_window.ui.h:14 msgid "I want to _register for a new account" -msgstr "新しいアカウントを作成する (_r)" +msgstr "新しいアカウントを作成する (_R)" #: ../data/gui/account_creation_wizard_window.ui.h:15 #: ../data/gui/accounts_window.ui.h:30 @@ -126,12 +126,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:18 msgid "Prox_y:" -msgstr "プロキシ (_y)" +msgstr "プロキシ (_Y):" #: ../data/gui/account_creation_wizard_window.ui.h:19 #: ../data/gui/accounts_window.ui.h:50 msgid "Save pass_word" -msgstr "パスワードを保存する" +msgstr "パスワードを保存する (_W)" #: ../data/gui/account_creation_wizard_window.ui.h:20 msgid "Set my profile when I connect" @@ -145,7 +145,9 @@ msgid "" "You need to have an account in order to connect\n" "to the Jabber network." -msgstr "Jabber ネットワークに接続するには、アカウントが必要です。" +msgstr "" +"Jabber ネットワークに接続するには、\n" +"アカウントが必要です。" #: ../data/gui/account_creation_wizard_window.ui.h:24 #: ../data/gui/roster_window.ui.h:17 @@ -198,7 +200,7 @@ #: ../data/gui/accounts_window.ui.h:5 msgid "A_djust to status" -msgstr "在席状況に合わせる (_d)" +msgstr "在席状況に合わせる (_D)" #: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 msgid "Account" @@ -232,27 +234,25 @@ #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" -msgstr "Gajim 起動時に接続する (_o)" +msgstr "Gajim 起動時に接続する (_O)" #: ../data/gui/accounts_window.ui.h:14 msgid "Certificate is e_ncrypted" -msgstr "証明書は暗号化されている (_n)" +msgstr "証明書は暗号化されている (_N)" #: ../data/gui/accounts_window.ui.h:15 msgid "Chan_ge Password" -msgstr "パスワードを変更する (_g)" +msgstr "パスワードを変更する (_G)" #: ../data/gui/accounts_window.ui.h:16 msgid "" "Check this so Gajim will ask you before sending your password over an " "insecure connection." -msgstr "" -"チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま" -"す。" +msgstr "チェックをつけると、安全でない接続の前にパスワードを聞いてきます。" #: ../data/gui/accounts_window.ui.h:17 msgid "Choose _Key..." -msgstr "鍵の選択 (_K)..." +msgstr "鍵の選択...(_K)" #: ../data/gui/accounts_window.ui.h:18 msgid "Click to change account's password" @@ -264,11 +264,11 @@ #: ../data/gui/accounts_window.ui.h:20 msgid "Client certificate" -msgstr "クライアントの証明書" +msgstr "クライアント証明書" #: ../data/gui/accounts_window.ui.h:21 msgid "Co_nnect on Gajim startup" -msgstr "Gajim 起動時に接続する (_n)" +msgstr "Gajim 起動時に接続する (_N)" #: ../data/gui/accounts_window.ui.h:22 msgid "Connection" @@ -315,7 +315,7 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"チェックをつけると、Gajim はあなたの IP を除くいくつかの IP に同報します。そ" +"チェックをつけると、Gajim はあなたの IP を除くいくつかの IP を同報します。そ" "れによってファイル転送はうまくいく可能性が高くなります。" #: ../data/gui/accounts_window.ui.h:29 @@ -347,7 +347,7 @@ "accordingly" msgstr "" "チェックをつけると、(名簿ウィンドウの最下段の選択肢による)全体の在席状況の変" -"更がこのアカウントの在席状況の変更に反映されます。" +"更がこのアカウントの在席状況の変更に反映されます" #: ../data/gui/accounts_window.ui.h:34 msgid "" @@ -357,7 +357,7 @@ msgstr "" "受信メッセージに使われるデフォルトのポートが設定に合わない場合、ここで別の" "ポートを指定できます。\n" -"ファイアーウォールの設定を考慮しましょう。" +"ファイアーウォールの設定を考慮してください。" #: ../data/gui/accounts_window.ui.h:36 msgid "Information about you, as stored in the server" @@ -376,7 +376,7 @@ #: ../data/gui/accounts_window.ui.h:39 msgid "Mer_ge accounts" -msgstr "アカウントを統合 (_g)" +msgstr "アカウントを統合 (_G)" #: ../data/gui/accounts_window.ui.h:40 ../src/config.py:1842 #: ../src/config.py:2420 @@ -389,7 +389,7 @@ #: ../data/gui/accounts_window.ui.h:43 msgid "Priori_ty:" -msgstr "優先順位 (_t):" +msgstr "優先順位 (_T):" #: ../data/gui/accounts_window.ui.h:44 msgid "" @@ -397,7 +397,7 @@ "server when two or more clients are connected using the same account; The " "client with the highest priority gets the events" msgstr "" -"優先順位は、同じアカウントで二つ以上のクライアントから接続しているときに " +"優先順位は、同じアカウントで2つ以上のクライアントから接続しているときに " "jabber サーバーからのイベントの受け取り先を決定するのに使われます。最も高い優" "先順位のクライアントがイベントを受け取ります" @@ -408,11 +408,11 @@ #. Rename #: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688 msgid "Re_name" -msgstr "名前の変更 (_n)" +msgstr "名前の変更 (_N)" #: ../data/gui/accounts_window.ui.h:47 msgid "Resour_ce:" -msgstr "リソース (_c):" +msgstr "リソース (_C):" #: ../data/gui/accounts_window.ui.h:48 msgid "" @@ -422,29 +422,28 @@ "account with resource 'Home' and 'Work' at the same time. The resource which " "has the highest priority will get the events. (see below)" msgstr "" -"リソースとは、同じサーバーに同じアカウントで複数のクライアントからの接続があ" -"る場合に、同じ JID を区別するために送信されます。たとえば、同じアカウントでリ" -"ソースを 'Home' と 'Work' として同時に接続しているかもしれません。最も優先順" -"位の高いリソースがイベントを受け取ります(下記参照)。" +"リソースは、同じサーバーに同じアカウントで複数のクライアントからの接続がある" +"場合に、同じ JID を区別するために送信されます。たとえば、同じアカウントでリ" +"ソースを 'Home' と 'Work' として同時に接続します。最も優先順位の高いリソース" +"がイベントを受け取ります (下記参照)。" #: ../data/gui/accounts_window.ui.h:49 msgid "Save conversation _logs for all contacts" -msgstr "すべての相手先の会話記録を保存する (_l)" +msgstr "すべての相手先の会話記録を保存する (_L)" #: ../data/gui/accounts_window.ui.h:51 msgid "Send _keep-alive packets" -msgstr "生存パケットを送信する (_k)" +msgstr "生存パケットを送信する (_K)" #: ../data/gui/accounts_window.ui.h:52 msgid "Synch_ronize account status with global status" -msgstr "アカウントの在席状況を全体の在席状況に合わせる (_r)" +msgstr "アカウントの在席状況を全体の在席状況に合わせる (_R)" #: ../data/gui/accounts_window.ui.h:53 msgid "Synchroni_ze account status with global status" -msgstr "アカウントの在席状況を全体の在席状況に合わせる (_z)" +msgstr "アカウントの在席状況を全体の在席状況に合わせる (_Z)" #: ../data/gui/accounts_window.ui.h:54 -#, fuzzy msgid "Synchronize contacts" msgstr "相手先を合わせる" @@ -454,11 +453,11 @@ #: ../data/gui/accounts_window.ui.h:56 msgid "Use cust_om hostname/port" -msgstr "別のホスト名/ポート番号を使う (_o)" +msgstr "別のホスト名/ポート番号を使う (_O)" #: ../data/gui/accounts_window.ui.h:57 msgid "Use cust_om port:" -msgstr "別のポート番号を使う (_o):" +msgstr "別のポート番号を使う (_O):" #: ../data/gui/accounts_window.ui.h:58 msgid "Use file transfer proxies" @@ -466,11 +465,11 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "クライアントの証明書ファイル (_C):" +msgstr "クライアント証明書ファイル (_C):" #: ../data/gui/accounts_window.ui.h:60 msgid "_Edit Personal Information..." -msgstr "個人情報を編集する (_E)..." +msgstr "個人情報を編集する...(_E)" #. XML Console enable checkbutton #: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11 @@ -483,7 +482,7 @@

1 0

gajim: Don't cut 'xmpp:' when a copy xmpp link.
by Fomin Denis 17 Feb '12

17 Feb '12

changeset cd12ea68f371 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cd12ea68f371 description: Don't cut 'xmpp:' when a copy xmpp link. diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r db7e0a4633f6 -r cd12ea68f371 src/conversation_textview.py --- a/src/conversation_textview.py Fri Feb 17 11:06:43 2012 +0400 +++ b/src/conversation_textview.py Fri Feb 17 11:17:35 2012 +0400 @@ -925,7 +925,8 @@ childs[7].hide() # hide add to roster menuitem if kind == 'xmpp': - id_ = childs[0].connect('activate', self.on_copy_link_activate, text) + id_ = childs[0].connect('activate', self.on_copy_link_activate, + 'xmpp:' + text) self.handlers[id_] = childs[0] childs[2].hide() # copy mail address childs[3].hide() # open mail composer

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