From 6ad7a5a4b0cb8d8c23d45d0b4ed3fdb40888df70 Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Mon, 27 Aug 2012 12:57:43 +0530
Subject: [PATCH] [FIX/USA] Usabality Impovments ans Import error fixed

bzr revid: jam@tinyerp.com-20120827072743-v022e5obnd06csoy
---
 addons/base_gengo/res_company.py                     | 2 +-
 addons/base_gengo/res_company_view.xml               | 8 ++++----
 addons/base_gengo/wizard/gengo_update_translation.py | 2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py
index 888e675e26b..8e26f406f30 100644
--- a/addons/base_gengo/res_company.py
+++ b/addons/base_gengo/res_company.py
@@ -33,7 +33,7 @@ class res_company(osv.Model):
                                           ('pro', 'Pro'),
                                           ('ultra', 'Ultra')], "Tier types", required=True),
            "gengo_comment": fields.text("comments"),
-           "gengo_auto_approve": fields.boolean("Active", help="Jobs are Automatically Approved by Gengo."),
+           "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
            "fields_ids": fields.many2many('ir.model.fields', 'fields_company_rel', 'field_id', 'model_id', 'fields'),
     }
 
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
index bfa0b1ddf95..f51ee4d4f95 100644
--- a/addons/base_gengo/res_company_view.xml
+++ b/addons/base_gengo/res_company_view.xml
@@ -11,11 +11,11 @@
                 <xpath expr="//notebook[last()]" position="inside">
                     <page string="Gengo Parameters">
                         <group col="2">
-                            <group col="1" string="Private Key">
-                                <field name="gengo_private_key" nolabel="1"/>
-                            </group>
                             <group col="1" string="Public Key">
-                                <field name="gengo_public_key" nolabel="1"/>
+                                <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
+                            </group>
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" nolabel="1" placeholder="Add Gengo login Private Key..."/>
                             </group>
                         </group>
                         <group col="4">
diff --git a/addons/base_gengo/wizard/gengo_update_translation.py b/addons/base_gengo/wizard/gengo_update_translation.py
index a6db51f870d..33e90384275 100644
--- a/addons/base_gengo/wizard/gengo_update_translation.py
+++ b/addons/base_gengo/wizard/gengo_update_translation.py
@@ -22,6 +22,8 @@
 from osv import osv
 import logging
 import tools
+from tools.translate import _
+
 _logger = logging.getLogger(__name__)
 try:
     from mygengo import MyGengo