[Tkabber-dev] r1692 - in trunk/tkabber: . msgs plugins/general

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Fri Feb 27 10:39:04 MSK 2009


Author: sergei
Date: 2009-02-27 10:39:03 +0300 (Fri, 27 Feb 2009)
New Revision: 1692

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/msgs/de.msg
   trunk/tkabber/plugins/general/caps.tcl
Log:
	* plugins/general/caps.tcl: Fixed erroneous emptying features list
	  and added several debug messages.

	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2009-02-25 07:31:28 UTC (rev 1691)
+++ trunk/tkabber/ChangeLog	2009-02-27 07:39:03 UTC (rev 1692)
@@ -1,3 +1,10 @@
+2009-02-27  Sergei Golovan  <sgolovan at nes.ru>
+
+	* plugins/general/caps.tcl: Fixed erroneous emptying features list
+	  and added several debug messages.
+
+	* msgs/de.msg: Updated German translation (thanks to Roger Sondermann).
+
 2009-02-25  Sergei Golovan  <sgolovan at nes.ru>
 
 	* messages.tcl: Added cancelling subscriptions to roster item popup

Modified: trunk/tkabber/msgs/de.msg
===================================================================
--- trunk/tkabber/msgs/de.msg	2009-02-25 07:31:28 UTC (rev 1691)
+++ trunk/tkabber/msgs/de.msg	2009-02-27 07:39:03 UTC (rev 1692)
@@ -1,6 +1,6 @@
 
 # German messages file
-# Roger Sondermann 23.02.2009
+# Roger Sondermann 25.02.2009
 
 # .../chats.tcl
 ::msgcat::mcset de "%s has changed nick to %s."                             "%s hat seinen Nicknamen geändert in %s"
@@ -300,34 +300,37 @@
 ::msgcat::mcset de "Self signed certificate"                                "'Self Signed'-Zertifikat"
 
 # .../messages.tcl
+::msgcat::mcset de "Request subscription"                                   "Autorisierung anfragen"
+::msgcat::mcset de "Grant subscription"                                     "Autorisierung zugestehen"
+::msgcat::mcset de "Request unsubscription"                                 "Zurückziehen der Autorisierung anfragen"
+::msgcat::mcset de "Revoke subscription"                                    "Autorisierung widerrufen"
+
+::msgcat::mcset de "Approve subscription"                                   "Autorisierung genehmigen"
 ::msgcat::mcset de "Attached URL:"                                          "Angehängte URL:"
-::msgcat::mcset de "Approve subscription"                                   "Autorisierung genehmigen"
 ::msgcat::mcset de "Decline subscription"                                   "Autorisierung verweigern"
 ::msgcat::mcset de "Extras from %s"                                         "Extras von %s"
 ::msgcat::mcset de "Extras from:"                                           "Extras von:"
-::msgcat::mcset de "From: "                                                 "Von:"
-::msgcat::mcset de "Grant subscription"                                     "Autorisierung zugestehen"
-::msgcat::mcset de "Group: "                                                "Gruppe:"
+::msgcat::mcset de "From: "                                                 "Von: "
+::msgcat::mcset de "Group: "                                                "Gruppe: "
 ::msgcat::mcset de "List of message destination JIDs."                      "Liste der Nachrichten-Ziel-JIDs."
 ::msgcat::mcset de "Message and Headline options."                          "Optionen für Nachrichten und Headlines."
 ::msgcat::mcset de "Message from:"                                          "Nachricht von:"
 ::msgcat::mcset de "Quote"                                                  "Zitieren"
 ::msgcat::mcset de "Received by:"                                           "Empfangen von:"
-::msgcat::mcset de "Request subscription"                                   "Autorisierung anfragen"
 ::msgcat::mcset de "Reply"                                                  "Antworten"
 ::msgcat::mcset de "Reply subject:"                                         "Antwort-Betreff:"
 ::msgcat::mcset de "Send message"                                           "Nachricht senden"
 ::msgcat::mcset de "Send message to %s"                                     "Nachricht an %s senden"
 ::msgcat::mcset de "Send message to group"                                  "Nachricht an Gruppe senden"
 ::msgcat::mcset de "Send message to group %s"                               "Nachricht an Gruppe %s senden"
