From 233ce8a04c361a721ca6307d0064158e774e174d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Tue, 2 Mar 2010 17:12:29 +0300
Subject: [PATCH 1/3] Bugfix

---
 pym/cl_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/cl_client.py b/pym/cl_client.py
index b6344f4..0eebcab 100644
--- a/pym/cl_client.py
+++ b/pym/cl_client.py
@@ -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'):

From dd372a63914eb6d7a142e14e4bc0bc0a0c1283fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Tue, 2 Mar 2010 17:20:50 +0300
Subject: [PATCH 2/3] Increase version

---
 pym/cl_client.py      | 2 +-
 pym/cl_vars_client.py | 2 +-
 setup.py              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pym/cl_client.py b/pym/cl_client.py
index 0eebcab..73cf710 100644
--- a/pym/cl_client.py
+++ b/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__])
diff --git a/pym/cl_vars_client.py b/pym/cl_vars_client.py
index da32a67..75f4ae3 100644
--- a/pym/cl_vars_client.py
+++ b/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 или имя хоста клиента)
diff --git a/setup.py b/setup.py
index 85cf7f1..c3c4d81 100755
--- a/setup.py
+++ b/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",

From de88ed92f7b42d2bc22ffe4dd4c780b00b1a49fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?=
 <asamoukin@asamoukin.local.calculate.ru>
Date: Tue, 2 Mar 2010 17:24:43 +0300
Subject: [PATCH 3/3] Bugfix

---
 README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 8284e4e..ff40316 100644
--- a/README
+++ b/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: