[Tkabber-dev] r988 - in trunk/tkabber: . msgs

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Feb 28 23:08:31 MSK 2007


Author: sergei
Date: 2007-02-28 23:08:28 +0300 (Wed, 28 Feb 2007)
New Revision: 988

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/msgs/de.msg
   trunk/tkabber/msgs/ru.msg
   trunk/tkabber/privacy.tcl
Log:
	* privacy.tcl: Added own JID to privacy lists, making communication
	  between own different resources possible even if messages from
	  users, which aren't in the roster, are blocked.

	* msgs/ru.msg: Updated Russian translation.

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


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-02-28 18:54:51 UTC (rev 987)
+++ trunk/tkabber/ChangeLog	2007-02-28 20:08:28 UTC (rev 988)
@@ -16,6 +16,15 @@
 	  privacy rule for conferences, to allow joining them even if they
 	  aren't in the roster.
 
+	* privacy.tcl: Added own JID to privacy lists, making communication
+	  between own different resources possible even if messages from
+	  users, which aren't in the roster, are blocked.
+
+	* msgs/ru.msg: Updated Russian translation.
+
+	* msgs/de.msg: Updated German translation (thanks to Roger
+	  Sondermann).
+
 2007-02-27  Sergei Golovan  <sgolovan at nes.ru>
 
 	* plugins/general/remote.tcl, trans/pl.msg, trans/uk.msg,

Modified: trunk/tkabber/msgs/de.msg
===================================================================
--- trunk/tkabber/msgs/de.msg	2007-02-28 18:54:51 UTC (rev 987)
+++ trunk/tkabber/msgs/de.msg	2007-02-28 20:08:28 UTC (rev 988)
@@ -53,7 +53,7 @@
 ::msgcat::mcset de "Your new Tkabber config directory is now:\n%s\nYou can delete the old one:\n%s" "Der neue Tkabber Konfigurations-Ordner ist:\n%s\nDer bisherige kann gelöscht werden:\n%s"
 
 # .../custom.tcl
-::msgcat::mcset de "Customization of the One True Jabber Client."           "Einstellungen für den einzig wahren Jabber Client."
+::msgcat::mcset de "Customization of the One True Jabber Client."           "Einstellungen für den einzig wahren Jabber-Client."
 ::msgcat::mcset de "Open"                                                   "Öffnen"
 ::msgcat::mcset de "Parent group"                                           "Übergeordnete Gruppe"
 ::msgcat::mcset de "Parent groups"                                          "Übergeordnete Gruppen"
@@ -100,7 +100,7 @@
 ::msgcat::mcset de "Clear window"                                           "Fenster leeren"
 ::msgcat::mcset de "Delete current node and subnodes"                       "Aktuellen Knoten und Sub-Knoten löschen"
 ::msgcat::mcset de "Delete subnodes"                                        "Sub-Knoten löschen"
-::msgcat::mcset de "Discover service"                                       "Dienste entdecken"
+::msgcat::mcset de "Discover service"                                       "Service Discovery"
 ::msgcat::mcset de "Discovery"                                              "Discovery"
 ::msgcat::mcset de "Error getting info: %s"                                 "Fehler beim Erhalten der Information: %s"
 ::msgcat::mcset de "Error getting items: %s"                                "Fehler beim Erhalten der Einträge: %s"
@@ -128,16 +128,16 @@
 ::msgcat::mcset de "Action"                                                 "Aktion"
 ::msgcat::mcset de "Blocking communication options."                        "Optionen für das Blockieren der Kommunikation."
 ::msgcat::mcset de "Condition"                                              "Bedingung"
-::msgcat::mcset de "Edit"                                                   "Editieren"
-::msgcat::mcset de "Edit message filters"                                   "Nachrichten-Filter editieren"
-::msgcat::mcset de "Edit rule"                                              "Regel editieren"
+::msgcat::mcset de "Edit"                                                   "Ändern"
+::msgcat::mcset de "Edit message filters"                                   "Nachrichten-Filter ändern"
+::msgcat::mcset de "Edit rule"                                              "Regel ändern"
 ::msgcat::mcset de "Empty rule name"                                        "Leerer Regel-Name"
 ::msgcat::mcset de "Enable jabberd 1.4 mod_filter support (obsolete)."      "'jabberd 1.4 mod_filter'-Unterstützung aktivieren (veraltet)."
 ::msgcat::mcset de "Filters"                                                "Filter"
 ::msgcat::mcset de "I'm not online"                                         "Ich bin nicht 'Online'"
 ::msgcat::mcset de "Move down"                                              "Nach unten"
 ::msgcat::mcset de "Move up"                                                "Nach oben"
