git-svn-id: http://svn.calculate.ru/calculate2/calculate-server/trunk@985 c91db197-33c1-4113-bf15-f8a5c547ca64

pym/cl_ldap.py

@@ -1774,8 +1774,8 @@ class servUnix(shareLdap):
         removeHomeBack = False
         if not flagError:
             # Востановим (home на сервере) удаленного пользователя
-            message = _("Restored deleted user %s")% userName + "\n" +\
-                    _("'yes', 'no'")
+            message = _("Do you want to restore deleted user %s data?")\
+                      %userName + "\n" +_("'yes', 'no'")
             resHomeDir = self.restorePathDelUser(userName, homeDir,
                                                     "unix/home", message, self)
             if not resHomeDir:
@@ -3384,9 +3384,8 @@ in Unix service ...") %str(primaryMail))
             # Почтовая директория пользователя
             mailDir = os.path.join(self.clVars.Get("sr_mail_path"),
                                 userName)
-            message = _("Restored deleted user %s data")% userName + "\n" +\
-                        _("'yes', 'no'")
-
+            message = _("Do you want to restore deleted user %s data?")\
+                      %userName + "\n" +_("'yes', 'no'")
             resMailDir = self.restorePathDelUser(userName, mailDir,
                                                     "mail/imap", message)
             removeMailDirBack = False
@@ -4473,9 +4472,8 @@ class servSamba(shareLdap):
             userNetlogonDir =\
                 os.path.join(self.clVars.Get("sr_samba_winlogon_path"),
                                          userName)
-            message = _("Restored deleted user %s")% userName + "\n" +\
-                        _("'yes', 'no'")
-
+            message = _("Do you want to restore deleted user %s data?")\
+                      %userName + "\n" +_("'yes', 'no'")
             resWinProf = self.restorePathDelUser(userName, winProfDir,
                                                  "samba/winprofile", message)
             removeProfileBack = False
@@ -5182,7 +5180,7 @@ outdated. If the backup is obsolete, use cl-backup."))
                 else :
                     self.printERROR(\
                             _("Command line incorrect, \
-    'history=%s' - error, to use 'history on' or 'history off'")\
+'history=%s' - error, to use 'history on' or 'history off'")\
                             %str(history) + " ...")
                     return False