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

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Wed Dec 25 13:11:43 MSK 2013


Author: sergei
Date: 2013-12-25 13:11:43 +0400 (Wed, 25 Dec 2013)
New Revision: 2026

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/msgs/ru.msg
   trunk/tkabber/proxy.tcl
Log:
	* proxy.tcl: Added the possibility to reset profile to the current one.

	* msgs/ru.msg: Updated Russian translation.


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2013-12-25 09:04:46 UTC (rev 2025)
+++ trunk/tkabber/ChangeLog	2013-12-25 09:11:43 UTC (rev 2026)
@@ -12,6 +12,8 @@
 	* tkabber-remote.tcl: Added a small example with list-commands to the
 	  usage message. Report PIDs of responded Tkabber processes.
 
+	* msgs/ru.msg: Updated Russian translation.
+
 2013-12-24  Sergei Golovan  <sgolovan at nes.ru>
 
 	* README, doc/tkabber.html, doc/tkabber.xml, ifacetk/iface.tcl,

Modified: trunk/tkabber/msgs/ru.msg
===================================================================
--- trunk/tkabber/msgs/ru.msg	2013-12-25 09:04:46 UTC (rev 2025)
+++ trunk/tkabber/msgs/ru.msg	2013-12-25 09:11:43 UTC (rev 2026)
@@ -5,7 +5,6 @@
 # Maintained by: Sergei Golovan <sgolovan at nes.ru>
 #
 #==================================================================
-
 ::msgcat::mcset ru "\n\tActivity: %s" "\n\tЗанятие: %s"
 ::msgcat::mcset ru "\n\tAffiliation: %s" "\n\tРанг: %s"
 ::msgcat::mcset ru "\n\tCan't browse: %s" "\n\tПросмотреть не удалось: %s"
@@ -482,6 +481,7 @@
 ::msgcat::mcset ru "cryptographics" "криптография"
 ::msgcat::mcset ru "curious" "любознательное"
 ::msgcat::mcset ru "Current groups" "Текущие группы"
+::msgcat::mcset ru "Currently active profile" "Текущий действующий профиль"
 ::msgcat::mcset ru "customization" "настройки"
 ::msgcat::mcset ru "Customization of the One True Jabber Client." "Настройка\
 	Истинного клиента Jabber'а."
@@ -501,6 +501,7 @@
 ::msgcat::mcset ru "Default" "По умолчанию"
 ::msgcat::mcset ru "Default directory for downloaded files." "Директория в\
 	которой по умолчанию сохраняются полученные файлы."
+::msgcat::mcset ru "Default empty profile" "Пустой профиль по умолчанию"
 ::msgcat::mcset ru "Default group for conferences in roster." "Группа по\
 	умолчанию для конференций в контактах."
 ::msgcat::mcset ru "Default nested roster group delimiter." "Разделитель\
@@ -1518,6 +1519,8 @@
 ::msgcat::mcset ru "Privacy lists error" "Ошибка списков приватности"
 ::msgcat::mcset ru "Privacy rules" "Обеспечение приватности"
 ::msgcat::mcset ru "Profile" "Профиль"
+::msgcat::mcset ru "Profile from config file" "Профиль из конфигурационного\
+	файла"
 ::msgcat::mcset ru "Profile on" "Включить профилирование"
 ::msgcat::mcset ru "Profile report" "Отчет о профилировании"
 ::msgcat::mcset ru "Profiles" "Профили"

Modified: trunk/tkabber/proxy.tcl
===================================================================
--- trunk/tkabber/proxy.tcl	2013-12-25 09:04:46 UTC (rev 2025)
+++ trunk/tkabber/proxy.tcl	2013-12-25 09:11:43 UTC (rev 2026)
@@ -226,6 +226,8 @@
 	    -command [list [namespace current]::update_proxy_entries $hf $nb $tunnels_page $http_page default]
 	$m add command -label [::msgcat::mc "Profile from config file"] \
 	    -command [list [namespace current]::update_proxy_entries $hf $nb $tunnels_page $http_page config]
+	$m add command -label [::msgcat::mc "Currently active profile"] \
+	    -command [list [namespace current]::update_proxy_entries $hf $nb $tunnels_page $http_page current]
 	for {set i 1} {$i <= $n} {incr i} {
 	    if {[info exists ::proxyconf${i}(profile)]} {
 		set lab [set ::proxyconf${i}(profile)]
@@ -258,6 +260,8 @@
 }
 
 proc proxy::update_proxy_entries {hf nb tunnels_page http_page i} {
+    variable proxylist
+
     switch -- $i {
 	default {
 	    fill_pages $hf $nb $tunnels_page $http_page {tunnels {} http {}}
@@ -265,6 +269,9 @@
 	config {
 	    fill_pages $hf $nb $tunnels_page $http_page [serialize_profile proxyconf]
 	}
+	current {
+	    fill_pages $hf $nb $tunnels_page $http_page $proxylist
+	}
 	default {
 	    fill_pages $hf $nb $tunnels_page $http_page [serialize_profile proxyconf$i]
 	}



More information about the Tkabber-dev mailing list