diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a56dc3c57c3..25b8939569c 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -187,13 +187,13 @@ class hr_employee(osv.osv):
     _columns = {
         #we need a related field in order to be able to sort the employee by name
         'name_related': fields.related('resource_id', 'name', type='char', string='Name', readonly=True, store=True),
-        'country_id': fields.many2one('res.country', 'Nationality'),
+        'country_id': fields.many2one('res.country', 'Nationality (Country)'),
         'birthday': fields.date("Date of Birth"),
         'ssnid': fields.char('SSN No', help='Social Security Number'),
         'sinid': fields.char('SIN No', help="Social Insurance Number"),
         'identification_id': fields.char('Identification No'),
         'otherid': fields.char('Other Id'),
-        'gender': fields.selection([('male', 'Male'), ('female', 'Female')], 'Gender'),
+        'gender': fields.selection([('male', 'Male'), ('female', 'Female'), ('other', 'Other')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'address_id': fields.many2one('res.partner', 'Working Address'),
@@ -202,7 +202,7 @@ class hr_employee(osv.osv):
         'work_phone': fields.char('Work Phone', readonly=False),
         'mobile_phone': fields.char('Work Mobile', readonly=False),
         'work_email': fields.char('Work Email', size=240),
-        'work_location': fields.char('Office Location'),
+        'work_location': fields.char('Work Location'),
         'notes': fields.text('Notes'),
         'parent_id': fields.many2one('hr.employee', 'Manager'),
         'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Tags'),
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 9b0ae2330c8..52df7ad3bb1 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -155,7 +155,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="department_id" ref="dep_management"/>
           <field name="job_id" ref="hr.job_ceo"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_2')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">pieter@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
@@ -166,7 +166,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_cto"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_3')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">antoine@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_al-image.jpg"/>
@@ -178,7 +178,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="mobile_phone">+32486571630</field>
           <field name="work_email">john@openerp.com</field>
@@ -191,7 +191,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">michael@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
@@ -203,7 +203,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">liam@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
@@ -215,7 +215,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">david@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
@@ -228,7 +228,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">gilles@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_qdp-image.png"/>
@@ -240,7 +240,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">jack@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
@@ -252,7 +252,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">martin@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
@@ -264,7 +264,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">jimmy@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_jth-image.png"/>
@@ -276,7 +276,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_marketing"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Auderghem</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">famke@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
@@ -288,7 +288,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_hrm"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">ashley@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_vad-image.jpg"/>
@@ -298,7 +298,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Hans Anders</field>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_developer"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="image" type="base64" file="hr/static/img/employee_han-image.png"/>
       </record>
@@ -307,7 +307,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Jan Van Eyck</field>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_developer"/>
-          <field name="work_location">Auderghem</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="work_email">jve@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
@@ -317,7 +317,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Jean-Pierre Carnaud</field>
           <field name="department_id" ref="dep_ps"/>
           <field name="job_id" ref="hr.job_consultant"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="work_email">jep@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
@@ -327,7 +327,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">John Doe</field>
           <field name="department_id" ref="dep_sales"/>
           <field name="job_id" ref="hr.job_marketing"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="work_email">jod@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_jod-image.png"/>
@@ -337,7 +337,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">João Gomer</field>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_developer"/>
-          <field name="work_location">Auderghem</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="work_email">jog@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
@@ -347,7 +347,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Juan Gomez</field>
           <field name="department_id" ref="dep_ps"/>
           <field name="job_id" ref="hr.job_consultant"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="image" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
       </record>
@@ -356,7 +356,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Luigi Rondi</field>
           <field name="department_id" ref="dep_sales"/>
           <field name="job_id" ref="hr.job_marketing"/>
-          <field name="work_location">Auderghem</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="work_email">lur@openerp.com</field>
           <field name="image" type="base64" file="hr/static/img/employee_lur-image.png"/>
@@ -366,7 +366,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">Николай Петра</field>
           <field name="department_id" ref="dep_ps"/>
           <field name="job_id" ref="hr.job_consultant"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="image" type="base64" file="hr/static/img/employee_hne-image.png"/>
       </record>
@@ -375,7 +375,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">佐藤さくら (demo_ja_JP)</field>
           <field name="department_id" ref="dep_ps"/>
           <field name="job_id" ref="hr.job_consultant"/>
-          <field name="work_location">Grand-Rosière</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="image" type="base64" file="hr/static/img/employee_djj-image.png"/>
       </record>
@@ -384,7 +384,7 @@ If you have development competencies, we can propose you specific traineeships</
           <field name="name">趙生 (demo_zh_CN)</field>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_developer"/>
-          <field name="work_location">Auderghem</field>
+          <field name="work_location">Building 1, Second Floor</field>
           <field name="work_phone">+3282823500</field>
           <field name="image" type="base64" file="hr/static/img/employee_dzc-image.jpg"/>
       </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c5a9057cf2c..492d1c8ed6d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -67,7 +67,7 @@
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
                                 <group>
-                                    <group string="Citizenship &amp; Other Info">
+                                    <group string="Citizenship &amp; Other Information">
                                         <field name="country_id" options='{"no_open": True}'/>
                                         <field name="identification_id" groups="base.group_hr_user"/>
                                         <field name="passport_id" groups="base.group_hr_user"/>
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 2f67add47ea..2a180a0e5a4 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -133,7 +133,7 @@
             <field eval="1" name="active"/>
             <field name="name">Roger Scott</field>
             <field name="resource_type">user</field>
-            <field name="work_location">Grand-Rosière</field>
+            <field name="work_location">Building 1, Second Floor</field>
             <field name="work_phone">+3282823500</field>
             <field name="image" type="base64" file="hr_payroll/static/img/hr_employee_payroll-image.jpg"/>
         </record>
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 486e9a6ce9d..33d30a94191 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -18,7 +18,7 @@
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
-            <field name="work_location">Grand-Rosière</field>
+            <field name="work_location">Building 1, Second Floor</field>
             <field name="work_phone">+3282623500</field>
             <field name="image" type="base64" file="project_timesheet/static/img/employee_phu-image.jpg"/>
         </record>
@@ -43,7 +43,7 @@
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
-            <field name="work_location">Grand-Rosière</field>
+            <field name="work_location">Building 1, Second Floor</field>
             <field name="work_phone">+3282823500</field>
             <field name="work_email">alice@openerp.com</field>
             <field name="department_id" ref="hr.dep_rd"/>