From 70f82c6d0bcc01c1fc4f7845a2a0c558d04cf704 Mon Sep 17 00:00:00 2001
From: Bertrand Chenal <bch@b2ck.com>
Date: Wed, 29 Oct 2008 16:16:23 +0100
Subject: [PATCH] Various corrections on dialog texts

---
 tryton/gui/main.py              |  2 +-
 tryton/gui/window/dbcreate.py   | 19 +++++++++----------
 tryton/gui/window/dbdumpdrop.py |  3 ++-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 9f34eac782..e484907843 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -1060,7 +1060,7 @@ class Main(object):
             if quiet:
                 return False
             common.warning(_('You can not log into the system!\n' \
-                    'Verify if you have an menu defined on your user.'),
+                    'Verify if you have a menu defined on your user.'),
                     'Access Denied!', self.window)
             rpc.logout()
             self.refresh_ssl()
diff --git a/tryton/gui/window/dbcreate.py b/tryton/gui/window/dbcreate.py
index 9522409c95..2a541eafa7 100644
--- a/tryton/gui/window/dbcreate.py
+++ b/tryton/gui/window/dbcreate.py
@@ -261,7 +261,7 @@ class DBCreate(object):
         self.entry_adminpasswd.set_activates_default(True)
         self.tooltips.set_tip(self.entry_adminpasswd, _("Choose a password for " \
             "the admin user of the new database. With these credentials you " \
-            "are later able to login into the database:\n" \
+            "will be later able to login into the database:\n" \
             "User name: admin\n" \
             "Password: <The password you set here>"), None)
         table.attach(self.entry_adminpasswd, 1, 3, 7, 8)
@@ -330,11 +330,10 @@ class DBCreate(object):
                         _('Wrong characters in database name!'))
                     continue
                 elif admin_passwd.get_text() != admin_passwd2.get_text():
-                    common.warning(_("The new admin password " \
-                        "doesn't match to the retyped password.\n" \
-                        "Try to type the same passwords in the " \
-                        "admin password and the confirm admin password " \
-                        "fields again."), parent, \
+                    common.warning(
+                        _("The new admin password " \
+                              "doesn't match the confirmation field.\n"),
+                        parent,
                         _("Passwords doesn't match!"))
                     continue
                 elif not admin_passwd.get_text():
@@ -350,10 +349,10 @@ class DBCreate(object):
                         and admin_passwd.get_text():
                     if rpc.db_exec(url_m.group(1), int(url_m.group(2)),
                              'db_exist', dbname):
-                         common.warning(_("Database with the same name " \
+                         common.warning(_("A database with the same name " \
                              "already exists.\n" \
                              "Try another database name."), parent,
-                             _("Databasename already exist!"))
+                             _("This database name already exist!"))
                          self.entry_dbname.set_text("")
                          self.entry_dbname.grab_focus()
                          continue
@@ -370,8 +369,8 @@ class DBCreate(object):
                             rpcprogress.run()
                         except Exception, exception:
                             if str(exception[0]) == "AccessDenied":
-                                common.warning(_("Sorry, the Tryton server " \
-                                    "password seems wrong. Please type again.") \
+                                common.warning(_("Sorry, wrong password for " \
+                                    "the Tryton server. Please try again.") \
                                     , parent, _("Access denied!"))
                                 self.entry_serverpasswd.set_text("")
                                 self.entry_serverpasswd.grab_focus()
diff --git a/tryton/gui/window/dbdumpdrop.py b/tryton/gui/window/dbdumpdrop.py
index c7a69fe5e1..e07622f543 100644
--- a/tryton/gui/window/dbdumpdrop.py
+++ b/tryton/gui/window/dbdumpdrop.py
@@ -21,7 +21,8 @@ class DBBackupDrop(object):
                         _('Could not connect to server!') + '</b>')
             else:
                 label.set_label('<b>' + \
-                        _('Incompatible version of the server!') + '</b>')
+                        _('This client version is not compatible with the server!') +\
+                        '</b>')
             db_widget.hide()
             label.show()
         elif res == 0: