Author: bct Date: 2008-07-09 05:10:50 +0200 (Wed, 09 Jul 2008) New Revision: 9903

Modified: trunk/data/glade/esession_info_window.glade trunk/src/chat_control.py trunk/src/dialogs.py Log: improved esession auth messages

Modified: trunk/data/glade/esession_info_window.glade =================================================================== --- trunk/data/glade/esession_info_window.glade 2008-07-09 02:18:36 UTC (rev 9902) +++ trunk/data/glade/esession_info_window.glade 2008-07-09 03:10:50 UTC (rev 9903) @@ -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>

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-09 02:18:36 UTC (rev 9902) +++ trunk/src/chat_control.py 2008-07-09 03:10:50 UTC (rev 9903) @@ -1602,7 +1602,7 @@ 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)

Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2008-07-09 02:18:36 UTC (rev 9902) +++ trunk/src/dialogs.py 2008-07-09 03:10:50 UTC (rev 9903) @@ -3804,7 +3804,7 @@ 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 @@

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)