-::msgcat::mcset de "Send request to: "                                      "Anfrage senden an:"
+::msgcat::mcset de "Send request to: "                                      "Anfrage senden an: "
 ::msgcat::mcset de "Send subscription request"                              "Autorisierungs-Anfrage senden"
 ::msgcat::mcset de "Send subscription request to %s"                        "Autorisierungs-Anfrage an %s senden"
-::msgcat::mcset de "Subject: "                                              "Betreff:"
+::msgcat::mcset de "Subject: "                                              "Betreff: "
 ::msgcat::mcset de "Subscription request from %s"                           "Autorisierungs-Anfrage von %s"
 ::msgcat::mcset de "Subscription request from:"                             "Autorisierungs-Anfrage von:"
 ::msgcat::mcset de "This message is encrypted."                             "Diese Nachricht ist verschlüsselt."
-::msgcat::mcset de "To: "                                                   "An:"
+::msgcat::mcset de "To: "                                                   "An: "
 
 # .../muc.tcl
 ::msgcat::mcset de " by %s"                                                 " durch %s"
@@ -424,7 +427,7 @@
 ::msgcat::mcset de "Stored user priority."                                  "Gespeicherte Kontakt-Priorität."
 ::msgcat::mcset de "Stored user status."                                    "Gespeicherter Kontakt-Status."
 ::msgcat::mcset de "Stored user text status."                               "Gespeicherter Kontakt-Text-Status."
-::msgcat::mcset de "Unsubscribed from %s"                                   "Autorisierung zurückgezogen"
+::msgcat::mcset de "Unsubscribed from %s"                                   "Autorisierung zurückgezogen von %s"
 ::msgcat::mcset de "You are unsubscribed from %s"                           "Die Autorisierung wurde von %s zurückgezogen"
 ::msgcat::mcset de "doesn't want to be disturbed"                           "wünscht nicht gestört zu werden"
 ::msgcat::mcset de "invalid userstatus value "                              "ungültiger Status-Wert"

Modified: trunk/tkabber/plugins/general/caps.tcl
===================================================================
--- trunk/tkabber/plugins/general/caps.tcl	2009-02-25 07:31:28 UTC (rev 1691)
+++ trunk/tkabber/plugins/general/caps.tcl	2009-02-27 07:39:03 UTC (rev 1692)
@@ -29,7 +29,6 @@
 }
 
 proc caps::hash {identities features extras hash} {
-
     set binidentities {}
     foreach id $identities {
 	lappend binidentities [encoding convertto utf-8 $id]
@@ -72,10 +71,14 @@
 	lappend binextra1 [join $b "<"]
     }
 
+    debugmsg caps "$binidentities; $binfeatures; $binextra1"
+
     set binstr [join [concat [lsort -ascii $binidentities] \
 			     [lsort -ascii $binfeatures] \
 			     $binextra1] "<"]
 
+    debugmsg caps "$binstr"
+
     if {[string equal $binstr ""]} {
 	return ""
     }
@@ -103,8 +106,6 @@
 
 proc caps::info_to_hash {identities features extras hash} {
     set identities2 {}
-    set features {}
-    set extras {}
 
     foreach identity $identities {
 	set category [::xmpp::xml::getAttr $identity category]
@@ -114,6 +115,8 @@
 	lappend identities2 $category/$type/$lang/$name
     }
 
+    debugmsg caps "$identities2; $features; $extras; $hash"
+
     return [hash $identities2 $features $extras $hash]
 }
 
@@ -127,6 +130,8 @@
     lassign [disco::info_query_get_handler $xlib "" "" en] \
 	    status identities features extras
 
+    debugmsg caps "$status; $identities; $features; $extras"
+
     if {![string equal $status result]} return
 
     set ver [info_to_hash $identities $features $extras $options(hash)]
@@ -140,6 +145,8 @@
 
     set caps_node http://tkabber.jabber.ru/#$ver
 
+    debugmsg caps "$caps_node"
+
     return
 }
 



More information about the Tkabber-dev mailing list