[IMP] rename some of the mail menuitems

bzr revid: abo@openerp.com-20120820172348-t1i0r9lwkid0796v

diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a71ec97..4ef54da 100644 (file)
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -61,8 +61,8 @@
                         <field name="image_small" widget='image' class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Group Name"/> 
-                            </div> 
+                                <label for="name" string="Group Name"/>
+                            </div>
                             <h1><field name="name"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
@@ -123,7 +123,7 @@
 
         <!-- group record !-->
         <record id="action_view_groups" model="ir.actions.act_window">
-            <field name="name">Groups</field>
+            <field name="name">Join a group</field>
             <field name="res_model">mail.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -132,6 +132,6 @@
 
         <!-- left-side menu: Groups !-->
         <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
-        <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/>
     </data>
 </openerp>

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 35acad5..302d28f 100644 (file)
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -12,13 +12,13 @@
         <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
 
         <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">News Feed</field>
+          <field name="name">My Feeds</field>
           <field name="sequence" eval="10"/>
           <field name="action" ref="action_mail_all_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>
         </record>
         <record id="mail_myfeeds" model="ir.ui.menu">
-          <field name="name">My Feeds</field>
+          <field name="name">My Posts</field>
           <field name="sequence" eval="11"/>
           <field name="action" ref="action_mail_my_feeds"/>
           <field name="parent_id" ref="mail_feeds"/>