Commits

commits@gajim.org

17632 discussions

gajim: correctly show nickname when we restore previous conversa...
by Gajim 01 Nov '13

01 Nov '13

changeset b88ad3dcad3d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b88ad3dcad3d description: correctly show nickname when we restore previous conversation lines with chat_merge_consecutive_nickname enabled. Fixes #7534 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 7ba03a1683f2 -r b88ad3dcad3d src/chat_control.py --- a/src/chat_control.py Fri Nov 01 12:08:05 2013 +0100 +++ b/src/chat_control.py Fri Nov 01 19:10:49 2013 +0100 @@ -2978,6 +2978,7 @@ 'remove it (all history will be lost).') % common.logger.LOG_DB_PATH) rows = [] local_old_kind = None + self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message if not row[2]: # message is empty, we don't print it continue

1 0

gajim: fix inviting several contacts to a room. And don't allow ...
by Gajim 01 Nov '13

01 Nov '13

changeset 7ba03a1683f2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7ba03a1683f2 description: fix inviting several contacts to a room. And don't allow to invite transports. Fixes 7527 diffstat: src/gui_menu_builder.py | 12 +++++++++++- src/roster_window.py | 15 ++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diffs (48 lines): diff -r a00b2edfde49 -r 7ba03a1683f2 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/gui_menu_builder.py Fri Nov 01 12:08:05 2013 +0100 @@ -108,8 +108,18 @@ resource = None invite_to_new_room_menuitem.connect('activate', roster.on_invite_to_new_room, list_, resource) + elif len(list_) > 1: + list2 = [] + for (c, a) in list_: + if c.supports(NS_MUC): + list2.append((c, a)) + if len(list2) > 0: + invite_to_new_room_menuitem.connect('activate', + roster.on_invite_to_new_room, list2, None) + else: + invite_menuitem.set_sensitive(False) else: - invite_menuitem.set_sensitive(True) + invite_menuitem.set_sensitive(False) # transform None in 'jabber' c_t = contacts_transport or 'jabber' muc_jid = {} diff -r a00b2edfde49 -r 7ba03a1683f2 src/roster_window.py --- a/src/roster_window.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/roster_window.py Fri Nov 01 12:08:05 2013 +0100 @@ -5756,13 +5756,14 @@ self.on_send_single_message_menuitem_activate, account, list_) # Invite to - invite_menuitem = gtk.ImageMenuItem(_('In_vite to')) - muc_icon = gtkgui_helpers.load_icon('muc_active') - if muc_icon: - invite_menuitem.set_image(muc_icon) - - gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) - menu.append(invite_menuitem) + if group != _('Transports'): + invite_menuitem = gtk.ImageMenuItem(_('In_vite to')) + muc_icon = gtkgui_helpers.load_icon('muc_active') + if muc_icon: + invite_menuitem.set_image(muc_icon) + + gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) + menu.append(invite_menuitem) # Send Custom Status send_custom_status_menuitem = gtk.ImageMenuItem(

1 0

gajim: show transport menu in chat control banner if the chat wi...
by Gajim 31 Oct '13

31 Oct '13

