[Tkabber-dev] r1251 - in trunk/tkabber: . examples/xrdb msgs

tkabber-svn at jabber.ru tkabber-svn at jabber.ru
Sun Oct 7 00:14:13 MSD 2007


Author: sergei
Date: 2007-10-07 00:14:12 +0400 (Sun, 07 Oct 2007)
New Revision: 1251

Modified:
   trunk/tkabber/ChangeLog
   trunk/tkabber/balloon.tcl
   trunk/tkabber/examples/xrdb/badlop-dark.xrdb
   trunk/tkabber/examples/xrdb/dark.xrdb
   trunk/tkabber/examples/xrdb/dark2.xrdb
   trunk/tkabber/examples/xrdb/green.xrdb
   trunk/tkabber/examples/xrdb/ice.xrdb
   trunk/tkabber/examples/xrdb/light.xrdb
   trunk/tkabber/examples/xrdb/lighthouse.xrdb
   trunk/tkabber/examples/xrdb/ocean-deep.xrdb
   trunk/tkabber/examples/xrdb/teopetuk.xrdb
   trunk/tkabber/examples/xrdb/warm.xrdb
   trunk/tkabber/msgs/ru.msg
Log:
	* balloon.tcl: Cleaned up usage of foreground and background resources
	  for balloon windows. Also, the meaning of padX and padY was changed.

	* examples/xrdb/*: Removed *Balloon*padX and *Balloon*padY resources.

	* msgs/ru.msg: Added translation of user mood, user tune, user
	  activity (thanks to Serge Yudin ans Konstantin Khomoutov).


Modified: trunk/tkabber/ChangeLog
===================================================================
--- trunk/tkabber/ChangeLog	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/ChangeLog	2007-10-06 20:14:12 UTC (rev 1251)
@@ -22,6 +22,14 @@
 	* doc/tkabber.html, doc/tkabber.xml, README: Added info on floatinglog
 	  plugin.
 
+	* balloon.tcl: Cleaned up usage of foreground and background resources
+	  for balloon windows. Also, the meaning of padX and padY was changed.
+
+	* examples/xrdb/*: Removed *Balloon*padX and *Balloon*padY resources.
+
+	* msgs/ru.msg: Added translation of user mood, user tune, user
+	  activity (thanks to Serge Yudin ans Konstantin Khomoutov).
+
 2007-10-05  Sergei Golovan  <sgolovan at nes.ru>
 
 	* jabberlib-tclxml/jabberlib.tcl, doc/tkabber.xml: Removed keep-alive

Modified: trunk/tkabber/balloon.tcl
===================================================================
--- trunk/tkabber/balloon.tcl	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/balloon.tcl	2007-10-06 20:14:12 UTC (rev 1251)
@@ -1,23 +1,23 @@
 # $Id$
 
 
-option add *Balloon.background LightYellow widgetDefault
-option add *Balloon.foreground Black       widgetDefault
+option add *Balloon*background LightYellow widgetDefault
+option add *Balloon*foreground Black       widgetDefault
 option add *Balloon.style      delay       widgetDefault
-option add *Balloon*padX       0           widgetDefault
-option add *Balloon*padY       0           widgetDefault
+option add *Balloon.text.padX  1           widgetDefault
+option add *Balloon.text.padY  1           widgetDefault
 
 
-toplevel .balloon -relief flat -bd 1 -class Balloon
-.balloon configure -background [option get .balloon foreground Balloon]
+toplevel .balloon -bd 0 -class Balloon
 
 bind .balloon <Any-Motion> \
 	 [list balloon::default_balloon .balloon leave %X %Y]
 
-pack [message .balloon.text \
-	  -bg [option get .balloon background Balloon] \
-	  -fg [option get .balloon foreground Balloon] \
-	  -font $font -text "" -aspect 5000 -width 0]
+pack [message .balloon.text -text "" \
+			    -aspect 5000 \
+			    -width 0 \
+			    -relief solid \
+			    -bd 1]
     
 if {$::tcl_platform(platform) == "macintosh"} {
     catch { unsupported1 style .balloon floating sideTitlebar }

Modified: trunk/tkabber/examples/xrdb/badlop-dark.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/badlop-dark.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/badlop-dark.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -251,8 +251,6 @@
 ! Tooltip options
 *Balloon.background:		    #424242
 *Balloon.foreground:		    #ffffff
-*Balloon*padX:			    1
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #424242
 *DynamicHelp.foreground:	    #ffffff
 *Baloon.style:                      delay

Modified: trunk/tkabber/examples/xrdb/dark.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/dark.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/dark.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -197,8 +197,6 @@
 ! Tooltip options
 *Balloon.background:		    #424242
 *Balloon.foreground:		    #ffffff
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #424242
 *DynamicHelp.foreground:	    #ffffff
 

Modified: trunk/tkabber/examples/xrdb/dark2.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/dark2.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/dark2.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -209,8 +209,6 @@
 ! Tooltip options
 *Balloon.background:		    #bfbfae
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #bfbfae
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/examples/xrdb/green.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/green.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/green.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -113,8 +113,6 @@
 
 *Balloon.background:	        ForestGreen
 *Balloon.foreground:	        PaleGreen
-*Balloon*padX:		    0
-*Balloon*padY:		    0
 
 *DynamicHelp.background:        ForestGreen
 *DynamicHelp.foreground:        PaleGreen

Modified: trunk/tkabber/examples/xrdb/ice.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/ice.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/ice.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -205,8 +205,6 @@
 ! Tooltip options
 *Balloon.background:		    #c2c2e3
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #c2c2e3
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/examples/xrdb/light.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/light.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/light.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -207,8 +207,6 @@
 ! Tooltip options
 *Balloon.background:		    #fffae6
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #fffae6
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/examples/xrdb/lighthouse.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/lighthouse.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/lighthouse.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -191,8 +191,6 @@
 ! Tooltip options
 *Balloon.background:		    #ffeeaa
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #ffeeaa
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/examples/xrdb/ocean-deep.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/ocean-deep.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/ocean-deep.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -106,8 +106,6 @@
 ! Tooltip options
 *Balloon.background:              #0c232e
 *Balloon.foreground:              #fffbfb
-*Balloon*padX:                    1
-*Balloon*padY:                    0
 *DynamicHelp.background:          #0c232e
 *DynamicHelp.foreground:          #ffffff
 *Baloon.style:                    delay

Modified: trunk/tkabber/examples/xrdb/teopetuk.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/teopetuk.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/teopetuk.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -206,8 +206,6 @@
 ! Tooltip options
 *Balloon.background:		    #ffeeaa
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #ffeeaa
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/examples/xrdb/warm.xrdb
===================================================================
--- trunk/tkabber/examples/xrdb/warm.xrdb	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/examples/xrdb/warm.xrdb	2007-10-06 20:14:12 UTC (rev 1251)
@@ -230,8 +230,6 @@
 ! Tooltip options
 *Balloon.background:		    #d0b073
 *Balloon.foreground:		    #000000
-*Balloon*padX:			    0
-*Balloon*padY:			    0
 *DynamicHelp.background:	    #d0b073
 *DynamicHelp.foreground:	    #000000
 

Modified: trunk/tkabber/msgs/ru.msg
===================================================================
--- trunk/tkabber/msgs/ru.msg	2007-10-06 20:13:40 UTC (rev 1250)
+++ trunk/tkabber/msgs/ru.msg	2007-10-06 20:14:12 UTC (rev 1251)
@@ -913,7 +913,7 @@
 ::msgcat::mcset ru "Raise new tab." "Размещать новую вкладку поверх остальных."
 ::msgcat::mcset ru "Raw XML" "Окно XML"
 ::msgcat::mcset ru "Read on..." "Читать далее..."
-::msgcat::mcset ru "Reason" "Примечание"
+::msgcat::mcset ru "Reason" "Причина"
 ::msgcat::mcset ru "Reason:" "Причина:"
 ::msgcat::mcset ru "Received/Sent" "Получено/Отправлено"
 ::msgcat::mcset ru "Received by:" "Получено:"
@@ -1547,6 +1547,189 @@
 
 }
 
+# /home/ycbl/tkabber-svn/plugins/pep/user_mood.tcl
+::msgcat::mcset ru "%s's mood changed to %s" "Состояние %s изменилось на %s"
+::msgcat::mcset ru "%s's mood is unset" "Пользователь %s отозвал публикацию своего состояния"
+::msgcat::mcset ru "Cannot publish empty mood" "Вы должны выбрать состояние"
+::msgcat::mcset ru "Mood" "Состояние"
+::msgcat::mcset ru "Mood:" "Состояние:"
+::msgcat::mcset ru "Publish" "Опубликовать"
+::msgcat::mcset ru "Publish user mood" "Опубликовать состояние пользователя"
+::msgcat::mcset ru "Publishing is only possible while being online" "Публикация возможна лишь при активном подключении"
+::msgcat::mcset ru "Unpublish" "Отозвать публикацию"
+::msgcat::mcset ru "Unpublish user mood" "Отозвать публикацию состояния пользователя"
+::msgcat::mcset ru "Unpublishing is only possible while being online" "Отзыв публикации возможен лишь при активном подключении"
+::msgcat::mcset ru "Use connection:" "Соединение:"
+::msgcat::mcset ru "User mood" "Состояние пользователя"
+::msgcat::mcset ru "User mood publishing failed: %s" "Не удалось опубликовать состояние пользователя: %s"
+::msgcat::mcset ru "User mood unpublishing failed: %s" "Не удалось отозвать публикацию состояния пользователя: %s"
+::msgcat::mcset ru "\n\tMood: %s" "\n\tСостояние: %s"
+::msgcat::mcset ru "\n\tUser's mood subscription: %s" "\n\tПодписка на состояние пользователя: %s"
+::msgcat::mcset ru "afraid" "испуганное"
+::msgcat::mcset ru "amazed" "изумлённое"
+::msgcat::mcset ru "angry" "рассерженное"
+::msgcat::mcset ru "annoyed" "раздражённое"
+::msgcat::mcset ru "anxious" "беспокойное"
+::msgcat::mcset ru "aroused" "возбуждённое"
+::msgcat::mcset ru "ashamed" "пристыжённое"
+::msgcat::mcset ru "bored" "скукотища!"
+::msgcat::mcset ru "brave" "всё нипочём"
+::msgcat::mcset ru "calm" "спокойное"
+::msgcat::mcset ru "cold" "равнодушное"
+::msgcat::mcset ru "confused" "в замешательстве"
+::msgcat::mcset ru "contented" "довольное"
+::msgcat::mcset ru "cranky" "недовольное"
+::msgcat::mcset ru "curious" "любознательное"
+::msgcat::mcset ru "depressed" "подавленное"
+::msgcat::mcset ru "disappointed" "разочарованное"
+::msgcat::mcset ru "disgusted" "чувствую отвращение"
+::msgcat::mcset ru "distracted" "растерянное"
+::msgcat::mcset ru "embarrassed" "смущённое"
+::msgcat::mcset ru "excited" "взволнованное"
+::msgcat::mcset ru "flirtatious" "кокетливое"
+::msgcat::mcset ru "frustrated" "расстроенное"
+::msgcat::mcset ru "grumpy" "ворчливое"
+::msgcat::mcset ru "guilty" "виноватое"
+::msgcat::mcset ru "happy" "счастливое"
+::msgcat::mcset ru "hot" "пылаю"
+::msgcat::mcset ru "humbled" "смиренное"
+::msgcat::mcset ru "humiliated" "униженное"
+::msgcat::mcset ru "hungry" "хочу есть"
+::msgcat::mcset ru "hurt" "уязвлённое"
+::msgcat::mcset ru "impressed" "под впечатлением"
+::msgcat::mcset ru "in_awe" "благоговейное"
+::msgcat::mcset ru "in_love" "влюблённое"
+::msgcat::mcset ru "indignant" "возмущённое"
+::msgcat::mcset ru "interested" "заинтересованное"
+::msgcat::mcset ru "intoxicated" "одурманенное"
+::msgcat::mcset ru "invincible" "неукротимое"
+::msgcat::mcset ru "jealous" "ревнивое"
+::msgcat::mcset ru "lonely" "одинокое"
+::msgcat::mcset ru "mean" "сволочное"
+::msgcat::mcset ru "moody" "унылое"
+::msgcat::mcset ru "nervous" "на нервах"
+::msgcat::mcset ru "neutral" "безразличное"
+::msgcat::mcset ru "offended" "обиженное"
+::msgcat::mcset ru "playful" "игривое"
+::msgcat::mcset ru "proud" "горделивое"
+::msgcat::mcset ru "relieved" "гора с плеч"
+::msgcat::mcset ru "remorseful" "раскаиваюсь"
+::msgcat::mcset ru "restless" "неугомонное"
+::msgcat::mcset ru "sad" "печальное"
+::msgcat::mcset ru "sarcastic" "язвительное"
+::msgcat::mcset ru "serious" "серьёзное"
+::msgcat::mcset ru "shocked" "потрясённое"
+::msgcat::mcset ru "shy" "застенчивое"
+::msgcat::mcset ru "sick" "болезненное"
+::msgcat::mcset ru "sleepy" "сонное"
+::msgcat::mcset ru "stressed" "напряжённое"
+::msgcat::mcset ru "surprised" "удивлённое"
+::msgcat::mcset ru "thirsty" "хочу пить"
+::msgcat::mcset ru "worried" "беспокойное"
+
+# /home/ycbl/tkabber-svn/plugins/pep/user_tune.tcl
+::msgcat::mcset ru "%s's tune changed to %s - %s" "Мелодия %s изменилась на %s - %s"
+::msgcat::mcset ru "%s's tune is unset" "Пользователь %s отозвал публикацию своей мелодии"
+::msgcat::mcset ru "Artist:" "Исполнитель:"
+::msgcat::mcset ru "Length:" "Продолжительность:"
+::msgcat::mcset ru "Publish user tune" "Опубликовать мелодию пользователя"
+::msgcat::mcset ru "Source:" "Источник:"
+::msgcat::mcset ru "Track:" "Трек:"
+::msgcat::mcset ru "URI:" "Ссылка:"
+::msgcat::mcset ru "Unpublish user tune" "Отозвать публикацию мелодии пользователя"
+::msgcat::mcset ru "User tune" "Мелодия пользователя"
+::msgcat::mcset ru "User tune publishing failed: %s" "Не удалось опубликовать мелодию пользователя: %s"
+::msgcat::mcset ru "User tune unpublishing failed: %s" "Не удалось отозвать публикацию мелодии пользователя: %s"
+::msgcat::mcset ru "\n\tTune: %s - %s" "\n\tМелодия: %s - %s"
+::msgcat::mcset ru "\n\tUser's tune subscription: %s" "\n\tПодписка на мелодию пользователя: %s"
+
+# /home/ycbl/tkabber-svn/plugins/pep/user_activity.tcl
+::msgcat::mcset ru "%s's activity changed to %s" "Пользователь %s занят: \"%s\""
+::msgcat::mcset ru "%s's activity is unset" "Пользователь %s отозвал публикацию своего занятия"
+::msgcat::mcset ru "Activity" "Занятие"
+::msgcat::mcset ru "Activity:" "Занятие:"
+::msgcat::mcset ru "Cannot publish empty activity" "Вы должны выбрать занятие"
+::msgcat::mcset ru "Publish user activity" "Опубликовать занятие пользователя"
+::msgcat::mcset ru "Subactivity" "Конкретнее"
+::msgcat::mcset ru "Subactivity:" "Конкретнее:"
+::msgcat::mcset ru "Unpublish user activity" "Отозвать публикацию занятия пользователя"
+::msgcat::mcset ru "User activity" "Занятие пользователя"
+::msgcat::mcset ru "User activity publishing failed: %s" "Не удалось опубликовать занятие пользователя: %s"
+::msgcat::mcset ru "User activity unpublishing failed: %s" "Не удалось отозвать публикацию занятия пользователя: %s"
+::msgcat::mcset ru "\n\tActivity: %s" "\n\tЗанятие: %s"
+::msgcat::mcset ru "\n\tUser's activity subscription: %s" "\n\tПодписка на занятие пользователя: %s"
+::msgcat::mcset ru "at the spa" "я в спа"
+::msgcat::mcset ru "brushing teeth" "чищу зубы"
+::msgcat::mcset ru "buying groceries" "покупаю продукты"
+::msgcat::mcset ru "cleaning" "убираюсь"
+::msgcat::mcset ru "coding" "программирую"
+::msgcat::mcset ru "commuting" "трясусь в общественном транспорте"
+::msgcat::mcset ru "cooking" "готовлю"
+::msgcat::mcset ru "cycling" "катаюсь на велосипеде"
+::msgcat::mcset ru "day off" "у меня выходной"
+::msgcat::mcset ru "doing chores" "занимаюсь домашними делами"
+::msgcat::mcset ru "doing maintenance" "сижу, примус починяю"
+::msgcat::mcset ru "doing the dishes" "мою посуду"
+::msgcat::mcset ru "doing the laundry" "стираю бельё"
+::msgcat::mcset ru "drinking" "пью"
+::msgcat::mcset ru "driving" "веду машину"
+::msgcat::mcset ru "eating" "ем"
+::msgcat::mcset ru "exercising" "занимаюсь спортом"
+::msgcat::mcset ru "gaming" "играю"
+::msgcat::mcset ru "gardening" "работаю в саду"
+::msgcat::mcset ru "getting a haircut" "подстригаюсь"
+::msgcat::mcset ru "going out" "прогуливаюсь"
+::msgcat::mcset ru "grooming" "привожу себя в порядок"
+::msgcat::mcset ru "hanging out" "тусуюсь где-то там"
+::msgcat::mcset ru "having a beer" "пью пиво"
+::msgcat::mcset ru "having a snack" "перекусываю"
+::msgcat::mcset ru "having appointment" "у меня встреча"
+::msgcat::mcset ru "having breakfast" "завтракаю"
+::msgcat::mcset ru "having coffee" "пью кофе"
+::msgcat::mcset ru "having dinner" "обедаю"
+::msgcat::mcset ru "having lunch" "у меня ланч"
+::msgcat::mcset ru "having tea" "пью чай"
+::msgcat::mcset ru "hiking" "хожу пешком"
+::msgcat::mcset ru "in a car" "еду в машине"
+::msgcat::mcset ru "in a meeting" "у меня собрание"
+::msgcat::mcset ru "in real life" "разговариваю в реале"
+::msgcat::mcset ru "inactive" "бездельничаю"
+::msgcat::mcset ru "jogging" "бегаю трусцой"
+::msgcat::mcset ru "on a bus" "еду в автобусе"
+::msgcat::mcset ru "on a plane" "лечу в самолёте"
+::msgcat::mcset ru "on a train" "еду в поезде"
+::msgcat::mcset ru "on a trip" "я в поездке"
+::msgcat::mcset ru "on the phone" "разговариваю по телефону"
+::msgcat::mcset ru "on vacation" "в отпуске"
+::msgcat::mcset ru "on video phone" "разговариваю по видеотелефону"
+::msgcat::mcset ru "partying" "я на вечеринке"
+::msgcat::mcset ru "playing sports" "спортивные игры"
+::msgcat::mcset ru "reading" "читаю"
+::msgcat::mcset ru "rehearsing" "у меня репетиция"
+::msgcat::mcset ru "relaxing" "отдыхаю"
+::msgcat::mcset ru "running" "совершаю пробежку"
+::msgcat::mcset ru "running an errand" "хожу по делам"
+::msgcat::mcset ru "scheduled holiday" "у меня плановый выходной"
+::msgcat::mcset ru "shaving" "бреюсь"
+::msgcat::mcset ru "shopping" "хожу по магазинам"
+::msgcat::mcset ru "skiing" "катаюсь на лыжах"
+::msgcat::mcset ru "sleeping" "сплю"
+::msgcat::mcset ru "socializing" "общественно-полезная работа"
+::msgcat::mcset ru "studying" "учусь"
+::msgcat::mcset ru "sunbathing" "загораю"
+::msgcat::mcset ru "swimming" "плаваю"
+::msgcat::mcset ru "taking a bath" "принимаю ванну"
+::msgcat::mcset ru "taking a shower" "принимаю душ"
+::msgcat::mcset ru "talking" "разговариваю"
+::msgcat::mcset ru "traveling" "путешествую"
+::msgcat::mcset ru "walking" "гуляю"
+::msgcat::mcset ru "walking the dog" "выгуливаю собаку"
+::msgcat::mcset ru "watching a movie" "смотрю кино"
+::msgcat::mcset ru "watching tv" "смотрю телевизор"
+::msgcat::mcset ru "working" "работаю"
+::msgcat::mcset ru "working out" "\"качаюсь\" на тренажёрах"
+::msgcat::mcset ru "writing" "пишу"
+
 # vim:ft=tcl:ts=8:sw=4:sts=4:noet
 # Local Variables:
 # mode: tcl



More information about the Tkabber-dev mailing list