diff --git a/plugins/gtkgui/dialogs.py b/plugins/gtkgui/dialogs.py index 4f8286f8f..a5a558d49 100644 --- a/plugins/gtkgui/dialogs.py +++ b/plugins/gtkgui/dialogs.py @@ -3,8 +3,8 @@ ## Gajim Team: ## - Yann Le Boulanger ## - Vincent Hanquez -## - Nikos Kouremenos -## - Alex Podaras +## - Nikos Kouremenos +## - Alex Podaras ## ## Copyright (C) 2003-2005 Gajim Team ## @@ -217,8 +217,10 @@ class Edit_groups_dialog: self.account = account self.user = user self.list = self.xml.get_widget('groups_treeview') - self.xml.get_widget('nickname_label').set_text(_('Edit groups for %s') % user.name) - self.xml.get_widget('jid_label').set_text(user.jid) + self.xml.get_widget('nickname_label').set_markup(\ + _('Contact\'s name: %s') % user.name) + self.xml.get_widget('jid_label').set_markup(\ + _('JID: %s') % user.jid) self.xml.signal_autoconnect(self) self.init_list() @@ -529,7 +531,8 @@ class About_dialog: dlg.set_comments('A GTK jabber client') dlg.set_website('http://www.gajim.org') - authors = ['Yann Le Boulanger', 'Vincent Hanquez', 'Nikos Kouremenos', 'Alex Podaras'] + + authors = ['Yann Le Boulanger ', 'Vincent Hanquez ', 'Nikos Kouremenos ', 'Alex Podaras '] dlg.set_authors(authors) dlg.set_logo(gtk.gdk.pixbuf_new_from_file('plugins/gtkgui/pixmaps/logo.png')) dlg.set_translator_credits(_('translator_credits')) diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade index bd033de83..3900d31ea 100644 --- a/plugins/gtkgui/gtkgui.glade +++ b/plugins/gtkgui/gtkgui.glade @@ -1843,7 +1843,7 @@ 0 0 0 - I would like to add you to my contact list, please. + I would like to add you to my contact list. @@ -8355,7 +8355,7 @@ Custom GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False - False + True False True False @@ -8414,7 +8414,7 @@ Custom True False - True + False GTK_JUSTIFY_LEFT False False @@ -8435,7 +8435,7 @@ Custom True False - False + True GTK_JUSTIFY_LEFT False False diff --git a/plugins/gtkgui/roster_window.py b/plugins/gtkgui/roster_window.py index 9b5ec5b19..af8988df0 100644 --- a/plugins/gtkgui/roster_window.py +++ b/plugins/gtkgui/roster_window.py @@ -197,7 +197,7 @@ class roster_window: model.set_value(iter, 0, img) model.set_value(iter, 1, name) - def makemenu(self): + def make_menu(self): """create the browse agents, add contact & join groupchat sub menus""" # try to avoid WIDGET_REALIZED_FOR_EVENT failed which freezes gajim new_message_menuitem = self.xml.get_widget('new_message_menuitem') @@ -289,7 +289,7 @@ class roster_window: def draw_roster(self): """Clear and draw roster""" - self.makemenu() + self.make_menu() self.tree.get_model().clear() for acct in self.contacts.keys(): self.add_account_to_roster(acct) @@ -444,10 +444,8 @@ class roster_window: item = gtk.MenuItem(_('Rerequest authorization from')) sub_menu.append(item) item.connect('activate', self.req_sub, jid, \ - _('I would like to add you to my contact list, please.'), account) + _('I would like to add you to my contact list.'), account) - item = gtk.MenuItem() - menu.append(item) item = gtk.MenuItem(_('Remove')) menu.append(item) item.connect('activate', self.on_req_usub, user, account)