From f0c50ff5f40a0421f93e856145c040ffe1401b16 Mon Sep 17 00:00:00 2001
From: mhiretskiy <mhiretskiy@c91db197-33c1-4113-bf15-f8a5c547ca64>
Date: Tue, 24 Mar 2009 13:35:37 +0000
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@1080 c91db197-33c1-4113-bf15-f8a5c547ca64
---
 i18n/cl_client_ru.mo | Bin 0 -> 2147 bytes
 pym/cl_client.py     |  17 +++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 i18n/cl_client_ru.mo

diff --git a/i18n/cl_client_ru.mo b/i18n/cl_client_ru.mo
new file mode 100644
index 0000000000000000000000000000000000000000..36a1114913d3364dd1c0b78e2ebc8b7778b0d75f
GIT binary patch
literal 2147
zcmai!O>Y}T7{{ljrC?qP1qwn%42Ke-YK>D`HJFmtjh*0N$5CQeq7tBuJ#iN79cy+I
z5>AQDTa`dAMdH%-fVgl#PKd!xYUjcSnEe1CICAI-Zd~|3vrd{SDy%g7^Ugl=Jpboq
z{oAoaUo%|KV4cAF1?vT@$^qPP{SH0}{sBG?{sle-9z4j{L*Q}n82BPc`=`NY!QtNX
zdmx=tAlWT}FN4=W3)})90RIH({2lNxcmSI(fk(jS!B;@im;{f2SHMHy6nGYz%HRb&
zU&kit{}nt3{sU6{*Wi@mUILS#0}g^efE4Er*aseckg=2CIdBAg7knT54m=JXMsU)7
z0wi6dAo&wu8vGs{1^)&k-~|-vIdBw&Op`0=*?S>0dlZZ6LuU|*J%Y7!J-qV+d<^Re
zEUG=#i+Y1l>?ju12kDv%Wn@p&uOZvzuJn1|hfbx!PkMc9NLH)T<+A2G()HMo61Fc&
zd`4CUFF6V}EH!UeYZc+KOfoUfi_&#P(dR-bsaRI1vg4L{P048oHqmI5jUm9aoOMfF
ziK?92^^*%@a9as(PkF-iqio#vXApyndB^j;-AB^c+nNwX;mlDC3cxF{<I_r3>69nb
zoKT#CPA<4bC0*xZvYf>Wy!3rMc>E(LjIqZ$uNGLrRiY@%ID&k`{8_=X%K~>ChkH^H
zCgQlf;5zdrpi>mA<ao7;y}<n$$Kx}iQsXw#g<_vgOU0`aDLO8GR&A<ll<m})l(BIo
zKR^ksbji9blm~-2A5RRuoft{+%c+UUbZ#s%A!<_jR@N&!CF{~`*|YL8&LiWwyk&ZX
zLsk;4iu2R4*nky#-Rd9U{b%B5W2a(gVlfz66JpLG=RLc3Qi%yGo3oM${#GuYO`p1w
z8%sqpw&z=UWxHO*_N9vR;X)?E#}e5TKcC7b(wU2iWO5=kIXMVZw>*pbSb1Sr<2;iX
z8!3?F^O?-WiW8NpJQ&HQv#GmD^+#ioA?f;PwUu9}L98$4{Z~;s$9;nrXKaNgy;;Z)
zTLX9PNXxWPR?02P5*iri15=J4Vfwmm@t~nMbW?BXZm<-raJ?QZ>uue|Mn|`UI&E#@
z@iuHadLwA;nRI<auLW0i8(wgv87#u)wr=6jVzA8gweVQ*h3*8a!74|bHf&mYGpHll
zBA!-hD1s#z{%llqbd%|u^vXCgZf?LqTdzSylbi3w*tf_V6t#@ZRm#OAp??auLQO~`
zSb^`ZUWdLqUf~(%DWe~C7qStn8+-y+TLGMW+p7h6g_i#iO`$p2=vz2L_E3HU{yu}R
zHiy$X>e(>&I*Qr|z6$D;8*Qzav>T)q*<<S}s<s4uu%r6jV`n1W#|mj|;rQpfIU~1i
z)Ri)9a^yww&|1B26!ogzLelGqgMOJWUEkd2CmezM)UF+TYEmc3R6j)D{9pgu!7>tr
z9%=(lu9)#74MsCf096xp#{k~iH&9G})3e*tQCMU6P%Wc>U!y5qQ$6Fk*C$MP_|F4(
zVIinoa6&_mszC=P1uY7`1R6A*G$c(_Y!i>vTUeM0>Y(u9Ct?iNOw$_-^MGNZ4DRU;
oZNUWXXzdK=2F`V{*}>h6W4G5mssp|bhW*||h5Gj7zBA42Ux-SIGynhq

literal 0
HcmV?d00001

diff --git a/pym/cl_client.py b/pym/cl_client.py
index d63e354..313b167 100644
--- a/pym/cl_client.py
+++ b/pym/cl_client.py
@@ -86,9 +86,10 @@ org.kde.kdialog.ProgressDialog'
 
     def setTitle(self,title):
         '''Установить описания прогресса'''
+        self.title = title
         if self.kdialog:
             os.system(self.execenv+
-                    '/usr/bin/qdbus %s setLabelText %s >/dev/null' % \
+                    '/usr/bin/qdbus %s setLabelText "%s" >/dev/null' % \
                     (self.kdialog,self.title))
 
     def close(self):
@@ -101,7 +102,7 @@ org.kde.kdialog.ProgressDialog'
 class ProgressProfile(cl_profile.profile):
     def __init__(self, vars):
         cl_profile.profile.__init__(self,vars)
-        self.progress = ProgressBar("Merging profiles...")
+        self.progress = ProgressBar(_("Merging profiles ..."))
 
     def numberAllProfiles(self, number):
         self.progress.setMaximum(number)
@@ -122,9 +123,11 @@ class RsyncProgressBar(ProgressBar):
     receiverre = re.compile("recv_generator\(.+,([0-9]+)\)", re.S)
     pipe = None
     maximum = 1
+    copyStarting = False
 
-    def __init__(self, title, rsyncstr, maximum=1):
+    def __init__(self, title, secondtitle, rsyncstr, maximum=1):
         self.title = title
+        self.secondtitle = secondtitle
         self.maximum = maximum
         self.rsyncstr = rsyncstr
 
@@ -169,8 +172,12 @@ class RsyncProgressBar(ProgressBar):
                 self.value = int(q.groups()[0])
                 newpercent = self.value * 100 / self.maximum
                 if oldpercent < newpercent:
+                    if not self.copyStarting:
+                        self.copyStarting = True
+                        self.setTitle(self.secondtitle)
                     oldpercent = newpercent
                     self.setValue(oldpercent)
+
 # Импортированные классы в cl_ldap
 # Запись ошибок
 imp_cl_err = cl_profile._error
@@ -1711,8 +1718,10 @@ install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
             %str(sync))
             return False
         if execStr:
+            host = "<i>" + host +"</i>"
             rsync = RsyncProgressBar(\
-                    "Syncronizing user settings with %s server..." %
+                    _("Receiving file list from %s server ...") % host,
+                    _("Syncronizing user settings with %s server ...") %
                     host,execStr)
             configFileName = os.path.join(homeProfile,self.configFile)
             if sync == "login":