changeset a00b2edfde49 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a00b2edfde49 description: show transport menu in chat control banner if the chat window is with a transport. Fixes #7520 diffstat: src/chat_control.py | 6 +- src/gui_menu_builder.py | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ src/roster_window.py | 133 +----------------------------------------------- 3 files changed, 140 insertions(+), 133 deletions(-) diffs (truncated from 303 to 300 lines): diff -r 142ed443126a -r a00b2edfde49 src/chat_control.py --- a/src/chat_control.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/chat_control.py Thu Oct 31 15:14:06 2013 +0100 @@ -2645,7 +2645,11 @@ tranasports) and file_transfer_menuitem and hide()/show() for add_to_roster_menuitem """ - menu = gui_menu_builder.get_contact_menu(self.contact, self.account, + if gajim.jid_is_transport(self.contact.jid): + menu = gui_menu_builder.get_transport_menu(self.contact, + self.account) + else: + menu = gui_menu_builder.get_contact_menu(self.contact, self.account, use_multiple_contacts=False, show_start_chat=False, show_encryption=True, control=self, show_buttonbar_items=not hide_buttonbar_items) diff -r 142ed443126a -r a00b2edfde49 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/gui_menu_builder.py Thu Oct 31 15:14:06 2013 +0100 @@ -508,3 +508,137 @@ contact_context_menu.connect('selection-done', gtkgui_helpers.destroy_widget) contact_context_menu.show_all() return contact_context_menu + +def get_transport_menu(contact, account): + roster = gajim.interface.roster + jid = contact.jid + + menu = gtk.Menu() + + # Send single message + item = gtk.ImageMenuItem(_('Send Single _Message...')) + icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) + item.set_image(icon) + item.connect('activate', roster.on_send_single_message_menuitem_activate, + account, contact) + menu.append(item) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + blocked = False + if helpers.jid_is_blocked(account, jid): + blocked = True + + # Send Custom Status + send_custom_status_menuitem = gtk.ImageMenuItem(_('Send Cus_tom Status')) + # add a special img for this menuitem + if blocked: + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + 'offline')) + send_custom_status_menuitem.set_sensitive(False) + else: + if account in gajim.interface.status_sent_to_users and \ + jid in gajim.interface.status_sent_to_users[account]: + send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( + gajim.interface.status_sent_to_users[account][jid])) + else: + icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, + gtk.ICON_SIZE_MENU) + send_custom_status_menuitem.set_image(icon) + status_menuitems = gtk.Menu() + send_custom_status_menuitem.set_submenu(status_menuitems) + iconset = gajim.config.get('iconset') + path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): + # icon MUST be different instance for every item + state_images = gtkgui_helpers.load_iconset(path) + status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) + status_menuitem.connect('activate', roster.on_send_custom_status, + [(contact, account)], s) + icon = state_images[s] + status_menuitem.set_image(icon) + status_menuitems.append(status_menuitem) + menu.append(send_custom_status_menuitem) + if gajim.account_is_disconnected(account): + send_custom_status_menuitem.set_sensitive(False) + + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + + # Execute Command + item = gtk.ImageMenuItem(_('E_xecute Command...')) + icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) + item.set_image(icon) + menu.append(item) + item.connect('activate', roster.on_execute_command, contact, account, + contact.resource) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Manage Transport submenu + item = gtk.ImageMenuItem(_('_Manage Transport')) + icon = gtk.image_new_from_stock(gtk.STOCK_PROPERTIES, gtk.ICON_SIZE_MENU) + item.set_image(icon) + manage_transport_submenu = gtk.Menu() + item.set_submenu(manage_transport_submenu) + menu.append(item) + + # Modify Transport + item = gtk.ImageMenuItem(_('_Modify Transport')) + icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, gtk.ICON_SIZE_MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + item.connect('activate', roster.on_edit_agent, contact, account) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Rename + item = gtk.ImageMenuItem(_('_Rename...')) + # add a special img for rename menuitem + gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') + manage_transport_submenu.append(item) + item.connect('activate', roster.on_rename, 'agent', jid, account) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + item = gtk.SeparatorMenuItem() # separator + manage_transport_submenu.append(item) + + # Block + if blocked: + item = gtk.ImageMenuItem(_('_Unblock')) + item.connect('activate', roster.on_unblock, [(contact, account)]) + else: + item = gtk.ImageMenuItem(_('_Block')) + item.connect('activate', roster.on_block, [(contact, account)]) + + icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + # Remove + item = gtk.ImageMenuItem(_('Remo_ve')) + icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) + item.set_image(icon) + manage_transport_submenu.append(item) + item.connect('activate', roster.on_remove_agent, [(contact, account)]) + if gajim.account_is_disconnected(account): + item.set_sensitive(False) + + item = gtk.SeparatorMenuItem() # separator + menu.append(item) + + # Information + information_menuitem = gtk.ImageMenuItem(_('_Information')) + icon = gtk.image_new_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_MENU) + information_menuitem.set_image(icon) + menu.append(information_menuitem) + information_menuitem.connect('activate', roster.on_info, contact, account) + if gajim.account_is_disconnected(account): + information_menuitem.set_sensitive(False) + + menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() + return menu \ No newline at end of file diff -r 142ed443126a -r a00b2edfde49 src/roster_window.py --- a/src/roster_window.py Thu Oct 31 10:32:39 2013 +0100 +++ b/src/roster_window.py Thu Oct 31 15:14:06 2013 +0100 @@ -5993,140 +5993,9 @@ path = model.get_path(titer) account = model[titer][C_ACCOUNT].decode('utf-8') contact = gajim.contacts.get_contact_with_highest_priority(account, jid) - menu = gtk.Menu() - - # Send single message - item = gtk.ImageMenuItem(_('Send Single _Message...')) - icon = gtk.image_new_from_stock(gtk.STOCK_NEW, gtk.ICON_SIZE_MENU) - item.set_image(icon) - item.connect('activate', - self.on_send_single_message_menuitem_activate, account, contact) - menu.append(item) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - blocked = False - if helpers.jid_is_blocked(account, jid): - blocked = True - - # Send Custom Status - send_custom_status_menuitem = gtk.ImageMenuItem( - _('Send Cus_tom Status')) - # add a special img for this menuitem - if blocked: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( - 'offline')) - send_custom_status_menuitem.set_sensitive(False) - else: - if account in gajim.interface.status_sent_to_users and \ - jid in gajim.interface.status_sent_to_users[account]: - send_custom_status_menuitem.set_image(gtkgui_helpers.load_icon( - gajim.interface.status_sent_to_users[account][jid])) - else: - icon = gtk.image_new_from_stock(gtk.STOCK_NETWORK, - gtk.ICON_SIZE_MENU) - send_custom_status_menuitem.set_image(icon) - status_menuitems = gtk.Menu() - send_custom_status_menuitem.set_submenu(status_menuitems) - iconset = gajim.config.get('iconset') - path = os.path.join(helpers.get_iconset_path(iconset), '16x16') - for s in ('online', 'chat', 'away', 'xa', 'dnd', 'offline'): - # icon MUST be different instance for every item - state_images = gtkgui_helpers.load_iconset(path) - status_menuitem = gtk.ImageMenuItem(helpers.get_uf_show(s)) - status_menuitem.connect('activate', self.on_send_custom_status, - [(contact, account)], s) - icon = state_images[s] - status_menuitem.set_image(icon) - status_menuitems.append(status_menuitem) - menu.append(send_custom_status_menuitem) - if gajim.account_is_disconnected(account): - send_custom_status_menuitem.set_sensitive(False) - - item = gtk.SeparatorMenuItem() # separator - menu.append(item) - - # Execute Command - item = gtk.ImageMenuItem(_('E_xecute Command...')) - icon = gtk.image_new_from_stock(gtk.STOCK_EXECUTE, gtk.ICON_SIZE_MENU) - item.set_image(icon) - menu.append(item) - item.connect('activate', self.on_execute_command, contact, account, - contact.resource) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Manage Transport submenu - item = gtk.ImageMenuItem(_('_Manage Transport')) - icon = gtk.image_new_from_stock(gtk.STOCK_PROPERTIES, - gtk.ICON_SIZE_MENU) - item.set_image(icon) - manage_transport_submenu = gtk.Menu() - item.set_submenu(manage_transport_submenu) - menu.append(item) - - # Modify Transport - item = gtk.ImageMenuItem(_('_Modify Transport')) - icon = gtk.image_new_from_stock(gtk.STOCK_PREFERENCES, - gtk.ICON_SIZE_MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - item.connect('activate', self.on_edit_agent, contact, account) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Rename - item = gtk.ImageMenuItem(_('_Rename...')) - # add a special img for rename menuitem - gtkgui_helpers.add_image_to_menuitem(item, 'gajim-kbd_input') - manage_transport_submenu.append(item) - item.connect('activate', self.on_rename, 'agent', jid, account) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - item = gtk.SeparatorMenuItem() # separator - manage_transport_submenu.append(item) - - # Block - if blocked: - item = gtk.ImageMenuItem(_('_Unblock')) - item.connect('activate', self.on_unblock, [(contact, account)]) - else: - item = gtk.ImageMenuItem(_('_Block')) - item.connect('activate', self.on_block, [(contact, account)]) - - icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - # Remove - item = gtk.ImageMenuItem(_('Remo_ve')) - icon = gtk.image_new_from_stock(gtk.STOCK_REMOVE, gtk.ICON_SIZE_MENU) - item.set_image(icon) - manage_transport_submenu.append(item) - item.connect('activate', self.on_remove_agent, [(contact, account)]) - if gajim.account_is_disconnected(account): - item.set_sensitive(False) - - item = gtk.SeparatorMenuItem() # separator - menu.append(item) - - # Information - information_menuitem = gtk.ImageMenuItem(_('_Information')) - icon = gtk.image_new_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_MENU) - information_menuitem.set_image(icon) - menu.append(information_menuitem) - information_menuitem.connect('activate', self.on_info, contact, account) - if gajim.account_is_disconnected(account): - information_menuitem.set_sensitive(False) - + menu = gui_menu_builder.get_transport_menu(contact, account) event_button = gtkgui_helpers.get_possible_button_event(event) - menu.attach_to_widget(self.tree, None) - menu.connect('selection-done', gtkgui_helpers.destroy_widget) - menu.show_all()

