[MERGE]: Merge with main branch

bzr revid: aja@tinyerp.com-20120827073002-w18750599ys0xlru

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'),
     }
 

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">

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