[Tkabber-dev] r2092 - in trunk/tkabber-plugins: . otr otr/msgs otr/tclotr otr/trans

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sat Jan 25 22:06:25 MSK 2014


Author: sergei
Date: 2014-01-25 22:06:25 +0400 (Sat, 25 Jan 2014)
New Revision: 2092

Modified:
   trunk/tkabber-plugins/ChangeLog
   trunk/tkabber-plugins/otr/msgs/ru.msg
   trunk/tkabber-plugins/otr/otr.tcl
   trunk/tkabber-plugins/otr/tclotr/otr.tcl
   trunk/tkabber-plugins/otr/trans/ru.msg
Log:
	* otr/tclotr/otr.tcl: Show an info message when private conversation
	  is finished.

	* otr/otr.tcl: Translate outgoing OTR error messages.

	* otr/msgs/ru.msg, otr/trans/ru.msg: Update Russian translatinos.


Modified: trunk/tkabber-plugins/ChangeLog
===================================================================
--- trunk/tkabber-plugins/ChangeLog	2014-01-25 17:11:08 UTC (rev 2091)
+++ trunk/tkabber-plugins/ChangeLog	2014-01-25 18:06:25 UTC (rev 2092)
@@ -15,6 +15,13 @@
 
 	* otr/msgs/ru.msg: Updated Russian translations.
 
+	* otr/tclotr/otr.tcl: Show an info message when private conversation
+	  is finished.
+
+	* otr/otr.tcl: Translate outgoing OTR error messages.
+
+	* otr/msgs/ru.msg, otr/trans/ru.msg: Update Russian translatinos.
+
 2014-01-24  Sergei Golovan <sgolovan at nes.ru>
 
 	* otr/key.tcl, otr/otr.tcl: Finish all existing OTR sessions for a

Modified: trunk/tkabber-plugins/otr/msgs/ru.msg
===================================================================
--- trunk/tkabber-plugins/otr/msgs/ru.msg	2014-01-25 17:11:08 UTC (rev 2091)
+++ trunk/tkabber-plugins/otr/msgs/ru.msg	2014-01-25 18:06:25 UTC (rev 2092)
@@ -183,3 +183,5 @@
 	начат заново"
 ::msgcat::mcset ru "Private conversation is started" "Защищенный разговор\
 	начат"
+::msgcat::mcset ru "Private conversation is finished" "Защищенный разговор\
+	закончен"

Modified: trunk/tkabber-plugins/otr/otr.tcl
===================================================================
--- trunk/tkabber-plugins/otr/otr.tcl	2014-01-25 17:11:08 UTC (rev 2091)
+++ trunk/tkabber-plugins/otr/otr.tcl	2014-01-25 18:06:25 UTC (rev 2092)
@@ -267,6 +267,13 @@
 	if {[info exists type] && $type eq "chat"} break
     }
 
+    # Another dirty hack to translate OTR error messages
+    if {![catch {::otr::data::findErrorMessage $message} error]} {
+	set lang [get_jid_presence_info lang $xlib $jid]
+
+	set message [::otr::data::errorMessage [::trans::trans $lang $error]]
+    }
+
     if {[info exists type] && $type eq "chat"} {
 	set targs [list -type $type]
     } else {

Modified: trunk/tkabber-plugins/otr/tclotr/otr.tcl
===================================================================
--- trunk/tkabber-plugins/otr/tclotr/otr.tcl	2014-01-25 17:11:08 UTC (rev 2091)
+++ trunk/tkabber-plugins/otr/tclotr/otr.tcl	2014-01-25 18:06:25 UTC (rev 2092)
@@ -1527,6 +1527,17 @@
 
     if {$state(storedmsgstate) eq $state(msgstate)} return
 
+    switch -- $state(storedmsgstate) {
+        MSGSTATE_ENCRYPTED {
+            switch -- $state(msgstate) {
+                MSGSTATE_FINISHED  -
+                MSGSTATE_PLAINTEXT {
+                    CallBack $token info "Private conversation is finished"
+                }
+            }
+        }
+    }
+
     set state(storedmsgstate) $state(msgstate)
     switch -- $state(msgstate) {
         MSGSTATE_PLAINTEXT {

Modified: trunk/tkabber-plugins/otr/trans/ru.msg
===================================================================
--- trunk/tkabber-plugins/otr/trans/ru.msg	2014-01-25 17:11:08 UTC (rev 2091)
+++ trunk/tkabber-plugins/otr/trans/ru.msg	2014-01-25 18:06:25 UTC (rev 2092)
@@ -1,4 +1,4 @@
-# $id$
+# $Id$
 
 ::trans::trset ru "%s has requested an Off-the-Record private conversation\
 	<http://otr.cypherpunks.ca/>. However, you do not have a plugin to\
@@ -7,3 +7,7 @@
 	протоколу OTR <http://otr.cypherpunks.ca/>. Однако, у вас нет\
 	расширения, которе поддерживает этот протокол. Подробности по\
 	ссылке http://otr.cypherpunks.ca/"
+::trans::trset ru "Encrypted message can't be deciphered" "Зашифрованное\
+	сообщение не удалось расшифровать"
+::trans::trset ru "Unmatched protocol versions" "Несовпадающие версии\
+	протокола"



More information about the Tkabber-dev mailing list