Merge branch 'master' of git.calculate.ru:calculate2/calculate-client

README

@@ -7,7 +7,8 @@ calculate-client needs the following library version installed, in order to run:
     Python >= 2.5
     python-ldap >= 2.0.0
     pyxml >= 0.8
-    calculate-lib >= 2.1.4
+    calculate-lib >= 2.1.6
+    py-smbpasswd >= 1.0
 
 To install calculate-client , just execute the install script 'setup.py'.
 Example:

pym/cl_client.py

@@ -35,7 +35,7 @@ import time
 
 from encrypt import encrypt
 
-Version = "calculate-client 2.1.10"
+Version = "calculate-client 2.1.11"
 
 tr = cl_base.lang()
 tr.setLanguage(sys.modules[__name__])
@@ -759,7 +759,7 @@ conjunction with the 'login' or 'logout'")
         try: 
             ldapInit.bind_s(userDN, password)
         except ldap.INVALID_CREDENTIALS:
-            errMessage = _("Your username or password is incorrect.")
+            errMessage = _("Password incorrect")
             return False, errMessage
         except ldap.LDAPError, e:
             if type(e.message) == dict and e.message.has_key('desc'):

pym/cl_vars_client.py

@@ -138,7 +138,7 @@ class Data:
     cl_name = {'value':'calculate-client'}
 
     # версия программы
-    cl_ver = {'value':'2.1.10'}
+    cl_ver = {'value':'2.1.11'}
 
     # Режим работы клиента клиент
     # (local или имя хоста клиента)

setup.py

@@ -143,7 +143,7 @@ class cl_install_data(install_data):
 
 setup(
     name = 'calculate-client',
-    version = "2.1.10",
+    version = "2.1.11",
     description = "Client for the calculate-server",
     author = "Mir Calculate Ltd.",
     author_email = "support@calculate.ru",