1 0

gajim: file_props is no more a dict. Fixes #7518
by Gajim 31 Oct '13

31 Oct '13

changeset 142ed443126a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=142ed443126a description: file_props is no more a dict. Fixes #7518 diffstat: src/chat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 0cb3fc3f8909 -r 142ed443126a src/chat_control.py --- a/src/chat_control.py Thu Oct 31 10:15:55 2013 +0100 +++ b/src/chat_control.py Thu Oct 31 10:32:39 2013 +0100 @@ -3406,9 +3406,9 @@ self._got_file_completed(event.parameters) elif event.type_ in ('file-error', 'file-stopped'): msg_err = '' - if event.parameters['error'] == -1: + if event.parameters.error == -1: msg_err = _('Remote contact stopped transfer') - elif event.parameters['error'] == -6: + elif event.parameters.error == -6: msg_err = _('Error opening file') self._got_file_error(event.parameters, event.type_, _('File transfer stopped'), msg_err)

1 0

gajim: don't crash when we rename local account that is activate...
by Gajim 31 Oct '13

31 Oct '13

changeset 0cb3fc3f8909 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0cb3fc3f8909 description: don't crash when we rename local account that is activated but zeroconf not available. Fixes #7511 diffstat: src/config.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 9b66e4139a59 -r 0cb3fc3f8909 src/config.py --- a/src/config.py Wed Oct 30 21:33:31 2013 +0100 +++ b/src/config.py Thu Oct 31 10:15:55 2013 +0100 @@ -2034,7 +2034,8 @@ def on_rename_button_clicked(self, widget): if not self.current_account: return - active = gajim.config.get_per('accounts', self.current_account, 'active') + active = gajim.config.get_per('accounts', self.current_account, + 'active') and self.current_account in gajim.connections if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( _('You are currently connected to the server'),