-::msgcat::mcset de "Requesting filter rules: %s"                            "Fordere Filter-Regeln ab: %s"
+::msgcat::mcset de "Requesting filter rules: %s"                            "Fordere Filter-Regeln an: %s"
 ::msgcat::mcset de "Rule Name:"                                             "Regel-Name"
 ::msgcat::mcset de "Rule name already exists"                               "Regel-Name existiert bereits"
 ::msgcat::mcset de "change message type to"                                 "ändere Nachrichten-Typ zu"
@@ -215,6 +215,7 @@
 ::msgcat::mcset de "&Help"                                                  "&Hilfe"
 ::msgcat::mcset de "&Services"                                              "&Dienste"
 ::msgcat::mcset de "About"                                                  "Über Tkabber..."
+::msgcat::mcset de "Accept messages from roster users only"                 "Nur Nachrichten von Benutzern im Roster akzeptieren"
 ::msgcat::mcset de "Activate lists at startup"                              "Listen beim Start aktivieren"
 ::msgcat::mcset de "Activate search panel"                                  "Such-Leiste aktivieren"
 ::msgcat::mcset de "Add group by regexp on JIDs..."                         "Gruppe unter Verwendung 'Regulärer Ausdrücke' auf JIDs hinzufügen..."
@@ -242,6 +243,7 @@
 ::msgcat::mcset de "Disconnected"                                           "Nicht verbunden"
 ::msgcat::mcset de "Do not disturb"                                         "Bitte nicht stören"
 ::msgcat::mcset de "Do nothing"                                             "Nichts machen"
+::msgcat::mcset de "Edit conference list "                                  "Konferenzen-Liste ändern..."
 ::msgcat::mcset de "Edit ignore list "                                      "'Ignorieren'-Liste ändern..."
 ::msgcat::mcset de "Edit invisible list "                                   "'Unsichtbar'-Liste ändern..."
 ::msgcat::mcset de "Edit my info..."                                        "Eigene Informationen ändern..."
@@ -1200,17 +1202,20 @@
 ::msgcat::mcset de "is unavailable"                                         "ist nicht verfügbar"
 
 # .../privacy.tcl
-::msgcat::mcset de "Activate visible/invisible/ignore lists before sending initial presence." "'Sichtbar'-/'Unsichtbar'-/'Ignorieren'-Listen vor dem Senden der einleitenden Präsenz aktivieren."
+::msgcat::mcset de "Accept messages from users, which are in the roster, only." "Nur Nachrichten von Benutzern akzeptieren, die auch im Roster sind."
+::msgcat::mcset de "Activate visible/invisible/ignore/conference lists before sending initial presence." "'Sichtbar'-/'Unsichtbar'-/'Ignorieren'-/Konferenzen-Listen vor dem Senden der einleitenden Präsenz aktivieren."
 ::msgcat::mcset de "Activating privacy list failed: %s\n\nTry to reconnect. If problem persists, you may want to disable privacy list activation at start" "Aktivierung der Privatsphären-Listen misslungen: %s\n\nVersuchen Sie eine erneute Verbindung mit dem Server. Wenn das Problem bestehen bleibt, entfernen Sie die Aktivierung der Privatsphären-Listen beim Start."
 ::msgcat::mcset de "Active"                                                 "Aktiv"
 ::msgcat::mcset de "Add JID"                                                "JID hinzufügen"
 ::msgcat::mcset de "Add item"                                               "Eintrag hinzufügen"
 ::msgcat::mcset de "Add list"                                               "Liste hinzufügen"
 ::msgcat::mcset de "Blocking communication (XMPP privacy lists) options."   "Optionen für das Blockieren der Kommunikation (XMPP-Privatsphären-Listen)."
