From bd43ea554d6f228cea8c2ea53c9f624743eb4241 Mon Sep 17 00:00:00 2001
From: Alex Plotnikov <aplsimple@gmail.com>
Date: Wed, 15 Sep 2021 20:17:51 +0300
Subject: [PATCH] v0.9.2

---
 aloupe.tcl   | 14 +++++++-------
 msgs/ru.msg  | 16 +++++++++-------
 pkgIndex.tcl |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/aloupe.tcl b/aloupe.tcl
index baabe9c..ef0fb4b 100644
--- a/aloupe.tcl
+++ b/aloupe.tcl
@@ -19,7 +19,7 @@ package require treectrl
 package require Img
 ::msgcat::mcload [file join [file dirname [info script]] msgs]
 
-package provide aloupe 0.9.1
+package provide aloupe 0.9.2
 
 # _______________________________________________________________________ #
 
@@ -89,14 +89,14 @@ proc ::aloupe::my::CreateDisplay {start} {
   grid [ttk::separator $data(WDISP).sep1 -orient horizontal] -row 1 -columnspan 4 -sticky we -pady 2
   grid [ttk::label $data(LABEL) -image $data(IMAGE) -relief flat \
     -style [lindex [SetStyle TLabel no -bd 0] 1]] -row 2 -columnspan 4 -padx 2
-  grid [ttk::button $data(WDISP).but1 -text [::msgcat::mc Save] \
-    -command ::aloupe::my::Save] -row 3 -column 0 -columnspan 2 -sticky ew
   set data(BUT2) $data(WDISP).but2
   if {[set but2text $data(-commandname)] eq ""} {
     set but2text [::msgcat::mc "To clipboard"]
   }
   grid [ttk::button $data(BUT2) -text $but2text \
-    -command ::aloupe::my::Button2Click] -row 3 -column 2 -columnspan 2 -sticky ew
+    -command ::aloupe::my::Button2Click] -row 3 -column 0 -columnspan 2 -sticky ew
+  grid [ttk::button $data(WDISP).but1 -text [::msgcat::mc Save] \
+    -command ::aloupe::my::Save] -row 3 -column 2 -columnspan 2 -sticky ew
   set data(-geometry) [regexp -inline \\+.* $data(-geometry)]
   if {$data(-geometry) ne ""} {
     wm geometry $data(WDISP) $data(-geometry)
@@ -352,7 +352,7 @@ proc ::aloupe::my::IsCapture {} {
   variable data
   if {$data(CAPTURE) eq ""} {
     Message -title "Color of Image" -icon warning \
-      -message "Click, then drag and drop\nthe loupe to get the image."
+      -message  [msgcat::mc "Click, then drag and drop\nthe loupe to get the image."]
     return no
   }
   return yes
@@ -384,7 +384,7 @@ proc ::aloupe::my::HandleColor {{doclb yes}} {
   if {[IsCapture]} {
     if {$data(COLOR) eq ""} {
       Message -title "Color of Image" -icon warning \
-        -message "Click the magnified image\nto get a pixel's color.\n\nThen hit this button."
+        -message [msgcat::mc "Click the magnified image\nto get a pixel's color.\n\nThen hit this button."]
     } else {
       if {$doclb && $data(-commandname) eq ""} {
         clipboard clear
@@ -574,4 +574,4 @@ if {[info exist ::argv0] && [file normalize $::argv0] eq [file normalize [info s
 }
 # _________________________________ EOF _________________________________ #
 #-ARGS1: -alpha .2 -background "yellow" -ontop 1 -save 1 -inifile 123 -commandname "Get"
-#RUNF1: ~/PG/github/pave/tests/test2_pave.tcl 23 9 12 "small icons"
+#-RUNF1: ~/PG/github/pave/tests/test2_pave.tcl 23 9 12 "small icons"
diff --git a/msgs/ru.msg b/msgs/ru.msg
index 2600b61..4aefea8 100644
--- a/msgs/ru.msg
+++ b/msgs/ru.msg
@@ -1,9 +1,11 @@
 namespace eval ::aloupe {
-    ::msgcat::mcset ru "Loupe" \u041b\u0443\u043f\u0430
-    ::msgcat::mcset ru "To clipboard" \u0412\u0020\u0431\u0443\u0444\u0435\u0440
-    ::msgcat::mcset ru "Save" \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
-    ::msgcat::mcset ru "Close" \u0417\u0430\u043a\u0440\u044b\u0442\u044c
-    ::msgcat::mcset ru "Size" \u0420\u0430\u0437\u043c\u0435\u0440
-    ::msgcat::mcset ru "Zoom" \u041c\u0430\u0441\u0448\u0442\u0430\u0431
-    ::msgcat::mcset ru "Save the Loupe"  \u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c\u0020\u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435
+  ::msgcat::mcset ru {Loupe} {Лупа}
+  ::msgcat::mcset ru {To clipboard} {В буфер}
+  ::msgcat::mcset ru {Save} {Сохранить}
+  ::msgcat::mcset ru {Close} {Закрыть}
+  ::msgcat::mcset ru {Size} {Размер}
+  ::msgcat::mcset ru {Zoom} {Масштаб}
+  ::msgcat::mcset ru {Save the Loupe} {Сохранить изображение}
+  ::msgcat::mcset ru "Click the magnified image\nto get a pixel's color.\n\nThen hit this button." "Кликните по картинке,\nчтобы получить цвет пиксела.\n\nПотом жмите эту кнопку."
+  ::msgcat::mcset ru "Click, then drag and drop\nthe loupe to get the image." "Зацепите лупу мышкой и тащите её по экрану.\n\nКогда отпустите мышку, получите увеличенное изображение."
 }
diff --git a/pkgIndex.tcl b/pkgIndex.tcl
index 0c15ae6..3117088 100644
--- a/pkgIndex.tcl
+++ b/pkgIndex.tcl
@@ -1,5 +1,5 @@
 
-package ifneeded aloupe 0.9.1 [list source [file join $dir aloupe.tcl]]
+package ifneeded aloupe 0.9.2 [list source [file join $dir aloupe.tcl]]
 
 
 # A short intro (for Ruff! docs generator:)