copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

marking 1 string for translation, and introducing a better title

This commit is contained in:
Nikos Kouremenos 2005-06-03 10:28:53 +00:00
parent 1ac9feb35a
commit d46e600213
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dialogs.py
View File

@ -135,11 +135,12 @@ class Passphrase_dialog:
self.window.destroy() self.window.destroy()
return passphrase, save_passphrase_checkbutton.get_active() return passphrase, save_passphrase_checkbutton.get_active()
def __init__(self, labeltext, checkbuttontext): def __init__(self, titletext, labeltext, checkbuttontext):
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'passphrase_dialog', APP) self.xml = gtk.glade.XML(GTKGUI_GLADE, 'passphrase_dialog', APP)
self.window = self.xml.get_widget('passphrase_dialog') self.window = self.xml.get_widget('passphrase_dialog')
self.passphrase_entry = self.xml.get_widget('passphrase_entry') self.passphrase_entry = self.xml.get_widget('passphrase_entry')
self.passphrase = -1 self.passphrase = -1
self.window.set_title(titletext)
self.xml.get_widget('message_label').set_text(labeltext) self.xml.get_widget('message_label').set_text(labeltext)
self.xml.get_widget('save_passphrase_checkbutton').set_label(checkbuttontext) self.xml.get_widget('save_passphrase_checkbutton').set_label(checkbuttontext)
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)

11
src/roster_window.py
View File

@ -582,14 +582,14 @@ class Roster_window:
account = model.get_value(iter, 4) account = model.get_value(iter, 4)
user = self.contacts[account][jid][0] user = self.contacts[account][jid][0]
menu = gtk.Menu() menu = gtk.Menu()
item = gtk.MenuItem(_('_Log on')) item = gtk.MenuItem(_('Log _on'))
show = self.contacts[account][jid][0].show show = self.contacts[account][jid][0].show
if show != 'offline' and show != 'error': if show != 'offline' and show != 'error':
item.set_sensitive(False) item.set_sensitive(False)
menu.append(item) menu.append(item)
item.connect('activate', self.on_agent_logging, jid, 'available', account) item.connect('activate', self.on_agent_logging, jid, 'available', account)
item = gtk.MenuItem(_('Log _off')) item = gtk.MenuItem(_('Log o_ff'))
if show == 'offline' or show == 'error': if show == 'offline' or show == 'error':
item.set_sensitive(False) item.set_sensitive(False)
menu.append(item) menu.append(item)
@ -805,13 +805,15 @@ class Roster_window:
if not save_pass and gajim.connections[account].connected < 2: if not save_pass and gajim.connections[account].connected < 2:
passphrase = '' passphrase = ''
w = dialogs.Passphrase_dialog( w = dialogs.Passphrase_dialog(
_('Password Required'),
_('Enter your password for account %s') % account, _('Enter your password for account %s') % account,
'Save password') _('Save password'))
passphrase, save = w.run() passphrase, save = w.run()
if passphrase == -1: if passphrase == -1:
if accountIter: if accountIter:
model.set_value(accountIter, 0, self.jabber_state_images['offline']) model.set_value(accountIter, 0, self.jabber_state_images['offline'])
# gajim.connections[account].connected = 0 # gajim.connections[account].connected = 0
#FIXME: what if no systray? this TBs!!
self.plugin.systray.set_status('offline') self.plugin.systray.set_status('offline')
self.update_status_comboxbox() self.update_status_comboxbox()
return return
@ -836,8 +838,9 @@ class Roster_window:
save = False save = False
else: else:
w = dialogs.Passphrase_dialog( w = dialogs.Passphrase_dialog(
_('Passphrase Required'),
_('Enter GPG key passphrase for account %s') % account, _('Enter GPG key passphrase for account %s') % account,
'Save passphrase') _('Save passphrase'))
passphrase, save = w.run() passphrase, save = w.run()
if passphrase == -1: if passphrase == -1:
passphrase = '' passphrase = ''