+::msgcat::mcset de "Conference list"                                        "Konferenzen-Liste"
 ::msgcat::mcset de "Creating default privacy list"                          "Erstelle voreingestellte Privatsphären-Liste"
 ::msgcat::mcset de "Creating default privacy list failed: %s\n\nTry to reconnect. If problem persists, you may want to disable privacy list activation at start" "Erstellung der voreingestellten Privatsphären-Listen misslungen: %s\n\nVersuchen Sie eine erneute Verbindung mit dem Server. Wenn das Problem bestehen bleibt, entfernen Sie die Aktivierung der Privatsphären-Listen beim Start."
 ::msgcat::mcset de "Default"                                                "Voreinstellung"
 ::msgcat::mcset de "Down"                                                   "Abwärts"
+::msgcat::mcset de "Edit conference list"                                   "Konferenzen-Liste ändern"
 ::msgcat::mcset de "Edit ignore list"                                       "'Ignorieren'-Liste ändern"
 ::msgcat::mcset de "Edit invisible list"                                    "'Unsichtbar'-Liste ändern"
 ::msgcat::mcset de "Edit list"                                              "Liste ändern"
@@ -1233,11 +1238,13 @@
 ::msgcat::mcset de "Privacy lists error"                                    "Privatsphären-Listen-Fehler"
 ::msgcat::mcset de "Remove from list"                                       "Von Liste entfernen"
 ::msgcat::mcset de "Remove list"                                            "Liste entfernen"
+::msgcat::mcset de "Requesting converence list: %s"                         "Fordere Konferenzen-Liste an: %s"
 ::msgcat::mcset de "Requesting privacy list: %s"                            "Fordere Privatsphären-Liste an: %s"
 ::msgcat::mcset de "Requesting privacy rules: %s"                           "Fordere Privatsphären-Regeln an: %s"
 ::msgcat::mcset de "Requesting ignore list: %s"                             "Fordere 'Ignorieren'-Liste an: %s"
 ::msgcat::mcset de "Requesting invisible list: %s"                          "Fordere 'Unsichtbar'-Liste an: %s"
 ::msgcat::mcset de "Requesting visible list: %s"                            "Fordere 'Sichtbar'-Liste an: %s"
+::msgcat::mcset de "Sending conference list: %s"                            "Sende Konferenzen-Liste: %s"
 ::msgcat::mcset de "Sending ignore list: %s"                                "Sende 'Ignorieren'-Liste: %s"
 ::msgcat::mcset de "Sending invisible list: %s"                             "Sende 'Unsichtbar'-Liste: %s"
 ::msgcat::mcset de "Sending visible list: %s"                               "Sende 'Sichtbar'-Liste: %s"

Modified: trunk/tkabber/msgs/ru.msg
===================================================================
--- trunk/tkabber/msgs/ru.msg	2007-02-28 18:54:51 UTC (rev 987)
+++ trunk/tkabber/msgs/ru.msg	2007-02-28 20:08:28 UTC (rev 988)
@@ -12,13 +12,16 @@
 ::msgcat::mcset ru "Accept connections from my own JID." "Принимать подключение с моего собственного JID."
 ::msgcat::mcset ru "Accept connections from the listed JIDs." "Принимать подключение с перечисленных JID'ы."
 ::msgcat::mcset ru "Accept default config" "Принять конфигурацию по умолчанию"
+::msgcat::mcset ru "Accept messages from users, which are in the roster, only." \
+    "Принимать сообщения только от пользователей, которые есть в списке контактов."
+::msgcat::mcset ru "Accept messages from roster users only" "Принимать сообщения только из контактов"
 ::msgcat::mcset ru "Access Error" "Ошибка доступа"
 ::msgcat::mcset ru "Account" "Учётная запись"
 ::msgcat::mcset ru "Action" "Действие"
 ::msgcat::mcset ru "Activate lists at startup" "Активировать списки при подключении"
 ::msgcat::mcset ru "Activate search panel" "Открыть панель поиска"
