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

improved esession auth messages

This commit is contained in:
Brendan Taylor 2008-07-09 03:10:50 +00:00
parent 95c6df4fdc
commit ebcb659196
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/glade/esession_info_window.glade
View File

@ -39,7 +39,7 @@
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">This contact's identity has not been verified.</property>
<property name="label" translatable="yes">To be certain that only the expected person can read your messages or send you messages, you need to verify their identity.</property>
<property name="wrap">True</property>
<property name="width_chars">0</property>
</widget>
@ -53,7 +53,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Verify now</property>
<property name="label" translatable="yes">Verify remote identity</property>
<property name="wrap">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_verify_now_button_clicked"/>
</widget>

2
src/chat_control.py
View File

@ -1602,7 +1602,7 @@ class ChatControl(ChatControlBase):
ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
if not self.session.verified_identity:
ChatControlBase.print_conversation_line(self, 'SAS not verified', 'status', '', None)
ChatControlBase.print_conversation_line(self, _("Remote contact's identity not verified. Click the shield button for more details."), 'status', '', None)
else:
msg = _('E2E encryption disabled')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None)

4
src/dialogs.py
View File

@ -3804,7 +3804,7 @@ class ESessionInfoWindow:
self.window.show_all()
def update_info(self):
labeltext = _('''Your chat session with %s is encrypted.\n\nSAS is: %s''') % (self.session.jid, self.session.sas)
labeltext = _('''Your chat session with %s is encrypted.\n\nThis session's Short Authentication String is: %s''') % (self.session.jid, self.session.sas)
if self.session.verified_identity:
labeltext += '\n\n' + _('''You have already verified this contact's identity.''')
@ -3823,7 +3823,7 @@ class ESessionInfoWindow:
def on_verify_now_button_clicked(self, widget):
pritext = _('''Have you verified the remote contact's identity?''')
sectext = _('''To prevent a man-in-the-middle attack, you should speak to %s directly (in person or on the phone) and verify that they see the same SAS as you.\n\nThis session's SAS: <b>%s</b>''') % (self.session.jid, self.session.sas)
sectext = _('''To prevent a man-in-the-middle attack, you should speak to %s directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n\nThis session's Short Authentication String: <b>%s</b>''') % (self.session.jid, self.session.sas)
sectext += '\n\n' + _('Did you talk to the remote contact and verify the SAS?')
dialog = YesNoDialog(pritext, sectext)