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

pym/cl_ldap.py

@@ -3554,8 +3554,8 @@ option '-e'"))
                         if flagError:
                             self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                            self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                            self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                             return False
                 if not servReplObj.modReplMailAlias(groupName, altMails,
                                                     filterHosts):
@@ -3811,8 +3811,8 @@ in Unix service") %str(primaryMail))
                             if flagError:
                                 self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                                self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                                self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                                 return False
                     if not servReplObj.modReplMailAlias(userName, altMails):
                         self.printERROR(_("Failed modify mail aliases \
@@ -3875,8 +3875,8 @@ option '-e'"))
                         foundReplUser = foundReplAlias[0][0][1]['cn'][0]
                         self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                        self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                        self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                         return False
                 modAttrs.append('mailAlternateAddress: %s' %mail)
         # Фильтр почты (hostname)
@@ -3906,8 +3906,8 @@ option '-e'"))
                 foundReplUser = foundReplAlias[0][0][1]['cn'][0]
                 self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                 return False
         self.clVars.Set("ur_group", groupName)
         # Комментарий к группе
@@ -4165,8 +4165,8 @@ for user %s in 'Replication/Mail' branch") %str(primaryMail))
                         foundReplUser = foundReplAlias[0][0][1]['cn'][0]
                         self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                        self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                        self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                         return False
                 modAttrs.append("mailAlternateAddress: %s" %mail)
         else:
@@ -4191,8 +4191,8 @@ for user %s in 'Replication/Mail' branch") %str(primaryMail))
                     foundReplUser = foundReplAlias[0][0][1]['cn'][0]
                     self.printERROR(_("Mail address %s is found in \
 'Replication/Mail' branch")%mail)
-                    self.printERROR(_("Mail user or group in \
-'Replication/Mail' branch: %s")%foundReplUser)
+                    self.printERROR(_("The address belongs to \
+mail user or group: %s")%foundReplUser)
                     return False
         resUnix = self.servUnixObj.searchUnixUser(userName)
         resPwd = self.servUnixObj.searchPasswdUser(userName)