-::msgcat::mcset ru "Activate visible/invisible/ignore lists before sending initial presence." \
-    "Активировать видимый/невидимый/игнорируемый списки перед тем, как объявлять о своём присутствии в сети."
+::msgcat::mcset ru "Activate visible/invisible/ignore/conference lists before sending initial presence." \
+    "Активировать видимый/невидимый/игнорируемый списки (и список конференций) перед тем, как объявлять о своём присутствии в сети."
 ::msgcat::mcset ru "Activating privacy list failed: %s\n\nTry to reconnect. If problem persists, you may want to disable privacy list activation at start" \
     "Не удалось активировать список приватности: %s\n\nПопытайтесь подключиться снова. Если проблема остаётся, возможно придётся отключить активацию списков приватности при старте"
 ::msgcat::mcset ru "Active Chats" "Открытые разговоры"
@@ -176,6 +179,7 @@
 ::msgcat::mcset ru "Composing a reply" "Пишет ответ"
 ::msgcat::mcset ru "Condition" "Условие"
 ::msgcat::mcset ru "Conference room %s will be destroyed permanently.\n\nProceed?" "Конференция %s будет удалена.\n\nПродолжить?"
+::msgcat::mcset ru "Conference list" "Список конференций"
 ::msgcat::mcset ru "Conference:" "Конференция:"
 ::msgcat::mcset ru "Conferences" "Конференции"
 ::msgcat::mcset ru "configuration" "конфигурация"
@@ -267,6 +271,8 @@
 ::msgcat::mcset ru "Edit admin list" "Изменить список администраторов"
 ::msgcat::mcset ru "Edit ban list" "Изменить чёрный список"
 ::msgcat::mcset ru "Edit chat user colors" "Изменение цветов псевдонимов"
+::msgcat::mcset ru "Edit conference list" "Изменение списка конференций"
+::msgcat::mcset ru "Edit conference list " "Изменить список конференций"
 ::msgcat::mcset ru "Edit groups for %s" "Изменение групп %s"
 ::msgcat::mcset ru "Edit ignore list" "Изменение игнорируемого списка"
 ::msgcat::mcset ru "Edit ignore list " "Изменить игнорируемый список"
@@ -958,6 +964,7 @@
     "Отвечать на запрос disco#items о MUC-конференциях, в которых Вы принимаете участие."
 ::msgcat::mcset ru "Request Error" "Ошибка запроса"
 ::msgcat::mcset ru "Request failed: %s" "Запрос не удался: %s"
+::msgcat::mcset ru "Requesting converence list: %s" "Запрос списка конференций: %s"
 ::msgcat::mcset ru "Requesting filter rules: %s" "Запрос правил фильтрования: %s"
 ::msgcat::mcset ru "Requesting ignore list: %s" "Запрос игнорируемого списка: %s"
 ::msgcat::mcset ru "Requesting invisible list: %s" "Запрос невидимого списка: %s"
@@ -1046,6 +1053,7 @@
 ::msgcat::mcset ru "Send file via Jidlink..." "Отправить файл через Jidlink..."
 ::msgcat::mcset ru "Send file..." "Отправить файл..."
 ::msgcat::mcset ru "Sending %s %s list" "Отправка %s %s списка"
+::msgcat::mcset ru "Sending conference list: %s" "Отправка списка конференций: %s"
 ::msgcat::mcset ru "Sending configure form" "Отправка конфигурационной формы"
 ::msgcat::mcset ru "Sending ignore list: %s" "Отправка игнорируемого списка: %s"
 ::msgcat::mcset ru "Sending invisible list: %s" "Отправка невидимого списка: %s"

Modified: trunk/tkabber/privacy.tcl
===================================================================
--- trunk/tkabber/privacy.tcl	2007-02-28 18:54:51 UTC (rev 987)
+++ trunk/tkabber/privacy.tcl	2007-02-28 20:08:28 UTC (rev 988)
@@ -1012,6 +1012,17 @@
 	    incr i
 	}
     }
+
+    # Appending myself to the list to make sure we can communicate
+    # between own resources
+
+    lappend items [jlib::wrapper:createtag item \
+		       -vars [list type jid \
+				   value [jlib::connection_bare_jid $connid] \
+				   action allow \
+				   order $i]]
+    incr i
+
     foreach {action vars subtags} $fallbacks {
 	lappend items [jlib::wrapper:createtag item \
 			   -vars [concat [list action $action order $i] $vars] \



More information about the Tkabber-dev mailing list