1 0

gajim: re-add missing ... in menus. Fixes #7519
by Gajim 30 Oct '13

30 Oct '13

changeset 9b66e4139a59 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9b66e4139a59 description: re-add missing ... in menus. Fixes #7519 diffstat: data/gui/roster_window.ui | 2 +- data/gui/systray_context_menu.ui | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 2dabace4a4f9 -r 9b66e4139a59 data/gui/roster_window.ui --- a/data/gui/roster_window.ui Wed Oct 30 17:50:47 2013 +0100 +++ b/data/gui/roster_window.ui Wed Oct 30 21:33:31 2013 +0100 @@ -34,7 +34,7 @@ <object class="GtkMenu" id="actions_menu_menu"> <child> <object class="GtkImageMenuItem" id="new_chat_menuitem"> - <property name="label" translatable="yes">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> diff -r 2dabace4a4f9 -r 9b66e4139a59 data/gui/systray_context_menu.ui --- a/data/gui/systray_context_menu.ui Wed Oct 30 17:50:47 2013 +0100 +++ b/data/gui/systray_context_menu.ui Wed Oct 30 21:33:31 2013 +0100 @@ -15,7 +15,7 @@ </child> <child> <object class="GtkImageMenuItem" id="chat_with_menuitem"> - <property name="label" translatable="yes">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image2</property>

