diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index bbededc8eaf..3b8e37e8697 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ class calendar_event(osv.osv):
('confidential', 'Public for Employees')], 'Mark as', states={'done': [('readonly', True)]}),
'location': fields.char('Location', size=264, help="Location of Event", states={'done': [('readonly', True)]}),
'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
- 'Show as', states={'done': [('readonly', True)]}),
+ 'Show Time As', states={'done': [('readonly', True)]}),
'base_calendar_url': fields.char('Caldav URL', size=264),
'state': fields.selection([('tentative', 'Tentative'),
('cancelled', 'Cancelled'),
@@ -1060,8 +1060,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
- 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence termination'),
- 'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"),
+ 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
+ 'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
'count': fields.integer('Repeat', help="Repeat x times"),
'mo': fields.boolean('Mon'),
'tu': fields.boolean('Tue'),
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index a007fc99091..79ed5a3adb2 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -88,7 +88,7 @@
- at
+
@@ -104,15 +104,15 @@
-
-
+
+
-
+
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 6fb99d936d4..b8954eb248b 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -250,7 +250,7 @@
-
+
@@ -261,14 +261,13 @@
-
-
+
-
+
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
index 9f38f4e1959..7f751a38729 100644
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ b/addons/import_sugarcrm/import_sugarcrm_view.xml
@@ -12,8 +12,9 @@
+
or
+ type="object"/> or
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..25367538c3f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -313,19 +313,14 @@