[MERGE]

[odoo/odoo.git] / bin / addons / base / module / wizard / base_import_language_view.xml

diff --git a/bin/addons/base/module/wizard/base_import_language_view.xml b/bin/addons/base/module/wizard/base_import_language_view.xml
index eb73e8d..70a4885 100644 (file)
--- a/bin/addons/base/module/wizard/base_import_language_view.xml
+++ b/bin/addons/base/module/wizard/base_import_language_view.xml
@@ -3,15 +3,25 @@
     <data>
 
         <record id="view_base_import_language" model="ir.ui.view">
-            <field name="name">Import Language</field>
+            <field name="name">Import Translation</field>
             <field name="model">base.language.import</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Import language">
-            <notebook colspan="4">
-                <page string="Import Data">
+            <form string="Import Language">
+            <group colspan="3">
+                 <group colspan="1">
+                      <label string="You have to import a .CSV file which is encoded in UTF-8."/>
+                      <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
+                      <label string="type,name,res_id,src,value" colspan="4"/>
+                      <label string="module,type,name,res_id,src,value" colspan="4"/>
+                      <label string="You can also import .po files." colspan="4" align="0.0"/>
+                 </group>
+                 <group colspan="1">
+                      <separator orientation="vertical" rowspan="8"/>
+                 </group>
+                 <group colspan="1">
                     <group colspan="4" col="4">
-                        <separator string="Import New Language" colspan="4"/>
+                        <separator string="Import Translation" colspan="4"/>
                         <field name="name" width="200"/>
                         <field name="code"/>
                         <field name="data" colspan="4"/>
@@ -20,25 +30,17 @@
                     <group colspan="2" col="2">
                     </group>
                     <group colspan="2" col="2">
-                        <button special="cancel" string="_Cancel" icon="gtk-cancel"/>
+                        <button special="cancel" string="_Close" icon="gtk-cancel"/>
                         <button name="import_lang" string="_Import" type="object" icon="gtk-ok"/>
                     </group>
-                </page>
-                <page string="Help">
-                    <label string="You have to import a .CSV file which is encoded in UTF-8."/>
-                    <label string="Please check that the first line of your file is one of the following:" colspan="4" align="0.0"/>
-                    <label string="type,name,res_id,src,value" colspan="4"/>
-                    <label string="module,type,name,res_id,src,value" colspan="4"/>
-                    <label string="You can also import .po files." colspan="4" align="0.0"/>
-                </page>
-            </notebook>
-
+                </group>
+                       </group>
             </form>
             </field>
         </record>
 
         <record id="action_view_base_import_language" model="ir.actions.act_window">
-            <field name="name">Import Language</field>
+            <field name="name">Import Translation</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">base.language.import</field>
             <field name="view_type">form</field>
@@ -47,7 +49,6 @@
         </record>
 
         <menuitem
-        name="Import a Translation File"
         action="action_view_base_import_language"
         id="menu_view_base_import_language"
         parent="menu_translation_export"/>