1 0

gajim: sime cleanup in sound client list. Fixes #7497
by Gajim 30 Oct '13

30 Oct '13

changeset 2dabace4a4f9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=2dabace4a4f9 description: sime cleanup in sound client list. Fixes #7497 diffstat: src/gui_interface.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 324c16fc8f10 -r 2dabace4a4f9 src/gui_interface.py --- a/src/gui_interface.py Wed Oct 30 16:38:01 2013 +0100 +++ b/src/gui_interface.py Wed Oct 30 17:50:47 2013 +0100 @@ -3005,11 +3005,13 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') + commands = ('aplay', 'play', 'ossplay') for command in commands: if helpers.is_in_path(command): - if command == 'aplay': + if command in ('aplay', 'play'): command += ' -q' + elif command == 'ossplay': + command += ' -qq' gajim.config.set('soundplayer', command) break

1 0

gajim: [Maranda] ignore directory category of type server, if an...
by Gajim 30 Oct '13

30 Oct '13

changeset 324c16fc8f10 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=324c16fc8f10 description: [Maranda] ignore directory category of type server, if an identity with server category is present. Fixes #7499 diffstat: src/disco.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diffs (24 lines): diff -r aa7b42be930e -r 324c16fc8f10 src/disco.py --- a/src/disco.py Wed Oct 30 15:28:24 2013 +0100 +++ b/src/disco.py Wed Oct 30 16:38:01 2013 +0100 @@ -942,9 +942,17 @@ Set the window title based on agent info """ # Set the banner and window title - if 'name' in identities[0]: - name = identities[0]['name'] - self.window._set_window_banner_text(self._get_agent_address(), name) + if len(identities) > 1: + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] + + if name: + self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())

1 0

gajim: [Mako] updated japanese translation
by Gajim 30 Oct '13

30 Oct '13

changeset aa7b42be930e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=aa7b42be930e description: [Mako] updated japanese translation diffstat: po/ja.po | 1585 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 789 insertions(+), 796 deletions(-) diffs (truncated from 4334 to 300 lines): diff -r 56d6b88380bb -r aa7b42be930e po/ja.po --- a/po/ja.po Wed Oct 30 14:02:21 2013 +0100 +++ b/po/ja.po Wed Oct 30 15:28:24 2013 +0100 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: Gajim 0.16 ja\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-30 11:20+0200\n" -"PO-Revision-Date: 2013-09-03 10:53+0900\n" +"POT-Creation-Date: 2013-10-30 15:27+0100\n" +"PO-Revision-Date: 2013-10-26 22:03+0900\n" "Last-Translator: Mako N <mako(a)pasero.net>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -25,13 +25,15 @@ msgid "_Personal Events" msgstr "個人イベント (_P)" -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 msgid "_Start Chat..." msgstr "チャットを開始...(_S)" -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 -msgid "Join _Group Chat..." -msgstr "グループチャットに参加...(_G)" +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/systray_context_menu.ui.h:3 +msgid "Join _Group Chat" +msgstr "グループチャットに参加 (_G)" #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." @@ -50,8 +52,9 @@ msgstr "Gmail の受信箱を開く (_O)" #: ../data/gui/account_context_menu.ui.h:9 -msgid "_Modify Account" -msgstr "アカウントを修正 (_M)" +#: ../data/gui/zeroconf_context_menu.ui.h:2 +msgid "_Modify Account..." +msgstr "アカウントを編集...(_M)" #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -172,13 +175,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 ../src/config.py:1267 ../src/config.py:1272 -#: ../src/config.py:1320 ../src/config.py:1423 ../src/config.py:1742 -#: ../src/config.py:1747 ../src/config.py:2339 ../src/config.py:2420 -#: ../src/config.py:2435 ../src/config.py:3716 ../src/config.py:3791 -#: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3147 -#: ../src/roster_window.py:3153 ../src/roster_window.py:3158 +#: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748 +#: ../src/config.py:1753 ../src/config.py:2347 ../src/config.py:2429 +#: ../src/config.py:2444 ../src/config.py:3725 ../src/config.py:3800 +#: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 +#: ../src/dialogs.py:537 ../src/roster_window.py:3157 +#: ../src/roster_window.py:3163 ../src/roster_window.py:3168 msgid "None" msgstr "なし" @@ -187,26 +190,25 @@ msgstr "アカウント" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 -#: ../src/dialogs.py:3570 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 +#: ../src/dialogs.py:3580 msgid "Add" msgstr "追加" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 -#: ../src/dialogs.py:3625 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 +#: ../src/dialogs.py:3635 msgid "Delete" msgstr "削除" -#. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5792 +#: ../data/gui/accounts_window.ui.h:5 msgid "Re_name" msgstr "名前の変更 (_N)" -#. XML Console enable checkbutton -#: ../data/gui/accounts_window.ui.h:6 ../data/gui/xml_console_window.ui.h:3 -msgid "_Enable" -msgstr "有効 (_E)" +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4173 +#: ../src/plugins/gui.py:92 +msgid "Active" +msgstr "有効" #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" @@ -351,9 +353,9 @@ #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 -#: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3089 ../src/roster_window.py:4215 -#: ../src/roster_window.py:5842 +#: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 +#: ../src/roster_window.py:3099 ../src/roster_window.py:4225 +#: ../src/roster_window.py:5859 msgid "General" msgstr "全般" @@ -413,8 +415,8 @@ msgid "Connection" msgstr "接続" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1840 -#: ../src/config.py:2436 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1846 +#: ../src/config.py:2445 msgid "No key selected" msgstr "鍵が選択されていません" @@ -490,8 +492,8 @@ msgstr "E-メール:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1867 -#: ../src/dialogs.py:841 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1873 +#: ../src/dialogs.py:842 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -681,34 +683,32 @@ msgstr "する" #: ../data/gui/archiving_preferences_window.ui.h:3 -#, fuzzy msgid "Prefer" -msgstr "その都度選ぶ" +msgstr "賛成" #: ../data/gui/archiving_preferences_window.ui.h:4 msgid "Concede" -msgstr "認める" +msgstr "追認" #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Forbid" -msgstr "禁止する" +msgstr "禁止" #: ../data/gui/archiving_preferences_window.ui.h:6 msgid "Method Manual" -msgstr "" +msgstr "手動保管" #: ../data/gui/archiving_preferences_window.ui.h:7 msgid "Method Local" -msgstr "" +msgstr "ローカル保管" #: ../data/gui/archiving_preferences_window.ui.h:8 msgid "Method Auto" -msgstr "" +msgstr "自動保管" #: ../data/gui/archiving_preferences_window.ui.h:9 -#, fuzzy msgid "Auto" -msgstr "自動化" +msgstr "自動" #: ../data/gui/atom_entry_window.ui.h:1 msgid "New entry received" @@ -740,8 +740,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5811 -#: ../src/roster_window.py:5938 ../src/roster_window.py:6071 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5828 +#: ../src/roster_window.py:5955 ../src/roster_window.py:6092 msgid "_Unblock" msgstr "遮断の解除 (_U)" @@ -813,16 +813,12 @@ msgid "_Open Email Composer" msgstr "メール作成画面を開く (_O)" -#: ../data/gui/chat_context_menu.ui.h:5 +#: ../data/gui/chat_context_menu.ui.h:5 ../data/gui/roster_window.ui.h:3 #: ../data/gui/subscription_request_popup_menu.ui.h:1 #: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat" msgstr "チャットを開始 (_S)" -#: ../data/gui/chat_context_menu.ui.h:6 -msgid "Join _Group Chat" -msgstr "グループチャットに参加 (_G)" - #: ../data/gui/chat_context_menu.ui.h:7 #: ../data/gui/contact_context_menu.ui.h:24 msgid "_Add to Roster..." @@ -857,57 +853,56 @@ msgstr "#" #: ../data/gui/chat_control.ui.h:8 ../data/gui/groupchat_control.ui.h:8 +#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 +msgid "_Send" +msgstr "送信 (_S)" + +#: ../data/gui/chat_control.ui.h:9 ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/single_message_window.ui.h:6 msgid "Send message" msgstr "メッセージを送信する" -#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) -#: ../data/gui/chat_control.ui.h:10 ../data/gui/groupchat_control.ui.h:10 -#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:322 -msgid "_Send" -msgstr "送信 (_S)" - -#: ../data/gui/chat_control.ui.h:11 +#: ../data/gui/chat_control.ui.h:10 msgid "1" msgstr "1" -#: ../data/gui/chat_control.ui.h:12 +#: ../data/gui/chat_control.ui.h:11 msgid "2" msgstr "2" -#: ../data/gui/chat_control.ui.h:13 +#: ../data/gui/chat_control.ui.h:12 msgid "3" msgstr "3" -#: ../data/gui/chat_control.ui.h:14 +#: ../data/gui/chat_control.ui.h:13 msgid "4" msgstr "4" -#: ../data/gui/chat_control.ui.h:15 +#: ../data/gui/chat_control.ui.h:14 msgid "5" msgstr "5" -#: ../data/gui/chat_control.ui.h:16 +#: ../data/gui/chat_control.ui.h:15 msgid "6" msgstr "6" -#: ../data/gui/chat_control.ui.h:17 +#: ../data/gui/chat_control.ui.h:16 msgid "7" msgstr "7" -#: ../data/gui/chat_control.ui.h:18 +#: ../data/gui/chat_control.ui.h:17 msgid "8" msgstr "8" -#: ../data/gui/chat_control.ui.h:19 +#: ../data/gui/chat_control.ui.h:18 msgid "9" msgstr "9" -#: ../data/gui/chat_control.ui.h:20 +#: ../data/gui/chat_control.ui.h:19 msgid "*" msgstr "*" -#: ../data/gui/chat_control.ui.h:21 ../data/gui/single_message_window.ui.h:3 +#: ../data/gui/chat_control.ui.h:20 ../data/gui/single_message_window.ui.h:3 msgid "0" msgstr "0" @@ -939,7 +934,9 @@ msgid "Start _Chat" msgstr "チャットを開始 (_C)" +#. Send single message #: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4 +#: ../data/gui/systray_context_menu.ui.h:4 ../src/roster_window.py:5999 msgid "Send Single _Message..." msgstr "単発メッセージを送信...(_M)" @@ -950,8 +947,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 -#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5747 -#: ../src/roster_window.py:5906 +#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5759

1 0

gajim: fix showing tooltips of emoticons. fixes #7453
by Gajim 30 Oct '13

30 Oct '13

changeset 56d6b88380bb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=56d6b88380bb description: fix showing tooltips of emoticons. fixes #7453 diffstat: src/conversation_textview.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r b36585e88a82 -r 56d6b88380bb src/conversation_textview.py --- a/src/conversation_textview.py Wed Oct 30 13:44:19 2013 +0100 +++ b/src/conversation_textview.py Wed Oct 30 14:02:21 2013 +0100 @@ -1117,7 +1117,8 @@ # it's an emoticon emot_ascii = possible_emot_ascii_caps anchor = buffer_.create_child_anchor(end_iter) - img = TextViewImage(anchor, special_text) + img = TextViewImage(anchor, + gobject.markup_escape_text(special_text)) animations = gajim.interface.emoticons_animations if not emot_ascii in animations: animations[emot_ascii] = gtk.gdk.PixbufAnimation(

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