[tryton-debian-vcs] tryton-modules-health-surgery branch debian updated. debian/2.8.1-1-12-g8a2078f

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Mar 28 18:28:44 UTC 2016


The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-health-surgery.git;a=commitdiff;h=debian/2.8.1-1-12-g8a2078f

commit 8a2078f45e43a9fbfb2ef45cdb45284f26928518
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:20:17 2016 +0200

    Releasing debian version 3.0.1-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 54fff56..54ae7c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-health-surgery (3.0.1-1) unstable; urgency=medium
+
+  * Wrapping and sorting control files (wrap-and-sort -bts).
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Updating copyright years.
+  * Merging upstream version 3.0.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 28 Mar 2016 01:20:17 +0200
+
 tryton-modules-health-surgery (2.8.1-1) unstable; urgency=medium
 
   * Initial packaging.
commit e66373bbaeda4c20f192166ab1e32f535a442b20
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:20:17 2016 +0200

    Merging upstream version 3.0.1.

diff --git a/PKG-INFO b/PKG-INFO
index 67f9804..d84cf1d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_health_surgery
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Surgery Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/README b/README
index 4d62bf1..45f0f01 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-#    Copyright (C) 2008-2015 Luis Falcon
+#    Copyright (C) 2008-2016 Luis Falcon
 
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
diff --git a/__init__.py b/__init__.py
index b9ae560..c7b4237 100644
--- a/__init__.py
+++ b/__init__.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -27,10 +27,13 @@ from report import *
 
 def register():
     Pool.register(
+		SurgerySequences,
         RCRI,
         Surgery,
         Operation,
+        SurgerySupply,
         PatientData,
+        SurgeryTeam,
         module='health_surgery', type_='model')
     Pool.register(
         SurgeryReport,
diff --git a/data/health_surgery_sequence.xml b/data/health_surgery_sequence.xml
new file mode 100644
index 0000000..0f57b58
--- /dev/null
+++ b/data/health_surgery_sequence.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tryton>
+    <data skiptest="1">
+
+<!-- Sequences for Surgery Codes -->
+
+        <record id="seq_type_gnuhealth_surgery_code" model="ir.sequence.type">
+            <field name="name">Surgery</field>
+            <field name="code">gnuhealth.surgery</field>
+        </record>
+
+        <record id="seq_gnuhealth_surgery_code" model="ir.sequence">
+            <field name="name">Surgery</field>
+            <field name="code">gnuhealth.surgery</field>
+            <field name="prefix">SRG-${year}-</field>
+            <field name="padding">5</field>
+        </record>
+
+        <record model="ir.property" id="property_surgery_code_sequence">
+            <field name="field" 
+                search="[('model.model', '=', 'gnuhealth.sequences'), ('name', '=', 'surgery_code_sequence')]"/>
+            <field name="value" eval="'ir.sequence,' + str(ref('seq_gnuhealth_surgery_code'))"/>
+        </record>
+
+    </data>
+</tryton>
diff --git a/health_surgery.py b/health_surgery.py
index 72cd107..9956eb7 100644
--- a/health_surgery.py
+++ b/health_surgery.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,25 @@
 ##############################################################################
 import pytz
 from dateutil.relativedelta import relativedelta
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import ModelView, ModelSingleton, ModelSQL, fields
 from datetime import datetime
 from trytond.transaction import Transaction
 from trytond import backend
 from trytond.pool import Pool
-from trytond.tools import datetime_strftime
-from trytond.pyson import Eval, Not, Bool, PYSONEncoder, Equal
+from trytond.pyson import Eval, Not, Bool, PYSONEncoder, Equal, And, Or
 
-__all__ = ['RCRI', 'Surgery', 'Operation', 'PatientData']
+__all__ = ['SurgerySequences', 'RCRI', 'Surgery', 'Operation',
+    'SurgerySupply', 'PatientData', 'SurgeryTeam']
+
+
+
+class SurgerySequences(ModelSingleton, ModelSQL, ModelView):
+    "Inpatient Registration Sequences for GNU Health"
+    __name__ = "gnuhealth.sequences"
+
+    surgery_code_sequence = fields.Property(fields.Many2One(
+        'ir.sequence', 'Surgery Sequence', required=True,
+        domain=[('code', '=', 'gnuhealth.surgery')]))
 
 
 class RCRI(ModelSQL, ModelView):
@@ -161,50 +171,41 @@ class Surgery(ModelSQL, ModelView):
     'Surgery'
     __name__ = 'gnuhealth.surgery'
 
+
     def surgery_duration(self, name):
 
-        duration = ''
         if (self.surgery_end_date and self.surgery_date):
-                delta = relativedelta(self.surgery_end_date, self.surgery_date)
-
-                duration = str(
-                    delta.days*24 + delta.hours) + 'h ' \
-                    + str(delta.minutes) + 'm '
-        return duration
+            return self.surgery_end_date - self.surgery_date
+        else:
+            return None
 
     def patient_age_at_surgery(self, name):
-
-        if (self.patient.name.dob):
-            dob = datetime.strptime(str(self.patient.name.dob), '%Y-%m-%d')
-
-            if (self.surgery_date):
-                surgery_date = datetime.strptime(
-                    str(self.surgery_date), '%Y-%m-%d %H:%M:%S')
-                delta = relativedelta(self.surgery_date, dob)
-
-                years_months_days = str(
-                    delta.years) + 'y ' \
-                    + str(delta.months) + 'm ' \
-                    + str(delta.days) + 'd'
-            else:
-                years_months_days = 'No Surgery Date !'
+        if (self.patient.name.dob and self.surgery_date):
+            rdelta = relativedelta (self.surgery_date.date(),
+                self.patient.name.dob)
+            years_months_days = str(rdelta.years) + 'y ' \
+                + str(rdelta.months) + 'm ' \
+                + str(rdelta.days) + 'd'
+            return years_months_days
         else:
-            years_months_days = 'No DoB !'
-
-        return years_months_days
+            return None
 
     patient = fields.Many2One('gnuhealth.patient', 'Patient', required=True)
     admission = fields.Many2One('gnuhealth.appointment', 'Admission')
     operating_room = fields.Many2One('gnuhealth.hospital.or', 'Operating Room')
-    code = fields.Char('Code', required=True, help="Health Center Unique code")
+    code = fields.Char('Code', readonly=True, help="Health Center code / sequence")
 
     procedures = fields.One2Many(
         'gnuhealth.operation', 'name', 'Procedures',
         help="List of the procedures in the surgery. Please enter the first "
         "one as the main procedure")
 
+    supplies = fields.One2Many(
+        'gnuhealth.surgery_supply', 'name', 'Supplies',
+        help="List of the supplies required for the surgery")
+
     pathology = fields.Many2One(
-        'gnuhealth.pathology', 'Base condition',
+        'gnuhealth.pathology', 'Condition',
         help="Base Condition / Reason")
 
     classification = fields.Selection([
@@ -226,22 +227,36 @@ class Surgery(ModelSQL, ModelView):
         'Date', help="Start of the Surgery")
 
     surgery_end_date = fields.DateTime(
-        'End', required=True, help="End of the Surgery")
+        'End',
+        states={
+            'required': Equal(Eval('state'), 'done'),
+            },
+        help="Automatically set when the surgery is done."
+            "It is also the estimated end time when confirming the surgery.")
 
     surgery_length = fields.Function(
-        fields.Char(
+        fields.TimeDelta(
             'Duration',
+            states={'invisible': And(Not(Equal(Eval('state'), 'done')),
+                    Not(Equal(Eval('state'), 'signed')))},
             help="Length of the surgery"),
         'surgery_duration')
 
     state = fields.Selection([
-        ('in_progress', 'In progress'),
+        ('draft', 'Draft'),
+        ('confirmed', 'Confirmed'),
+        ('cancelled', 'Cancelled'),
+        ('in_progress', 'In Progress'),
         ('done', 'Done'),
+        ('signed', 'Signed'),
         ], 'State', readonly=True, sort=False)
 
     signed_by = fields.Many2One(
         'gnuhealth.healthprofessional', 'Signed by', readonly=True,
-        states={'invisible': Equal(Eval('state'), 'in_progress')},
+        states={
+            'invisible': Not(Equal(Eval('state'), 'signed'))
+            },
+
         help="Health Professional that signed this surgery document")
 
     # age is deprecated in GNU Health 2.0
@@ -256,7 +271,16 @@ class Surgery(ModelSQL, ModelView):
             help="Computed patient age at the moment of the surgery"),
         'patient_age_at_surgery')
 
-    description = fields.Char('Description', required=True)
+    gender = fields.Function(fields.Selection([
+        (None, ''),
+        ('m', 'Male'),
+        ('f', 'Female'),
+        ('f-m','Female -> Male'),
+        ('m-f','Male -> Female'),
+        ], 'Gender'), 'get_patient_gender', searcher='search_patient_gender')
+
+
+    description = fields.Char('Description')
     preop_mallampati = fields.Selection([
         (None, ''),
         ('Class 1', 'Class 1: Full visibility of tonsils, uvula and soft '
@@ -312,6 +336,15 @@ class Surgery(ModelSQL, ModelView):
         'Points 2: Class III Moderate (6.6% complications)\n'
         'Points 3 or more : Class IV High (>11% complications)')
 
+    surgical_wound = fields.Selection([
+        (None, ''),
+        ('I', 'Clean . Class I'),
+        ('II', 'Clean-Contaminated . Class II'),
+        ('III', 'Contaminated . Class III'),
+        ('IV', 'Dirty-Infected . Class IV'),
+        ], 'Surgical wound', sort=False)
+
+
     extra_info = fields.Text('Extra Info')
 
     anesthesia_report = fields.Text('Anesthesia Report')
@@ -323,6 +356,16 @@ class Surgery(ModelSQL, ModelView):
     report_surgery_time = fields.Function(fields.Time('Surgery Time'), 
         'get_report_surgery_time')
 
+    surgery_team = fields.One2Many(
+        'gnuhealth.surgery_team', 'name', 'Team Members',
+        help="Professionals Involved in the surgery")
+
+    postoperative_dx = fields.Many2One(
+        'gnuhealth.pathology', 'Post-op dx',
+        states={'invisible': And(Not(Equal(Eval('state'), 'done')),
+                    Not(Equal(Eval('state'), 'signed')))},
+        help="Post-operative diagnosis")
+
     @staticmethod
     def default_institution():
         HealthInst = Pool().get('gnuhealth.institution')
@@ -342,7 +385,42 @@ class Surgery(ModelSQL, ModelView):
 
     @staticmethod
     def default_state():
-        return 'in_progress'
+        return 'draft'
+
+    def get_patient_gender(self, name):
+        return self.patient.gender
+
+    @classmethod
+    def search_patient_gender(cls, name, clause):
+        res = []
+        value = clause[2]
+        res.append(('patient.name.gender', clause[1], value))
+        return res
+
+
+    # Show the gender and age upon entering the patient 
+    # These two are function fields (don't exist at DB level)
+    @fields.depends('patient')
+    def on_change_patient(self):
+        gender=None
+        age=''
+        self.gender = self.patient.gender
+        self.computed_age = self.patient.age
+
+
+    @classmethod
+    def create(cls, vlist):
+        Sequence = Pool().get('ir.sequence')
+        Config = Pool().get('gnuhealth.sequences')
+
+        vlist = [x.copy() for x in vlist]
+        for values in vlist:
+            if not values.get('code'):
+                config = Config(1)
+                values['code'] = Sequence.get_id(
+                    config.surgery_code_sequence.id)
+        return super(Surgery, cls).create(vlist)
+
 
     @classmethod
     # Update to version 2.0
@@ -361,13 +439,28 @@ class Surgery(ModelSQL, ModelView):
         super(Surgery, cls).__setup__()
         cls._error_messages.update({
             'end_date_before_start': 'End time "%(end_date)s" BEFORE '
-                'surgery date "%(surgery_date)s"'})
+                'surgery date "%(surgery_date)s"',
+            'or_is_not_available': 'Operating Room is not available'})
 
         cls._buttons.update({
+            'confirmed': {
+                'invisible': And(Not(Equal(Eval('state'), 'draft')),
+                    Not(Equal(Eval('state'), 'cancelled'))),
+                },
+            'cancel': {
+                'invisible': Not(Equal(Eval('state'), 'confirmed')),
+                },
+            'start': {
+                'invisible': Not(Equal(Eval('state'), 'confirmed')),
+                },
+            'done': {
+                'invisible': Not(Equal(Eval('state'), 'in_progress')),
+                },
             'signsurgery': {
-                'invisible': Equal(Eval('state'), 'done'),
-            },
-        })
+                'invisible': Not(Equal(Eval('state'), 'done')),
+                },
+
+            })
         
     @classmethod
     def validate(cls, surgeries):
@@ -378,36 +471,114 @@ class Surgery(ModelSQL, ModelView):
     def validate_surgery_period(self):
         Lang = Pool().get('ir.lang')
 
-        languages = Lang.search([
+        language, = Lang.search([
             ('code', '=', Transaction().language),
             ])
         if (self.surgery_end_date and self.surgery_date):
             if (self.surgery_end_date < self.surgery_date):
                 self.raise_user_error('end_date_before_start', {
-                        'surgery_date': datetime_strftime(self.surgery_date,
-                            str(languages[0].date)),
-                        'end_date': datetime_strftime(self.surgery_end_date,
-                            str(languages[0].date)),
+                        'surgery_date': Lang.strftime(self.surgery_date,
+                            language.code,
+                            language.date),
+                        'end_date': Lang.strftime(self.surgery_end_date,
+                            language.code,
+                            language.date),
                         })
 
 
     @classmethod
     def write(cls, surgeries, vals):
         # Don't allow to write the record if the surgery has been signed
-        if surgeries[0].state == 'done':
+        if surgeries[0].state == 'signed':
             cls.raise_user_error(
                 "This surgery is at state Done and has been signed\n"
                 "You can no longer modify it.")
         return super(Surgery, cls).write(surgeries, vals)
 
- # Finish and sign the surgery document, and the surgical act.
+    ## Method to check for availability and make the Operating Room reservation
+     # for the associated surgery
+     
+    @classmethod
+    @ModelView.button
+    def confirmed(cls, surgeries):
+        surgery_id = surgeries[0]
+        Operating_room = Pool().get('gnuhealth.hospital.or')
+        cursor = Transaction().cursor
+
+        # Operating Room and end surgery time check
+        if (not surgery_id.operating_room or not surgery_id.surgery_end_date):
+            cls.raise_user_error("Operating Room and estimated end time  "
+            "are needed in order to confirm the surgery")
+
+        or_id = surgery_id.operating_room.id
+        cursor.execute("SELECT COUNT(*) \
+            FROM gnuhealth_surgery \
+            WHERE (surgery_date::timestamp,surgery_end_date::timestamp) \
+                OVERLAPS (timestamp %s, timestamp %s) \
+              AND (state = %s or state = %s) \
+              AND operating_room = CAST(%s AS INTEGER) ",
+            (surgery_id.surgery_date,
+            surgery_id.surgery_end_date,
+            'confirmed', 'in_progress', str(or_id)))
+        res = cursor.fetchone()
+        if (surgery_id.surgery_end_date <
+            surgery_id.surgery_date):
+            cls.raise_user_error("The Surgery end date must later than the \
+                Start")
+        if res[0] > 0:
+            cls.raise_user_error('or_is_not_available')
+        else:
+            cls.write(surgeries, {'state': 'confirmed'})
+ 
+    # Cancel the surgery and set it to draft state
+    # Free the related Operating Room
+    
+    @classmethod
+    @ModelView.button
+    def cancel(cls, surgeries):
+        surgery_id = surgeries[0]
+        Operating_room = Pool().get('gnuhealth.hospital.or')
+        
+        cls.write(surgeries, {'state': 'cancelled'})
+
+    # Start the surgery
+    
+    @classmethod
+    @ModelView.button
+    def start(cls, surgeries):
+        surgery_id = surgeries[0]
+        Operating_room = Pool().get('gnuhealth.hospital.or')
+
+        cls.write(surgeries, 
+            {'state': 'in_progress',
+             'surgery_date': datetime.now(),
+             'surgery_end_date': datetime.now()})
+        Operating_room.write([surgery_id.operating_room], {'state': 'occupied'})
+
+
+    # Finnish the surgery
+    # Free the related Operating Room
+    
+    @classmethod
+    @ModelView.button
+    def done(cls, surgeries):
+        surgery_id = surgeries[0]
+        Operating_room = Pool().get('gnuhealth.hospital.or')
+        
+        cls.write(surgeries, {'state': 'done',
+                              'surgery_end_date': datetime.now()})
+                              
+        Operating_room.write([surgery_id.operating_room], {'state': 'free'})
+
+
+    # Sign the surgery document, and the surgical act.
 
     @classmethod
     @ModelView.button
     def signsurgery(cls, surgeries):
         surgery_id = surgeries[0]
 
-        # Sign, change the state of the Surgery to "Done"
+        # Sign, change the state of the Surgery to "Signed"
         # and write the name of the signing health professional
 
         signing_hp = Pool().get('gnuhealth.healthprofessional').get_health_professional()
@@ -416,7 +587,7 @@ class Surgery(ModelSQL, ModelView):
                 "No health professional associated to this user !")
 
         cls.write(surgeries, {
-            'state': 'done',
+            'state': 'signed',
             'signed_by': signing_hp})
 
     def get_report_surgery_date(self, name):
@@ -446,6 +617,8 @@ class Surgery(ModelSQL, ModelView):
         return datetime.astimezone(dt.replace(tzinfo=pytz.utc), timezone).time()
 
 
+
+
 class Operation(ModelSQL, ModelView):
     'Operation - Surgical Procedures'
     __name__ = 'gnuhealth.operation'
@@ -457,6 +630,38 @@ class Operation(ModelSQL, ModelView):
     notes = fields.Text('Notes')
 
 
+class SurgerySupply(ModelSQL, ModelView):
+    'Supplies related to the surgery'
+    __name__ = 'gnuhealth.surgery_supply'
+
+    name = fields.Many2One('gnuhealth.surgery', 'Surgery')
+    qty = fields.Numeric('Qty',required=True,
+        help="Initial required quantity")
+    supply = fields.Many2One(
+        'product.product', 'Supply', required=True,
+        domain=[('is_medical_supply', '=', True)],
+        help="Supply to be used in this surgery")
+   
+    notes = fields.Char('Notes')
+    qty_used = fields.Numeric('Used', required=True,
+        help="Actual amount used")
+    
+class SurgeryTeam(ModelSQL, ModelView):
+    'Team Involved in the surgery'
+    __name__ = 'gnuhealth.surgery_team'
+
+    name = fields.Many2One('gnuhealth.surgery', 'Surgery')
+    team_member = fields.Many2One(
+        'gnuhealth.healthprofessional', 'Member', required=True, select=True,
+        help="Health professional that participated on this surgery")
+
+    role = fields.Many2One(
+        'gnuhealth.hp_specialty', 'Role',
+        domain=[('name', '=', Eval('team_member'))],
+        depends=['team_member'])
+    
+    notes = fields.Char('Notes')
+
 class PatientData(ModelSQL, ModelView):
     __name__ = 'gnuhealth.patient'
 
diff --git a/health_surgery_view.xml b/health_surgery_view.xml
index e34d394..eaa3432 100644
--- a/health_surgery_view.xml
+++ b/health_surgery_view.xml
@@ -26,7 +26,7 @@
         <record model="ir.action.act_window" id="act_rcri_form1">
             <field name="name">RCRI</field>
             <field name="res_model">gnuhealth.rcri</field>
-            <field name="domain">[('patient', '=', Eval('active_id'))]</field>
+            <field name="domain" eval="[('patient', '=', Eval('active_id'))]" pyson="1"/>
         </record>
         <record model="ir.action.keyword"
                 id="act_open_appointment_keyword1">
@@ -67,6 +67,47 @@
             <field name="act_window" ref="action_gnuhealth_surgery_view"/>
         </record>
 
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="10"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_confirmed">
+            <field name="name">Confirmed</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('state', '=', 'confirmed')]" pyson="1"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_in_progress">
+            <field name="name">In Progress</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="[('state', '=', 'in_progress')]" pyson="1"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_done">
+            <field name="name">Done</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('state', '=', 'done')]" pyson="1"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_surgery_domain_signed">
+            <field name="name">Signed</field>
+            <field name="sequence" eval="60"/>
+            <field name="domain" eval="[('state', '=', 'signed')]" pyson="1"/>
+            <field name="act_window" ref="action_gnuhealth_surgery_view"/>
+        </record>
+
         <menuitem name="Surgeries" parent="health.gnuhealth_menu"
             id="gnuhealth_surgery_menu" sequence="50"
             action="action_gnuhealth_surgery_view"
@@ -79,7 +120,7 @@
         <record model="ir.action.act_window" id="act_surgery_form">
             <field name="name">Surgeries</field>
             <field name="res_model">gnuhealth.surgery</field>
-            <field name="domain">[('patient', '=', Eval('active_id'))]</field>
+            <field name="domain" eval="[('patient', '=', Eval('active_id'))]" pyson="1"/>
         </record>
         <record model="ir.action.keyword" id="act_open_surgery_keyword">
             <field name="keyword">form_relate</field>
@@ -101,6 +142,7 @@
             <field name="name">gnuhealth_procedure_tree</field>
         </record>
 
+
 <!-- Operation -->
 
         <record model="ir.ui.view" id="gnuhealth_operation_view">
@@ -115,6 +157,34 @@
             <field name="name">gnuhealth_operation_tree</field>
         </record>
 
+<!-- Surgery Supply -->
+
+        <record model="ir.ui.view" id="gnuhealth_surgery_supply_view">
+            <field name="model">gnuhealth.surgery_supply</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_surgery_supply</field>
+        </record>
+
+        <record model="ir.ui.view" id="gnuhealth_surgery_supply_tree">
+            <field name="model">gnuhealth.surgery_supply</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_surgery_supply_tree</field>
+        </record>
+
+<!-- Surgery Team -->
+
+        <record model="ir.ui.view" id="gnuhealth_surgery_team_view">
+            <field name="model">gnuhealth.surgery_team</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_surgery_team</field>
+        </record>
+
+        <record model="ir.ui.view" id="gnuhealth_surgery_team_tree">
+            <field name="model">gnuhealth.surgery_team</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_surgery_team_tree</field>
+        </record>
+
 <!-- Include the Surgery page into the Patient History -->
 
         <record model="ir.ui.view" id="gnuhealth_patient_view">
diff --git a/locale/zh_CN.po b/locale/ar.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/ar.po
index 5e17b0b..d52aadc 100644
--- a/locale/zh_CN.po
+++ b/locale/ar.po
@@ -1,238 +1,247 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+# Nab3a <asn09 at aub.edu.lb>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 12:36+0000\n"
+"Last-Translator: Nab3a <asn09 at aub.edu.lb>\n"
+"Language: ar\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452256587.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "أنشئ معلومات"
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "المُعرّف"
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr "عملية جراحية"
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr "مذكرات"
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr "رمز"
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr "العمليات الجراحية"
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr "الصحة المهنية"
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr "رقم المريض"
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr "تاريخ الأمراض الدماغية الوعائية"
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr "RCRI Class"
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr "تاريخ من أمراض القلب الاحتقاني"
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr "تاريخ"
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr "مرض السكري قبل الجراحة"
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr "الجراحة عالية المخاطر"
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr "تاريخ من أمراض نقص تروية القلب"
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr "مرض الكلى قبل الجراحة"
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr "نتيجة"
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "كتابة مستخدم"
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr "القبول"
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr "العمر التقديري"
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr "طبيب مخدر"
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr "مستوى الإلحاح"
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr "رمز"
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr "العمر"
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "أنشئ معلومات"
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم"
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr "الوصفة"
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr "معلومات اضافية"
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "المعرف"
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr "مؤسسة"
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr "غرفة العمليات"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr "المريض"
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr "الوقاية باستخدام المضادات الحيوية"
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr "خطر نزيف حاد"
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr "نقاط Mallampati "
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr "نبض مقياس التأكسج في المكان"
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr "RCRI"
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr "وضع علامات على المواقع الجراحية "
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr "تأكيد العقم"
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr "الإجراءات"
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +249,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr "موقع بواسطة"
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr "الحالة"
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr "جراح"
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr "تاريخ"
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr "انهاء"
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr "المدة "
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "كتابة مستخدم"
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +404,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +416,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr "طبيب التخدير المسؤول"
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr "سن المريض محسوب في لحظة من عملية جراحية"
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr "الحالة الأساسية / السبب"
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr "العلاج بالمضادات الحيوية الوقائية في غضون الدقائق ال 60 الماضية"
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +473,305 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr "سجل الجراح شق جراحي"
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr "تأكيد فريق التمريض للتعقيم في  الأجهزة والغرفة"
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
+"قائمة من الإجراءات في الجراحة. الرجاء إدخال أول واحد كما الإجراء الرئيسي"
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr "الجراح الذي لم يؤدي  الإجراء"
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr "العملية - العمليات الجراحية"
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr "مؤشر الخطر على القلب المريض المنقح"
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr "عملية جراحية"
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr "RCRI"
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr "العمليات الجراحية"
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr "العمليات الجراحية"
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "العمليات الجراحية"
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "إدارة الجراحة الصحية"
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr "الأول"
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr "الثّاني"
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr "الثّالث"
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr "IV "
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr "الطوارئ"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr "اختياري"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr "مطلوب"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr "مٌستعجل"
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr "PS 1: صحة المريض  طبيعية"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr "PS 2: المرضى الذين يعانون من أمراض جهازية معتدل"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr "PS 3: المرضى الذين يعانون من أمراض جهازية شديدة"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
+"PS 4: المرضى الذين يعانون من أمراض جهازية شديدة تشكل تهديدا مستمرا للحياة"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr "PS 5: المرضى الذين يحتضرون والذي لا يتوقع أن يعيشوا بدون عملية"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+"PS 6: أعلنت المريض بالسكتة الدماغية الذين يتم إزالة الأجهزة لأغراض الجهات "
+"المانحة"
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr "الفئة 1: وضوح كامل من اللوزتين، لهاة الحلق واللهاة"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr "الفئة 2: وضوح من الحنك الصلب واللين، الجزء العلوي من اللوزتين واللهاة"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr "الفئة 3: الحنك لين والثابت وقاعدة لهاة مرئية"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr "الفئة 4: فقط الحنك الصلب مرئي"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "تم"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/de_AT.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/de_AT.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/de_AT.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/el_GR.po b/locale/el_GR.po
index e8e45b2..aebfea8 100644
--- a/locale/el_GR.po
+++ b/locale/el_GR.po
@@ -1,24 +1,24 @@
-# 
-# Translators:
-# kvisitor <kvisitor at gnugr.org>, 2013-2014
-# kvisitor <kvisitor at gnugr.org>, 2011, 2012
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/GNU_Health/language/el/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-10 17:03+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language: el_GR\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452445415.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "'Ωρα τέλους \"%(end_date)s\" ΠΡΙΝ την ημερομηνία χειρουργείου \"%(surgery_date)s\""
+msgstr ""
+"'Ωρα τέλους \"%(end_date)s\" ΠΡΙΝ την ημερομηνία χειρουργείου \"%"
+"(surgery_date)s\""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
@@ -128,6 +128,10 @@ msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
 msgstr "Γράψτε τον χρήστη"
 
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
 msgstr "Εισαγωγή"
@@ -172,6 +176,10 @@ msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
 msgstr "Επιπλέον Πληροφορίες"
 
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
 msgstr "ID"
@@ -185,13 +193,17 @@ msgid "Operating Room"
 msgstr "Αίθουσα Χειρουργείου"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "Βασική Κατάσταση "
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
 msgstr "Ασθενής"
 
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
 msgstr "Αντιβίωση για προφύλαξη"
@@ -248,6 +260,10 @@ msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
 msgstr "Περιοχή"
 
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
 msgstr "Χειρουργός"
@@ -264,6 +280,14 @@ msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
 msgstr "Διάρκεια"
 
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
 msgstr "Γράψτε την ημερομηνία"
@@ -272,6 +296,90 @@ msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
 msgstr "Γράψτε τον χρήστη"
 
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
 msgstr "Κωδικός διαδικασίας, για παράδειγμα ICD-10-PCS ή ICPM"
@@ -288,7 +396,9 @@ msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "Περιλαμβάνει οποιεσδήποτε υπερβουβωνικές αγγειακές, ενδοπεριτοναίκές, η ενδοθωρακικές διαδικασίες."
+msgstr ""
+"Περιλαμβάνει οποιεσδήποτε υπερβουβωνικές αγγειακές, ενδοπεριτοναίκές, η "
+"ενδοθωρακικές διαδικασίες."
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -297,7 +407,12 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "ιστορικό Εμφράγματος Μυοκαρδίου ή μια θετική δοκιμασία κοπώσεως, με τρέχον σύμπτωμα ένα προκάρδιο άλγος που θεωρείται  δευτερογενές από την μυοκαρδιακή ισχαιμία, χρήση αγωγής με νιτρώδη, ή ΗΚΓ με παθολογικά Q. Να μη ληφθούν υπ' όψιν προηγούμενες παρεμβάσεις επαναγγείωσης των στεφανιαίων, εκτός και αν υπάρχει ένα ή περισσότερα κριτήρια ισχαιμικής στεφανιαίας νόσου"
+msgstr ""
+"ιστορικό Εμφράγματος Μυοκαρδίου ή μια θετική δοκιμασία κοπώσεως, με τρέχον "
+"σύμπτωμα ένα προκάρδιο άλγος που θεωρείται  δευτερογενές από την μυοκαρδιακή "
+"ισχαιμία, χρήση αγωγής με νιτρώδη, ή ΗΚΓ με παθολογικά Q. Να μη ληφθούν υπ' "
+"όψιν προηγούμενες παρεμβάσεις επαναγγείωσης των στεφανιαίων, εκτός και αν "
+"υπάρχει ένα ή περισσότερα κριτήρια ισχαιμικής στεφανιαίας νόσου"
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
@@ -309,13 +424,19 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 Βαθμοί: Κλάση I Πολύ χαμηλή (0.4% επιπλοκές)\n1 Βαθμός: Κλάση II Χαμηλή (0.9% επιπλοκές)\n2 Βαθμοί: Κλάση III Μέτρια (6.6% επιπλοκές)\n3 ή παραπάνω Βαθμοί: Κλάση IV Υψηλή (>11% επιπλοκές)"
+msgstr ""
+"0 Βαθμοί: Κλάση I Πολύ χαμηλή (0.4% επιπλοκές)\n"
+"1 Βαθμός: Κλάση II Χαμηλή (0.9% επιπλοκές)\n"
+"2 Βαθμοί: Κλάση III Μέτρια (6.6% επιπλοκές)\n"
+"3 ή παραπάνω Βαθμοί: Κλάση IV Υψηλή (>11% επιπλοκές)"
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Χρησιμοποιήστε αυτό το πεδίο για λόγους ιστορικού, όταν δεν παρέχεται καμία ημερομηνία για τις χειρουργικές επεμβάσεις."
+msgstr ""
+"Χρησιμοποιήστε αυτό το πεδίο για λόγους ιστορικού, όταν δεν παρέχεται καμία "
+"ημερομηνία για τις χειρουργικές επεμβάσεις."
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
@@ -326,8 +447,8 @@ msgid "Urgency level for this surgery"
 msgstr "Βαθμός επείγοντος για το χειρουργείο αυτό"
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Μοναδικός κωδικός Κέντρου Υγείας "
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
@@ -337,6 +458,10 @@ msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
 msgstr "Βασική Κατάσταση  / Αιτία"
 
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
 msgstr "Προφυλακτική αντιβιοτ. θεραπεία στα τελευταία 60 λεπτά"
@@ -370,18 +495,25 @@ msgstr "Ο χειρουργός έχει μαρκάρει τη χειρουργ
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "Η Νοσηλευτ. ομάδα επιβεβαίωσε την αποστείρωση των εργαλείων και της αίθουσας"
+msgstr ""
+"Η Νοσηλευτ. ομάδα επιβεβαίωσε την αποστείρωση των εργαλείων και της αίθουσας"
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Κατάλογος διαδικασιών στο χειρουργείο. Παρακαλώ εισάγετε την πρώτη τοιαύτη ως κύρια διαδικασία"
+msgstr ""
+"Κατάλογος διαδικασιών στο χειρουργείο. Παρακαλώ εισάγετε την πρώτη τοιαύτη "
+"ως κύρια διαδικασία"
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
 msgstr "Επαγγελματίας υγείας που υπέγραψε αυτό το έγγραφο χειρουργείου"
 
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
 msgstr "Χειρουργός που έκανε τη διαδικασία"
@@ -391,13 +523,35 @@ msgid "Start of the Surgery"
 msgstr "Έναρξη Χειρουργικής επέμβασης"
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Τέλος Χειρουργικής επέμβασης"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
 msgstr "Διάρκεια Χειρουργικής επέμβασης"
 
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
+
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
 msgstr "Επέμβαση - Χειρουργ. Επεμβάσεις"
@@ -410,6 +564,14 @@ msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
 msgstr "Χειρουργείο"
 
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
 msgstr "RCRI"
@@ -426,244 +588,51 @@ msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
 msgstr "Αναφορά χειρουργείου"
 
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Χειρουργεία"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Διαχείριση Χειρουργικής υγείας"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "( Κλάση"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Συνηθισμένος υγιής ασθενής"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Ασθενείς με ήπια συστηματική νόσο"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Ασθενείς με σοβαρή συστηματική νόσο"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4 : Ασθενείς με σοβαρή συστηματική νόσο που απειλεί συνεχώς τη ζωή"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5 : Ετοιμοθάνατοι ασθενείς που δεν αναμένεται να επιβιώσουν χωρίς την επέμβαση"
-
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Ασθενής με πιστοποίηση εγκεφαλικού θανάτου, του οποίου τα όργανα αφαιρούνται με σκοπό τη δωρεά"
-
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
-
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "ASA"
-
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Ηλικία"
-
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Αναφορά αναισθησίας"
-
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Αναισθησιολόγος"
-
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Προφύλαξη με αντιβίωση:"
-
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Βασική κατάσταση"
-
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Κλάση 1:"
-
-msgctxt "odt:surgery:"
-msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "Κατηγορία 2: Ορατότητα σκληράς και μαλθακής υπερώας, του άνω τμήματος των αμυγδαλών και της σταφυλής."
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Κατηγορία 3: Η μαλθακή και σκληρά υπερώα, καθώς και η βάση της σταφυλής, είναι ορατές."
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "Κατηγορία 4: Μόνον η σκληρά υπερώα είναι ορατή"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Κατάταξη"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Ημερομηνία"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Περιγραφή"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Επείγουσα"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Θήλυ"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Πλήρης ορατότης αμυγδαλών, σταφυλής και μαλθακής υπερώας"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Ίδρυμα"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Κύριος χειρουργός"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Άρρην"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Βαθμολογία Mallampati"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Σημειώσεις"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Αίθουσα Χειρουργείου"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Προαιρετικός/ή"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Ασθενής"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Φυσική κατάσταση"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Προεγχειρητική λίστα ελέγχου"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "Προεγχειρητικά"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Ημερομηνία εκτύπωσης"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Κωδικός διαδικασίας"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Διαδερμικό οξύμετρο στη θέση του:"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Απαιτούμενα"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "Αναθεωρημένος δείκτης καρδιακού κινδύνου (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Κίνδυνος μαζικής αιμορραγίας,"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Σεξ"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Επιβεβαιωμένη στειρότητα:"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "Λεπτομέρειες χειρουργείου / Συμβάματα"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Αναφορά χειρουργείου:"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Χρόνος χειρουργείου:"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "Σήμανση χειρουργικού πεδίου:"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Επειγόντως"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "κατά το χειρουργείο"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "Χειρουργεία"
 
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr ""
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "Διαχείριση Χειρουργικής υγείας"
 
-msgctxt "odt:surgery:"
-msgid "i"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
+msgid ""
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "ενδοφλέβια πρόσβαση και διαθέσιμα υγρά"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
 msgstr "I"
@@ -681,6 +650,10 @@ msgid "IV"
 msgstr "IV"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
 msgstr "Επείγουσα"
 
@@ -696,6 +669,30 @@ msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
 msgstr "Επείγον"
 
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
 msgstr "PS 1 : Κανονικός υγιής αθενής"
@@ -712,19 +709,29 @@ msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "PS 4 : Ασθενείς με σοβαρή συστημική νόσο που αποτελεί μόνιμη απειλή για τη ζωή"
+msgstr ""
+"PS 4 : Ασθενείς με σοβαρή συστημική νόσο που αποτελεί μόνιμη απειλή για τη "
+"ζωή"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "PS 5 : Ετοιμοθάνατοι ασθενείς που δεν αναμένεται να επιζήσουν χωρίς τη χειρουργική επέμβαση"
+msgstr ""
+"PS 5 : Ετοιμοθάνατοι ασθενείς που δεν αναμένεται να επιζήσουν χωρίς τη "
+"χειρουργική επέμβαση"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "PS 6 : Ένας ασθενής επισήμως δηλωμένος εγκεφλικά νεκρός του οποίου τα όργανα αφαιρούνται με σκοπό τη δωρεά"
+msgstr ""
+"PS 6 : Ένας ασθενής επισήμως δηλωμένος εγκεφλικά νεκρός του οποίου τα όργανα "
+"αφαιρούνται με σκοπό τη δωρεά"
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
@@ -734,80 +741,60 @@ msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "Κατηγορία 2: Ορατότητα σκληράς και μαλθακής υπερώας, του άνω τμήματος των αμυγδαλών και της σταφυλής."
+msgstr ""
+"Κατηγορία 2: Ορατότητα σκληράς και μαλθακής υπερώας, του άνω τμήματος των "
+"αμυγδαλών και της σταφυλής."
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Κατηγορία 3: Η μαλθακή και σκληρά υπερώα, καθώς και η βάση της σταφυλής, είναι ορατές."
+msgstr ""
+"Κατηγορία 3: Η μαλθακή και σκληρά υπερώα, καθώς και η βάση της σταφυλής, "
+"είναι ορατές."
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
 msgstr "Κατηγορία 4: Μόνον η σκληρά υπερώα είναι ορατή"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Έγινε"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "Σε εξέλιξη"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Χειρουργ. επέμβαση"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Ιατρική πράξη/ Διαδικασία"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Λεπτομέρειες/ Συμβάματα διαδικασίας"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Χειρουργεία"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Διαδικασία"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "RCRI"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI : Revised Cardiac Risk Index (Αναθεωρημένος δείκτης καρδιακού κινδύνου)"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "Έγινε"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Αναισθησία"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "Λεπτομέρειες / Συμβάματα"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "Να τελειώσετε και να υπογράψετε αυτό το χειρουργείο; Μετά θα γίνει μόνο για ανάγνωση !"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Εκτίμηση Χειρουργικού κινδύνου ασθενούς"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Προεγχειρητικη λίστα ελέγχου"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Σημείο"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "Υπογράψτε αυτό το χειρουργείο"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Χειρουργείο"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/en_GB.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/en_GB.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/en_GB.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_AR.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/es_AR.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/es_AR.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_EC.po
similarity index 56%
copy from locale/es_ES.po
copy to locale/es_EC.po
index 0df41d0..604f2c0 100644
--- a/locale/es_ES.po
+++ b/locale/es_EC.po
@@ -1,40 +1,30 @@
-# 
-# Translators:
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014-2015
-# cristina <cmelgosa at thymbra.com>, 2011, 2012
-# cristina <cmelgosa at thymbra.com>, 2011-2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2013
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012-2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013-2014
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011
-# Sebastián Marró <smarro at thymbra.com>, 2013-2014
+# Fabyc <fabianc7 at gmail.com>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-30 17:11+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/GNU_Health/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 20:09+0000\n"
+"Last-Translator: Fabyc <fabianc7 at gmail.com>\n"
+"Language: es_EC\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n !=1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452283753.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "Fecha fin \"%(end_date)s\" ANTES que fecha cirugía \"%(surgery_date)s\""
+msgstr "Hoa fin \"%(end_date)s\" ANTES que fecha de cirugía \"%(surgery_date)s\""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr "Sala de Operaciones no está disponible"
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
@@ -58,11 +48,11 @@ msgstr "Nombre"
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
@@ -70,11 +60,11 @@ msgstr "Cirugías"
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
@@ -86,7 +76,7 @@ msgstr "ID"
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "ID del paciente"
+msgstr "ID del Paciente"
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
@@ -98,7 +88,7 @@ msgstr "Clase IRCR"
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "Antecedentes de enfermedad cardiaca congestiva"
+msgstr "Antecedentes de enfermedad cardíaca congestiva"
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
@@ -130,11 +120,15 @@ msgstr "Nombre"
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr "Secuencia de Cirugía"
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
@@ -146,7 +140,7 @@ msgstr "Edad Estimada"
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "Informe de anestesia"
+msgstr "Informe de Anestesia"
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
@@ -166,11 +160,11 @@ msgstr "Edad"
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
@@ -180,6 +174,10 @@ msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
 msgstr "Información Adicional"
 
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr "Género"
+
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
 msgstr "ID"
@@ -193,13 +191,17 @@ msgid "Operating Room"
 msgstr "Quirófano"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "Condición de base"
+msgid "Condition"
+msgstr "Condición"
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
 msgstr "Profilaxis antibiótica"
@@ -214,7 +216,7 @@ msgstr "Riesgo de hemorragia masiva"
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "Score Mallampati"
+msgstr "Puntuación Mallampati"
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
@@ -226,11 +228,11 @@ msgstr "IRCR"
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "Marcado del área quirúrgica"
+msgstr "Marcado del Área Quirúrgica"
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "Esterilidad verificada"
+msgstr "Esterilidad confirmada"
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
@@ -256,6 +258,10 @@ msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
 msgstr "Estado"
 
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr "Suministros"
+
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
 msgstr "Cirujano"
@@ -272,13 +278,105 @@ msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
 msgstr "Duración"
 
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr "Miembros del equipo"
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr "Cirugía"
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr "Notas"
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr "Suministro"
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr "Cirugía"
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr "Notas"
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
@@ -286,17 +384,19 @@ msgstr "Código de Procedimiento, por ejemplo ICD-10-PCS o ICPM"
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "Profesional Médico / Cardiólogo que firmó el estudio IRCR"
+msgstr "Profesional de la salud / Cardiólogo que firmó el estudio IRCR"
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "Diabetes Mellitus que requiere tratamiento con insulina"
+msgstr "Diabetes Mellitus que requiere tratamiento con Insulina"
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "Incluye procedimeintos vascular supra-inguinal, intraperitoneal o intratorácico"
+msgstr ""
+"Incluye procedimientos vascular supra-inguinal, intraperitoneal o "
+"intratorácico"
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -305,7 +405,13 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "historia de infarto de miocardio o una prueba de esfuerzo positiva, presente queja de dolor torácico considerado como secundario a la isquemia miocárdica, el uso del tratamiento con nitratos, o ECG con ondas Q patológicas; no cuentan procedimiento de revascularización coronaria previa a menos que uno de los otros criterios para la enfermedad de cardiopatía isquémica esté presente"
+msgstr ""
+"historia de infarto de miocardio o una prueba de esfuerzo positiva, presente "
+"queja de dolor torácico considerado como secundario a la isquemia "
+"miocárdica, el uso del tratamiento con nitratos, o ECG con ondas Q "
+"patológicas; no cuentan procedimiento de revascularización coronaria previa "
+"a menos que uno de los otros criterios para la enfermedad de cardiopatía "
+"isquémica esté presente"
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
@@ -317,13 +423,18 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\nPuntos 1: Clase II Bajo (0.9% complicaciones)\nPuntos 2: Clase III Moderado (6.6% complicaciones)\nPuntos 3 o más : Clase IV Elevado(>11% complicaciones)"
+msgstr ""
+"Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\n"
+"Puntos 1: Clase II Bajo (0.9% complicaciones)\n"
+"Puntos 2: Clase III Moderado (6.6% complicaciones)\n"
+"Puntos 3 o más : Clase IV Elevado(>11% complicaciones)"
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Usar campo por motivos históricos, cuando no se proporciona fecha de cirugía"
+msgstr ""
+"Usar campo por motivos históricos, cuando no se proporciona fecha de cirugía"
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
@@ -334,8 +445,8 @@ msgid "Urgency level for this surgery"
 msgstr "Nivel de urgencia para esta cirugía"
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Código único del centro de salud"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
@@ -343,7 +454,11 @@ msgstr "Edad del paciente en el momento de la cirugía"
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "Condición de base / Motivo"
+msgstr "Condición de Base / Motivo"
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
@@ -357,7 +472,10 @@ msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
 "Patient has a risk of losing more than 500 ml in adults of over 7ml/kg in "
 "infants. If so, make sure that intravenous access and fluids are available"
-msgstr "El paciente tiene riesgo de perder más de 500 ml en adultos y más de 7ml/kg en niños. Si es así, asegúrese que están disponibles las vías intravenosas y fluidos."
+msgstr ""
+"El paciente tiene riesgo de perder más de 500 ml en adultos y más de 7ml/kg "
+"en niños. Si es así, asegúrese que están disponibles las vías intravenosas y "
+"fluidos."
 
 msgctxt "help:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse oximeter is in place and functioning"
@@ -370,7 +488,12 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Indice de Riesgo Cardíaco del Paciente\nPuntos 0: Clase I Muy Bajo (0.4% complicaciones)\nPuntos 1: Clase II Bajo (0.9% complicaciones)\nPuntos 2: Clase III Moderado (6.6% complicaciones)\nPuntos 3 o más: Clase IV Alto (>11% complicaciones)"
+msgstr ""
+"Indice de Riesgo Cardíaco del Paciente\n"
+"Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\n"
+"Puntos 1: Clase II Bajo (0.9% complicaciones)\n"
+"Puntos 2: Clase III Moderado (6.6% complicaciones)\n"
+"Puntos 3 o más: Clase IV Alto (>11% complicaciones)"
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
@@ -378,37 +501,66 @@ msgstr "El cirujano ha marcado la incisión quirúrgica"
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "Enfermería ha confirmado la esterilidad de los dispositivos y del quirófano"
+msgstr ""
+"Enfermería ha confirmado la esterilidad de los dispositivos y del quirófano"
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Lista de procedimientos en la cirugía. Introduzca el primero como el procedimiento principal"
+msgstr ""
+"Lista de procedimientos en la cirugía. Introduzca el primero como el "
+"procedimiento principal"
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
 msgstr "Profesional de la Salud que firmó este documento de cirugía"
 
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "Cirujano que realizó el procedimiento"
+msgstr "Cirujano que realizó la operación"
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "Comienzo de la cirugía"
+msgstr "Inicio de la Operación"
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Fin de la cirugía"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "Duración de la cirugía"
+msgstr "Duración de la operación"
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "Operación - Procedimientos quirúrgicos"
+msgstr "Operación - Procedimientos Quirúrgicos"
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
@@ -418,6 +570,14 @@ msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
 msgstr "Cirugía"
 
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
 msgstr "IRCR"
@@ -432,245 +592,52 @@ msgstr "Cirugías"
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "Informe de cirugía"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Cirugías"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Administración de consultas de salud"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "( Class"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(ID"
+msgstr "Informe de Cirugía"
 
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Paciente saludable normal"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Pacientes con enfermedad sistémica leve"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Pacientes con enfermedad sistémica grave"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4 : Pacientes con enfermedad sistémica grave que le supone un riesgo constante a su vida"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5 : Pacientes moribundos que no se espera que sobrevivan a la operación"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Paciente con muerte cerebral declarada cuyos órganos se extraen para donación"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr "Realizada"
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "ASA"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Edad"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Informe de anestesia"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Anestesista"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr "Cirugía"
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Profilaxis antibiótica :"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr "Cirugía"
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Condición Base"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "Cirugías"
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Class 1:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "Administración de consultas de salud"
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "Clase 2: Visibilidad de paladar duro, blando, porción superior de las amígdalas y úvula"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Clase 3:  paladar blando, duro y base de la úvula visibles"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "Clase 4: Visible únicamente el paladar duro"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Clasificación"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Emergencia"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Femenino"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Visibilidad total de amígdala, úvula y paladar blando"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Institución"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Cirujano principal"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Masculino"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Score Mallampati"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Notas"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Quirófano"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Opcional"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Paciente"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Estado físico"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Lista de comprobación del pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
-msgstr "Información del pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "Pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Fecha impresión"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Código de procedimiento"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Saturómetro digital colocado :"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Necesario"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "Índice de Riesgo Cardíaco Revisado (IRCR)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Riesgo de hemorragia masiva,"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Sexo"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Esterilidad verificada :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "Detalles de la cirugía / Incidentes"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Informe de cirugía :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Hora de la cirugía"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "Sitio Quirúrgico Marcado :"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Urgente"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "en cirugía"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "s :"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "a"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "cceso intravenoso y fluidos disponible"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
@@ -689,6 +656,10 @@ msgid "IV"
 msgstr "IV"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
 msgstr "Emergencia"
 
@@ -698,12 +669,36 @@ msgstr "Opcional"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "Necesario"
+msgstr "Requerido"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
 msgstr "Urgente"
 
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr "Femenino"
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr "Masculino"
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
 msgstr "PS 1 : Paciente Normal / Saludable"
@@ -720,19 +715,27 @@ msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "PS 4 : Pacientes con enfermedad sistémica grave que le supone un riesgo constante a su vida"
+msgstr ""
+"PS 4 : Pacientes con enfermedad sistémica grave que le supone un riesgo "
+"constante a su vida"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "PS 5 : Pacientes moribundo que no se espera que sobrevivan sin la operación"
+msgstr "PS 5 : Pacientes moribundo que no se espera que sobrevivan la operación"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "PS 6 : Paciente declarado con muerte cerebral cuyos órganos se extraen para donación"
+msgstr ""
+"PS 6 : Paciente declarado con muerte cerebral cuyos órganos se extraen para "
+"donación"
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
@@ -742,7 +745,9 @@ msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "Clase 2: Visibilidad de paladar duro, blando, porción superior de las amígdalas y úvula"
+msgstr ""
+"Clase 2: Visibilidad de paladar duro, blando, porción superior de las "
+"amígdalas y úvula"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
@@ -753,69 +758,45 @@ msgid "Class 4: Only Hard Palate visible"
 msgstr "Clase 4: Visible únicamente el paladar duro"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Realizada"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "En progreso"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Operación"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Procedimiento"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Detalles del procedimiento / Incidentes"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Cirugías"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Procedimiento"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "IRCR"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "IRCR : Índice de Riesgo Cardiaco Revisado"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "Realizada"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Anestesia"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "Detalles / Incidentes"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "¿Finaliza y firma esta cirugía? ¡Se convertirá en sólo lectura!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Riesgo Quirúrgico del Paciente"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Verificación Pre-quirúrgica"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Firmar"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "Firmar esta cirugía"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Cirugía"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 0df41d0..927a54f 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -1,33 +1,23 @@
-# 
-# Translators:
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014-2015
-# cristina <cmelgosa at thymbra.com>, 2011, 2012
-# cristina <cmelgosa at thymbra.com>, 2011-2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2013
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012-2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013-2014
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011
-# Sebastián Marró <smarro at thymbra.com>, 2013-2014
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-30 17:11+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/GNU_Health/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 11:19+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language: es_ES\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452251943.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
 msgstr "Fecha fin \"%(end_date)s\" ANTES que fecha cirugía \"%(surgery_date)s\""
 
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
+
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
 msgstr "Fecha creación"
@@ -136,6 +126,10 @@ msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
 msgstr "Admisión"
@@ -180,6 +174,10 @@ msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
 msgstr "Información Adicional"
 
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
 msgstr "ID"
@@ -193,13 +191,17 @@ msgid "Operating Room"
 msgstr "Quirófano"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "Condición de base"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
 msgstr "Profilaxis antibiótica"
@@ -256,6 +258,10 @@ msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
 msgstr "Estado"
 
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
 msgstr "Cirujano"
@@ -272,6 +278,14 @@ msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
 msgstr "Duración"
 
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
 msgstr "Fecha modificación"
@@ -280,6 +294,90 @@ msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
 msgstr "Código de Procedimiento, por ejemplo ICD-10-PCS o ICPM"
@@ -296,7 +394,9 @@ msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "Incluye procedimeintos vascular supra-inguinal, intraperitoneal o intratorácico"
+msgstr ""
+"Incluye procedimeintos vascular supra-inguinal, intraperitoneal o "
+"intratorácico"
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -305,7 +405,13 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "historia de infarto de miocardio o una prueba de esfuerzo positiva, presente queja de dolor torácico considerado como secundario a la isquemia miocárdica, el uso del tratamiento con nitratos, o ECG con ondas Q patológicas; no cuentan procedimiento de revascularización coronaria previa a menos que uno de los otros criterios para la enfermedad de cardiopatía isquémica esté presente"
+msgstr ""
+"historia de infarto de miocardio o una prueba de esfuerzo positiva, presente "
+"queja de dolor torácico considerado como secundario a la isquemia "
+"miocárdica, el uso del tratamiento con nitratos, o ECG con ondas Q "
+"patológicas; no cuentan procedimiento de revascularización coronaria previa "
+"a menos que uno de los otros criterios para la enfermedad de cardiopatía "
+"isquémica esté presente"
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
@@ -317,13 +423,18 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\nPuntos 1: Clase II Bajo (0.9% complicaciones)\nPuntos 2: Clase III Moderado (6.6% complicaciones)\nPuntos 3 o más : Clase IV Elevado(>11% complicaciones)"
+msgstr ""
+"Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\n"
+"Puntos 1: Clase II Bajo (0.9% complicaciones)\n"
+"Puntos 2: Clase III Moderado (6.6% complicaciones)\n"
+"Puntos 3 o más : Clase IV Elevado(>11% complicaciones)"
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Usar campo por motivos históricos, cuando no se proporciona fecha de cirugía"
+msgstr ""
+"Usar campo por motivos históricos, cuando no se proporciona fecha de cirugía"
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
@@ -334,8 +445,8 @@ msgid "Urgency level for this surgery"
 msgstr "Nivel de urgencia para esta cirugía"
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Código único del centro de salud"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
@@ -345,6 +456,10 @@ msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
 msgstr "Condición de base / Motivo"
 
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
 msgstr "Tratamiento antibiótico profiláctico en los últimos 60 minutos"
@@ -357,7 +472,10 @@ msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
 "Patient has a risk of losing more than 500 ml in adults of over 7ml/kg in "
 "infants. If so, make sure that intravenous access and fluids are available"
-msgstr "El paciente tiene riesgo de perder más de 500 ml en adultos y más de 7ml/kg en niños. Si es así, asegúrese que están disponibles las vías intravenosas y fluidos."
+msgstr ""
+"El paciente tiene riesgo de perder más de 500 ml en adultos y más de 7ml/kg "
+"en niños. Si es así, asegúrese que están disponibles las vías intravenosas y "
+"fluidos."
 
 msgctxt "help:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse oximeter is in place and functioning"
@@ -370,7 +488,12 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Indice de Riesgo Cardíaco del Paciente\nPuntos 0: Clase I Muy Bajo (0.4% complicaciones)\nPuntos 1: Clase II Bajo (0.9% complicaciones)\nPuntos 2: Clase III Moderado (6.6% complicaciones)\nPuntos 3 o más: Clase IV Alto (>11% complicaciones)"
+msgstr ""
+"Indice de Riesgo Cardíaco del Paciente\n"
+"Puntos 0: Clase I Muy Bajo (0.4% complicaciones)\n"
+"Puntos 1: Clase II Bajo (0.9% complicaciones)\n"
+"Puntos 2: Clase III Moderado (6.6% complicaciones)\n"
+"Puntos 3 o más: Clase IV Alto (>11% complicaciones)"
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
@@ -378,18 +501,25 @@ msgstr "El cirujano ha marcado la incisión quirúrgica"
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "Enfermería ha confirmado la esterilidad de los dispositivos y del quirófano"
+msgstr ""
+"Enfermería ha confirmado la esterilidad de los dispositivos y del quirófano"
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Lista de procedimientos en la cirugía. Introduzca el primero como el procedimiento principal"
+msgstr ""
+"Lista de procedimientos en la cirugía. Introduzca el primero como el "
+"procedimiento principal"
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
 msgstr "Profesional de la Salud que firmó este documento de cirugía"
 
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
 msgstr "Cirujano que realizó el procedimiento"
@@ -399,13 +529,35 @@ msgid "Start of the Surgery"
 msgstr "Comienzo de la cirugía"
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Fin de la cirugía"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
 msgstr "Duración de la cirugía"
 
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
+
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
 msgstr "Operación - Procedimientos quirúrgicos"
@@ -418,6 +570,14 @@ msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
 msgstr "Cirugía"
 
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
 msgstr "IRCR"
@@ -434,243 +594,50 @@ msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
 msgstr "Informe de cirugía"
 
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Cirugías"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Administración de consultas de salud"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "( Class"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(ID"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Paciente saludable normal"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Pacientes con enfermedad sistémica leve"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Pacientes con enfermedad sistémica grave"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4 : Pacientes con enfermedad sistémica grave que le supone un riesgo constante a su vida"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5 : Pacientes moribundos que no se espera que sobrevivan a la operación"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Paciente con muerte cerebral declarada cuyos órganos se extraen para donación"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "ASA"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Edad"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Informe de anestesia"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Anestesista"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Profilaxis antibiótica :"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Condición Base"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "Cirugías"
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Class 1:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "Administración de consultas de salud"
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "Clase 2: Visibilidad de paladar duro, blando, porción superior de las amígdalas y úvula"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Clase 3:  paladar blando, duro y base de la úvula visibles"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "Clase 4: Visible únicamente el paladar duro"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Clasificación"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Fecha"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Emergencia"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Femenino"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Visibilidad total de amígdala, úvula y paladar blando"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Institución"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Cirujano principal"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Masculino"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Score Mallampati"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Notas"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Quirófano"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Opcional"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Paciente"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Estado físico"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Lista de comprobación del pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
-msgstr "Información del pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "Pre-operatorio"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Fecha impresión"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Código de procedimiento"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Saturómetro digital colocado :"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Necesario"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "Índice de Riesgo Cardíaco Revisado (IRCR)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Riesgo de hemorragia masiva,"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Sexo"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Esterilidad verificada :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "Detalles de la cirugía / Incidentes"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Informe de cirugía :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Hora de la cirugía"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "Sitio Quirúrgico Marcado :"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Urgente"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "en cirugía"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "s :"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "a"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "cceso intravenoso y fluidos disponible"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
@@ -689,6 +656,10 @@ msgid "IV"
 msgstr "IV"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
 msgstr "Emergencia"
 
@@ -704,6 +675,30 @@ msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
 msgstr "Urgente"
 
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
 msgstr "PS 1 : Paciente Normal / Saludable"
@@ -720,19 +715,28 @@ msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "PS 4 : Pacientes con enfermedad sistémica grave que le supone un riesgo constante a su vida"
+msgstr ""
+"PS 4 : Pacientes con enfermedad sistémica grave que le supone un riesgo "
+"constante a su vida"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "PS 5 : Pacientes moribundo que no se espera que sobrevivan sin la operación"
+msgstr ""
+"PS 5 : Pacientes moribundo que no se espera que sobrevivan sin la operación"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "PS 6 : Paciente declarado con muerte cerebral cuyos órganos se extraen para donación"
+msgstr ""
+"PS 6 : Paciente declarado con muerte cerebral cuyos órganos se extraen para "
+"donación"
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
@@ -742,7 +746,9 @@ msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "Clase 2: Visibilidad de paladar duro, blando, porción superior de las amígdalas y úvula"
+msgstr ""
+"Clase 2: Visibilidad de paladar duro, blando, porción superior de las "
+"amígdalas y úvula"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
@@ -753,69 +759,45 @@ msgid "Class 4: Only Hard Palate visible"
 msgstr "Clase 4: Visible únicamente el paladar duro"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Realizada"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "En progreso"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Operación"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Procedimiento"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Detalles del procedimiento / Incidentes"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Cirugías"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Procedimiento"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "IRCR"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "IRCR : Índice de Riesgo Cardiaco Revisado"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "Realizada"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Anestesia"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "Detalles / Incidentes"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "¿Finaliza y firma esta cirugía? ¡Se convertirá en sólo lectura!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Riesgo Quirúrgico del Paciente"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Verificación Pre-quirúrgica"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Firmar"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "Firmar esta cirugía"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Cirugía"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_MX.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/es_MX.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/es_MX.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_PE.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/es_PE.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/es_PE.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index baccf04..7098a19 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -1,243 +1,238 @@
-# 
-# Translators:
-# Emmanuel Simond, 2014
-# Emmanuel Simond, 2014
-# Eric_InvisibleLink <eric.fouquet at invisible-link.com>, 2011
-# Eric Vernichon <eric at vernichon.fr>, 2011-2013
-# gestionRessources <klinik_mailinglist at gestion-ressources.com>, 2011
-# Marie-Andrée Coulombe <coulombe.ma at gmail.com>, 2014
-# Mathieu Anquetin <mathieu at anquetin.eu>, 2013
-# Mathieu Anquetin <mathieu at anquetin.eu>, 2013
-# rootio <david at vmail.me>, 2013
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/GNU_Health/language/fr_FR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr_FR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
 msgstr ""
 
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
+
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "Créé par"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "Chirurgie"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "Code"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "Date de modification"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "Modifié par"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "Chirurgies"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "Professionnel de santé"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "ID Patient"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "Antécédents de maladies vasculaires cérébrales"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "IRCR Classe"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "Antécédents d'insuffisance cardiaque"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "Diabètes Préopératoire"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "Chirurgie à haut risque"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "Antécédents de maladie cardiaque ischémique"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "Maladie Rénale Préopératoire"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "Score"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "Admission"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "Âge estimé"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "Rapport d'Anesthésie"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "Anesthésiste"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "Urgence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "Code"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "Age"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "Créé par"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "Description"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "Info supplémentaire"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "Salle d'opération"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "condition de base"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "Patient"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "Prophylaxie antibiotique"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "ASA PS"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "Risque de saignement massif"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "Score de Mallampati"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "Oxymètre de pouls en place"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "IRCR"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "Marquage du site chirurgical"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "Stérilité confirmée"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "Procédures"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -245,39 +240,135 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "Temps de Chirurgie"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "Signé par"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "Etat"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "Chirurgien"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "Fin"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "Durée"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "Date de modification"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "Modifié par"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
@@ -285,17 +376,17 @@ msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "Professionnel de santé / Cardiologue qui a signé l'évaluation IRCR"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "Diabète sucré nécessitant un traitement par insuline"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "Comprend tout vasculaire suprainguinal, intrapéritonéale ou procédures intrathoraciques"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -308,7 +399,7 @@ msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "Créatinine sérique préopératoire >2.0 mg/dL (177 mol/L)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -322,35 +413,39 @@ msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Utilisez ce champ à des fins historiques, lorsque aucune date d'opération n'est donnée"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "Anesthésiste en charge"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
 msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Code Unique du Centre de Santé"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "Âge du patient au moment de l'opération"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "Condition de base / Raison"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "Traitement antibiotique prophylactique au cours des 60 dernières minutes"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "ASA Statut Physique Préopératoire"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -373,448 +468,297 @@ msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "Le chirurgien a marqué l'incision chirurgicale"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "Équipe de soins infirmiers a confirmé la stérilité des dispositifs et de la salle"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Liste des procédures dans la chirurgie. S'il vous plaît entrez la première comme procédure principale"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "Le professionnel de la santé qui a signé ce document de chirurgie"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "Chirurgien qui a fait la procédure"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "Début de la Chirurgie"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Fin de la chirurgie"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "Durée de la chirurgie"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "Opération - Procédures Chirurgicales"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "Indice de Risque Cardiaque Révisée"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "Chirurgie"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "IRCR"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "Chirurgies"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "Chirurgies"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "Rapport de Chirurgie"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Chirurgies"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Administration Chirurgie"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "( Classe"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(ID"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Santé du patient normale"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Patients présentant une maladie systémique légère"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Patients présentant une maladie systémique sévère"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4 : Patients présentant une maladie systémique sévère mettant sa vie en danger"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5 : Patients mourant ayant peu de chance de vivre sans l'opération"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Un patient présentant une mort cérébrale a qui les organes sont prélevés pour en faire don"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "ASA"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Age"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Rapport d'anesthésie"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Anesthésiste"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Prophylaxie antibiotique :"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Condition de base"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Classe 1:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "classe 2 : la luette est partiellement visible"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "classe 3 : le palais membraneux est visible"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "classe 4 : seul le palais osseux est visible"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Classification"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Date"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Urgence"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Féminin"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Une visibilité complète sur les amygdales, la luette et le palais mou"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Institution"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Chirurgien principal"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Masculin"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Score de Mallampati"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Notes"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Bloc op."
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Optionnel"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Patient"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Statut physique"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Pré-opération Checklist"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
-msgstr "Information préopératoire"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "Pré-opératoire"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Date d'impression"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Code de procédure"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Oxymètre de pouls en place :"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Requis"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "Index de Risque Cardiaque Révisé (IRCR)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Risque d'hémorragie massive,"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Sex"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Stérilité confirmée :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "Chirurgie Détails / Incidents"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Rapport de Chirurgie :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Temps de Chirurgie"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "Marquage du site chirurgical :"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Urgence"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "à la chirurgie"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e :"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "Accès intraveineuse et fluides disponibles "
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "Urgence"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "Optionnel"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "Requis"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "Urgent"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "PS 1 : Santé du patient normale"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "PS 2 : Patients présentant une maladie systémique légère"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "PS 3 : Patients présentant une maladie systémique sévère"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "PS 4 : Patients présentant une maladie systémique sévère mettant sa vie en danger"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "PS 5 : Patients mourant ayant peu de chance de vivre sans l'opération"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "PS 6 : Un patient présentant une mort cérébrale a qui les organes sont prélevés pour en faire don"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "classe 1 : toute la luette et les loges amygdaliennes sont visibles"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "classe 2 : la luette est partiellement visible"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "classe 3 : le palais membraneux est visible"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "classe 4 : seul le palais osseux est visible"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Fait"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "En cours"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Opération"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Procédure"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Détails de la procédure / incidents"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Chirurgies"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Procédure"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "IRCR"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "IRCR : Index de Risque Cardiaque Révisé"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Anesthésie"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "Détails / Incidents"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
 msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Évaluation des risques chirurgicaux des patients"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Checklist préopératoire"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Signe"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
 msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Chirurgie"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index ad674a1..7098a19 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,204 +1,202 @@
-# 
-# Translators:
-# Gabriele Meloncelli <gabriele.meloncelli at virgilio.it>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011
-# rob.paoli <rob.paoli at gmail.com>, 2015
-# Selene <scordara at thymbra.com>, 2014
-# Selene <scordara at thymbra.com>, 2011, 2012
-# Selene <scordara at thymbra.com>, 2011
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: rob.paoli <rob.paoli at gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/GNU_Health/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
 msgstr ""
 
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
+
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "Creare data"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "Chirurgia"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "Note"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "Codice"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "Scrivere data"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "Chirurgie"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "Professionista medico"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "Identificazione paziente"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "Storia dei problemi cerebrovascolari"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "Classe di rischio (RCRI)"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "Storia di insufficienza cardiaca congestizia"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "Diabete Preoperatorio"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "Chirurgia ad Alto Rischio"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "Storia dei problemi ischemici cardiaci"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "Malattie renali preoperatorie"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "Punteggio"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "Ricovero"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "Età Stimata"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "Rapporto Anestesia"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "Anestesista"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "Urgenza"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "Codice"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "Età"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "Creare data"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "Descrizione"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "Informazioni extra"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "Istituzione"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "Sala Operatoria"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "Condizioni base"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "Paziente"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "Profilassi Antibiotica"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
@@ -206,87 +204,183 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "Pericolo di Emorragia Massiva"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "Punteggio Mallampati"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "Pulsossimetro al posto"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "Indice di rischio RCRI"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "Marcatura chirurgica"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "Sterilità confermata"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "Procedure"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
-msgstr "Data intervento"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "Ora Chirurgia"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "Firmato da"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "Stato"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "Chirurgo"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "Fine"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "Durata"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "Scrivere data"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "Codice di Procedura, per esempio ICD-10-PCS o ICPM"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "Sanitario / Cardiologo che ha firmato la valutazione RCRI"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "Diabete Mellito che richiede trattamento con insulina"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
@@ -313,37 +407,41 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Punti 0: Classe I Molto basso (0.4% complicazioni)\nPunti 1: Classe II basso (0.9% complicazioni)\nPunti 2: Classe III Moderato (6.6% complicazioni)\nPunti 3 o oltre : Classe IV Alto (>11% complicazioni)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Utilizzare il campo per scopi storici, quando non è fornita la data dell'intervento"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "Anestesista responsabile"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "Livello di urgenza per questa chirurgia"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Codice Unico del Centro Medico"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "Età del paziente calcolata al momento dell'intervento"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "Condizioni basiche / Motivo"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "Trattamento Profilassi Antibiotico negli ultimi 60 minuti"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
@@ -370,448 +468,297 @@ msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "Il chirugo ha marcato l`incisione chirurgica"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "L'équipe infermieri ha confermato la sterilità della stanza"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Elenco procedure nella chirurgia. Si prega di inserire la prima come procedura principale"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "Sanitario che ha firmato il documento di questa operazione"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "Chirurgo che ha fatto la procedura"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "Inizio della Chirurgia"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Fine della Chirurgia"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "Durata della chirurgia"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "Intervento - Procedure chirurgiche"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "Indice di Rischio Cardiovascolare Corretto"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "Chirurgia"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "Indice di rischio RCRI"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "Chirurgie"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "Chirurgie"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "Rapporto Chirurgia"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Chirurgie"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Amministrazione Chirugia Health"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "(ID"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Paziente in condizioni di salute normali"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Pazienti con una moderata malattia sistemica"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Pazienti con una severa malattia sistemica"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr " 4 : Pazienti con una malattia sistemica severa che è in costante pericolo di vita"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5 : Pazienti moribondi che non ci si aspetta che sopravvivano senza l'intervento"
-
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Paziente con morte cerebrale dichiarata i cui organi sono in fase di espianto per donazione"
-
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
-
-msgctxt "odt:surgery:"
-msgid "ASA"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Età"
-
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Rapporto Anestesia"
-
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Anestesista"
-
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Profilassi Antibiotica"
-
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Condizioni base"
-
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Classe 1:"
-
-msgctxt "odt:surgery:"
-msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "Classe 2: Visibilità del palato duro e morbido, parte superiore delle tonsille e dell'ugola"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Classe 3: sono visibili palato molle e duro e la base del uvula"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "Classe 4: È visibile solo il palato duro"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Classificazione"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Data"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Descrizione"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Emergenza"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Femmina"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Visibilità completa di tonsille, ugola e palato molle"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Istituzione"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Chirurgo Principale"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Maschio"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Punteggio Mallampati"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Note"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Sala Operatoria"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Opzionale"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Paziente"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Stato Fisico"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Lista di controllo Preoperatoria"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Data di Stampa"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Codice di Procedura"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Pulsossimetro al posto"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Necessario"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Pericolo di Emorragia Massiva"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Sesso"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Sterilità confermata"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Rapporto Chirurgia:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Ora Chirurgia"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Urgente"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e :"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "accesso endovenoso e fluidi disponibili"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "Emergenza"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "Opzionale"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "Necessario"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "Urgente"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "SP 1 : Paziente in condizioni di salute normali"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "SP 2 : Pazienti con una moderata malattia sistemica"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "SP 3 : Pazienti con una severa malattia sistemica"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "SP 4 : Pazienti con una malattia sistemica severa che è in costante pericolo di vita"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "SP 5 : Pazienti moribondi che non ci si aspetta che sopravvivano senza l'intervento"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "SP 6 : Paziente con morte cerebrale dichiarata i cui organi sono in fase di espianto per donazione"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "Classe 1: Piena visibilità di tonsille, ugola e palato molle"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "Classe 2: Visibilità del palato duro e morbido, parte superiore delle tonsille e dell'ugola"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Classe 3: sono visibili palato molle e duro e la base del uvula"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "Classe 4: È visibile solo il palato duro"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Fatto"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "In corso"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Intevento"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Procedura"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Dettagli procedura / incidenti"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Chirurgie"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Procedura"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "Indice di rischio RCRI"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "Indice di Rischio Cardiovascolare Corretto"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Anestesia"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
 msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "Finire e firmare questa chirurgia? Si trasformerá solo in modalità lettura!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Valutazione del rischio operatorio"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Lista di controllo Preoperatoria"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Segno"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "Firmare questa chirurgia"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Chirurgia"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/kn.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/kn.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/kn.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/lo.po
similarity index 50%
copy from locale/zh_CN.po
copy to locale/lo.po
index 5e17b0b..7098a19 100644
--- a/locale/zh_CN.po
+++ b/locale/lo.po
@@ -1,238 +1,238 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
+msgstr ""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,notes:"
 msgid "Notes"
-msgstr "笔记"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,procedure:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,surgery:"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,patient:"
 msgid "Patient ID"
-msgstr "患者代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_cerebrovascular_history:"
 msgid "History of Cerebrovascular disease"
-msgstr "脑血管疾病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_class:"
 msgid "RCRI Class"
-msgstr "改良心脏风险指数等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_congestive_history:"
 msgid "History of congestive heart disease"
-msgstr "充血性心力衰竭病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Preoperative Diabetes"
-msgstr "术前糖尿病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid "High Risk surgery"
-msgstr "高风险手术"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_ischemic_history:"
 msgid "History of ischemic heart disease"
-msgstr "缺血性心脏病史"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative Kidney disease"
-msgstr "术前肾脏疾病"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rcri_total:"
 msgid "Score"
-msgstr "得分"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
-msgstr "入院"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,age:"
 msgid "Estimative Age"
-msgstr "预估年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthesia_report:"
 msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist"
-msgstr "麻醉师"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,classification:"
 msgid "Urgency"
-msgstr "排尿里急后重"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,code:"
 msgid "Code"
-msgstr "码"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,computed_age:"
 msgid "Age"
-msgstr "年龄"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,description:"
 msgid "Description"
-msgstr "描述"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
-msgstr "额外信息"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,operating_room:"
 msgid "Operating Room"
-msgstr "手术室"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
-msgstr "已使用预防性抗生素"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_asa:"
 msgid "ASA PS"
-msgstr "手术病情预估等级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_bleeding_risk:"
 msgid "Risk of Massive bleeding"
-msgstr "有大出血风险"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_mallampati:"
 msgid "Mallampati Score"
-msgstr "气道分级"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_oximeter:"
 msgid "Pulse Oximeter in place"
-msgstr "已准备可用的动脉血氧饱和度计"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_rcri:"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_site_marking:"
 msgid "Surgical Site Marking"
-msgstr "已标记手术切口"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,preop_sterility:"
 msgid "Sterility confirmed"
-msgstr "已消毒"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,procedures:"
 msgid "Procedures"
-msgstr "程序"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_date:"
 msgid "Surgery Date"
@@ -240,57 +240,153 @@ msgstr ""
 
 msgctxt "field:gnuhealth.surgery,report_surgery_time:"
 msgid "Surgery Time"
-msgstr "手术时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,signed_by:"
 msgid "Signed by"
-msgstr "由签署"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
-msgstr "声明"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
-msgstr "外科医生"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_end_date:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
-msgstr "持续时间"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
-msgstr "过程代码,例如 ICD-10-PC 或基础"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,health_professional:"
 msgid "Health professional /Cardiologist who signed the assesment RCRI"
-msgstr "改良心脏风险指数评估经专业卫生机构或心脏病专家签署"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_diabetes_history:"
 msgid "Diabetes Mellitus requiring treatment with Insulin"
-msgstr "需胰岛素治疗的糖尿病"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "包括腹骨沟血管,腹膜内,和胸内的程序"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -299,11 +395,11 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
-msgstr "术前血清肌酐大于2.0毫克/分升(177摩尔/升)"
+msgstr ""
 
 msgctxt "help:gnuhealth.rcri,rcri_total:"
 msgid ""
@@ -311,41 +407,45 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "当没有给定手术日期时,使用此字段为历史的目的"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
-msgstr "当值麻醉师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,classification:"
 msgid "Urgency level for this surgery"
-msgstr "这种手术的紧迫级别"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
-msgstr "患者手术推算年龄"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
-msgstr "基本状况/原因"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
-msgstr "60分钟内是否已使用预防性抗生素"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_asa:"
 msgid "ASA pre-operative Physical Status"
-msgstr "乙酰水杨酸术前身体状态"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_bleeding_risk:"
 msgid ""
@@ -364,452 +464,301 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
-msgstr "手术师已标记手术切口"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "护士小组确认仪器和手术室已消毒"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "手术流程列表. 请先输入主流程"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
-msgstr "此手术文档签名的卫生专业人员"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
-msgstr "完成该流程的手术师"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_date:"
 msgid "Start of the Surgery"
-msgstr "手术的开始"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
-msgstr "手术的程度"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
 
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
-msgstr "手术 - 外科手术流程"
+msgstr ""
 
 msgctxt "model:gnuhealth.rcri,name:"
 msgid "Revised Cardiac Risk Index"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
-msgstr "手术"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_surgery_form"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:action_gnuhealth_surgery_view"
 msgid "Surgeries"
-msgstr "手术"
+msgstr ""
 
 msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
-msgstr "手术报告"
-
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr ""
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
-msgstr "我"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "II"
-msgstr "II"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "III"
-msgstr "III"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "IV"
-msgstr "IV"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Optional"
-msgstr "可选"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Required"
-msgstr "必须"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
-msgstr "等级1:普通患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 2 : Patients with mild systemic disease"
-msgstr "等级2:轻微全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 3 : Patients with severe systemic disease"
-msgstr "等级3:重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "等级4:危及生命的重度全身性疾病患者"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 5 : Moribund patients who are not expected to survive without the "
 "operation"
-msgstr "等级5:病危患者,必须进行手术"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
-msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index cc99e65..adced40 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,31 +1,23 @@
-# 
-# Translators:
-# Bogdan Czaplinski Martins Barros <bogdan.czaplinski at gmail.com>, 2011
-# Bogdan Czaplinski Martins Barros <bogdan.czaplinski at gmail.com>, 2011
-# Daniel Linhares <danielinhares at gmail.com>, 2012
-# Flávio Veras <flaviove at gmail.com>, 2013
-# Isabel Ferreira, 2014
-# Isabel Ferreira, 2014
-# luizvasconcelos <luizvasconceloss at yahoo.com.br>, 2014
-# luizvasconcelos <luizvasconceloss at yahoo.com.br>, 2014
-# Roberto Vasconcelos Novaes <rvnovaes at gmail.com>, 2014
+# rvnovaes <rvnovaes at gmail.com>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/GNU_Health/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2015-12-28 00:01+0000\n"
+"Last-Translator: rvnovaes <rvnovaes at gmail.com>\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1451260884.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
-msgstr "Horário de Fim \"%(end_date)s\" ANTERIOR à data da cirurgia \"%(surgery_date)s\""
+msgstr ""
+"Horário de Fim \"%(end_date)s\" ANTERIOR à data da cirurgia \"%(surgery_date)s\""
+
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
 
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
@@ -135,6 +127,10 @@ msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
 msgstr "Criado por"
 
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
 msgstr "Admissão"
@@ -179,6 +175,10 @@ msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
 msgstr "Informações extras"
 
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
 msgstr "ID"
@@ -192,13 +192,17 @@ msgid "Operating Room"
 msgstr "Sala de Operação"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "Condição de base"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
 msgstr "Profilaxia Antibiótica"
@@ -255,6 +259,10 @@ msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
 msgstr "Estado"
 
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
 msgstr "Cirurgião"
@@ -271,6 +279,14 @@ msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
 msgstr "Duração"
 
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
 msgstr "Data de edição"
@@ -279,6 +295,90 @@ msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
 msgstr "Editado por"
 
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
 msgstr "Código do procedimento. Por exemplo CID-10-PCS ou ICPM"
@@ -295,7 +395,9 @@ msgctxt "help:gnuhealth.rcri,rcri_high_risk_surgery:"
 msgid ""
 "Includes andy suprainguinal vascular, intraperitoneal, or intrathoracic "
 "procedures"
-msgstr "Inclui qualquer procedimento suprainguinal vascular, intraperitoneal ou intratoráxico."
+msgstr ""
+"Inclui qualquer procedimento suprainguinal vascular, intraperitoneal ou "
+"intratoráxico."
 
 msgctxt "help:gnuhealth.rcri,rcri_ischemic_history:"
 msgid ""
@@ -304,7 +406,12 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "histórico de isquemia do miocárdio ou teste de exercício positivo, queixa de dor no peito considerada como secundária à isquemia do miocárdio, uso de terapia de nitrato, ou ECG com ondas Q patológicas; não contar procedimentos anteriores de revascularização coronariana a não ser que outros critérios para doência isquêmica estejam presentes."
+msgstr ""
+"histórico de isquemia do miocárdio ou teste de exercício positivo, queixa de "
+"dor no peito considerada como secundária à isquemia do miocárdio, uso de "
+"terapia de nitrato, ou ECG com ondas Q patológicas; não contar procedimentos "
+"anteriores de revascularização coronariana a não ser que outros critérios "
+"para doência isquêmica estejam presentes."
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
@@ -316,13 +423,19 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 pontos: Classe I Muito Baixo (0.4% de complicações)\n1 ponto: Class II Baixo (0.9% de complicações)\n2 pontos: Class III Moderado (6.6% de complicações)\n3 ou mais : Class IV Alto (>11% de complicações)"
+msgstr ""
+"0 pontos: Classe I Muito Baixo (0.4% de complicações)\n"
+"1 ponto: Class II Baixo (0.9% de complicações)\n"
+"2 pontos: Class III Moderado (6.6% de complicações)\n"
+"3 ou mais : Class IV Alto (>11% de complicações)"
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
 "Use this field for historical purposes,         when no date of surgery is "
 "given"
-msgstr "Use este campo para propósitos históricos, quando nenhuma data de cirurgia for fornecida."
+msgstr ""
+"Use este campo para propósitos históricos, quando nenhuma data de cirurgia "
+"for fornecida."
 
 msgctxt "help:gnuhealth.surgery,anesthetist:"
 msgid "Anesthetist in charge"
@@ -333,8 +446,8 @@ msgid "Urgency level for this surgery"
 msgstr "Nível de urgência para esta cirurgia"
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "Código Único do Centro de Saúde"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
@@ -344,6 +457,10 @@ msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
 msgstr "Condição Básica / Razão"
 
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
 msgstr "Tratamento profilático de antibióticos dentro dos últimos 60 minutos"
@@ -369,7 +486,12 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "Índice de Risco Cardíaco Revisado do paciente\n0 pontos: Classe I Muito Baixo (0.4% de complicações)\n1 ponto: Class II Baixo (0.9% de complicações)\n2 pontos: Class III Moderado (6.6% de complicações)\n3 ou mais : Class IV Alto (>11% de complicações)"
+msgstr ""
+"Índice de Risco Cardíaco Revisado do paciente\n"
+"0 pontos: Classe I Muito Baixo (0.4% de complicações)\n"
+"1 ponto: Class II Baixo (0.9% de complicações)\n"
+"2 pontos: Class III Moderado (6.6% de complicações)\n"
+"3 ou mais : Class IV Alto (>11% de complicações)"
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
@@ -377,18 +499,25 @@ msgstr "O cirurgião marcou a incisão cirúrgica"
 
 msgctxt "help:gnuhealth.surgery,preop_sterility:"
 msgid "Nursing team has confirmed sterility of the devices and room"
-msgstr "Equipe de enfermagem confirmou a esterilidade dos dispositivos e da sala"
+msgstr ""
+"Equipe de enfermagem confirmou a esterilidade dos dispositivos e da sala"
 
 msgctxt "help:gnuhealth.surgery,procedures:"
 msgid ""
 "List of the procedures in the surgery. Please enter the first one as the "
 "main procedure"
-msgstr "Lista dos procedimentos da cirurgia. Por favor insira primeiro o principal procedimento"
+msgstr ""
+"Lista dos procedimentos da cirurgia. Por favor insira primeiro o principal "
+"procedimento"
 
 msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
 msgstr "Profissional de saúde que assinou este documento de cirurgia"
 
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
 msgstr "Cirurgião que fez o procedimento"
@@ -398,13 +527,35 @@ msgid "Start of the Surgery"
 msgstr "Início da cirurgia"
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "Fim da cirurgia"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
 msgstr "Duração da cirurgia"
 
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
+
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
 msgstr "Operação - Procedimentos Cirúrgicos"
@@ -417,6 +568,14 @@ msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
 msgstr "Cirurgia"
 
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
 msgstr "IRCR"
@@ -433,243 +592,50 @@ msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
 msgstr "Relatório da cirurgia"
 
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "Cirurgias"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "Administração Cirúrgica"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "( Classe"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(ID"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr ","
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1 : Paciente com saúde normal"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2 : Pacientes com doença sistêmica leve a moderada"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3 : Pacientes com doença sistêmica severa"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4: Pacientes com doença sistêmica severa que é uma ameaça constante à vida"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5: Pacientes moribundos que não sobreviverão sem a operação"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6 : Um paciente declarado com morte cerebral, cujos órgãos serão removidos para propósitos de doação"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "ASA"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "Idade"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "Relatório de anestesia"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "Anestesista"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "Profilaxia Antibiótica :"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "Condição Base"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "Cirurgias"
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "Classe 1:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "Administração Cirúrgica"
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "Classe 2: Visibilidade do palato duro e mole, da parte superior das amídalas e da úvula"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "Classe 3: palato mole e duro e base da úvula são visíveis"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "Classe 4: Apenas palato duro visível"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "Classificação"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "Data"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "Descrição"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "Emergência"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "Feminino"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "Visibilidade total das amídalas, da úvula e do palato mole"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "Instituição"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "Cirurgião Principal"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "Masculino"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "Escore de Mallampati "
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "Notas"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "Sala de Operação"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "Opcional"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "Paciente"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "Estado físico"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "Lista de verificação pré-operatória"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
-msgstr "Informação pré-operatória"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "Pré-operatório"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "Data de Impressão"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "Código de procedimento"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "Oxímetro de pulso no lugar :"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "Obrigatório"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "Índice de Risco Cardíaco Revisado (IRCR)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "Risco de sangramento intenso,"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "Sexo"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "Esterilidade confirmada:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "Detalhes / Incidentes da cirurgia"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "Relatório da cirurgia :"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "Hora da cirurgia"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "Marcação dos locais cirúrgicos :"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "Urgente"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "em cirurgia"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e :"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "acesso intravenoso e fluidos disponíveis"
+msgstr ""
 
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
@@ -688,6 +654,10 @@ msgid "IV"
 msgstr "IV"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
 msgstr "Emergência"
 
@@ -703,6 +673,30 @@ msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
 msgstr "Urgente"
 
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
 msgstr "PS 1 : Paciente com saúde normal"
@@ -719,7 +713,9 @@ msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 4 : Patients with severe systemic disease that is a constant threat to "
 "life "
-msgstr "PS 4 : Pacientes com doença sistêmica severa que é uma ameaça constante à vida"
+msgstr ""
+"PS 4 : Pacientes com doença sistêmica severa que é uma ameaça constante à "
+"vida"
 
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
@@ -731,7 +727,13 @@ msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid ""
 "PS 6 : A declared brain-dead patient who organs are being removed for donor "
 "purposes"
-msgstr "PS 6 : Paciente declarado com morte cerebral, cujos órgãos serão removidos para propósitos de doação"
+msgstr ""
+"PS 6 : Paciente declarado com morte cerebral, cujos órgãos serão removidos "
+"para propósitos de doação"
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
@@ -741,7 +743,9 @@ msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid ""
 "Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
 "uvula"
-msgstr "Classe 2: Visibilidade dos palatos duro e mole, da parte superior das amídalas e da úvula"
+msgstr ""
+"Classe 2: Visibilidade dos palatos duro e mole, da parte superior das "
+"amídalas e da úvula"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 3: Soft and hard palate and base of the uvula are visible"
@@ -752,69 +756,45 @@ msgid "Class 4: Only Hard Palate visible"
 msgstr "Classe 4: Apenas palato duro visível"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "Feito"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "Em andamento"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "Operação"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "Procedimento"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "Detalhes dos Procedimentos / Incidentes"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "Cirurgias"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "Procedimento"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "IRCR"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "IRCR: Índice de Risco Cardíaco Revisado"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "Feito"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "Anestesia"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "Detalhes / Incidentes"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "Finalizar e assinar esta cirurgia? Ela se tornará somente leitura!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "Avaliação de Risco Cirúrgico do Paciente"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "Lista de verificação pré-operatória"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "Assinar"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "Assinar esta cirurgia"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "Cirurgia"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 5e17b0b..0c29ef0 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,27 +1,23 @@
-# 
-# Translators:
-# Jovana Savic <joa.uniq at gmail.com>, 2012
-# casely, 2013
-# Philip Li <Horatii.Lee at gmail.com>, 2014
-# Zenith Zhao <>, 2012
+# Anonymous Pootle User, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 11:28+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
+"Language: zh_CN\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452252519.0\n"
 
 msgctxt "error:gnuhealth.surgery:"
 msgid "End time \"%(end_date)s\" BEFORE surgery date \"%(surgery_date)s\""
 msgstr "结束时间\"(end_date) %s\"前手术日期\"(surgery_date) %s\""
 
+msgctxt "error:gnuhealth.surgery:"
+msgid "Operating Room is not available"
+msgstr ""
+
 msgctxt "field:gnuhealth.operation,create_date:"
 msgid "Create Date"
 msgstr "创建日期"
@@ -130,6 +126,10 @@ msgctxt "field:gnuhealth.rcri,write_uid:"
 msgid "Write User"
 msgstr "请您写用户"
 
+msgctxt "field:gnuhealth.sequences,surgery_code_sequence:"
+msgid "Surgery Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,admission:"
 msgid "Admission"
 msgstr "入院"
@@ -174,6 +174,10 @@ msgctxt "field:gnuhealth.surgery,extra_info:"
 msgid "Extra Info"
 msgstr "额外信息"
 
+msgctxt "field:gnuhealth.surgery,gender:"
+msgid "Gender"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,id:"
 msgid "ID"
 msgstr "ID"
@@ -187,13 +191,17 @@ msgid "Operating Room"
 msgstr "手术室"
 
 msgctxt "field:gnuhealth.surgery,pathology:"
-msgid "Base condition"
-msgstr "基本状况"
+msgid "Condition"
+msgstr ""
 
 msgctxt "field:gnuhealth.surgery,patient:"
 msgid "Patient"
 msgstr "患者"
 
+msgctxt "field:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-op dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,preop_antibiotics:"
 msgid "Antibiotic Prophylaxis"
 msgstr "已使用预防性抗生素"
@@ -250,6 +258,10 @@ msgctxt "field:gnuhealth.surgery,state:"
 msgid "State"
 msgstr "声明"
 
+msgctxt "field:gnuhealth.surgery,supplies:"
+msgid "Supplies"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,surgeon:"
 msgid "Surgeon"
 msgstr "外科医生"
@@ -266,6 +278,14 @@ msgctxt "field:gnuhealth.surgery,surgery_length:"
 msgid "Duration"
 msgstr "持续时间"
 
+msgctxt "field:gnuhealth.surgery,surgery_team:"
+msgid "Team Members"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery,surgical_wound:"
+msgid "Surgical wound"
+msgstr ""
+
 msgctxt "field:gnuhealth.surgery,write_date:"
 msgid "Write Date"
 msgstr "请您写日期"
@@ -274,6 +294,90 @@ msgctxt "field:gnuhealth.surgery,write_uid:"
 msgid "Write User"
 msgstr "请您写用户"
 
+msgctxt "field:gnuhealth.surgery_supply,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty:"
+msgid "Qty"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,qty_used:"
+msgid "Used"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,supply:"
+msgid "Supply"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_supply,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,name:"
+msgid "Surgery"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,notes:"
+msgid "Notes"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,role:"
+msgid "Role"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,team_member:"
+msgid "Member"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.surgery_team,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "help:gnuhealth.operation,procedure:"
 msgid "Procedure Code, for example ICD-10-PCS or ICPM"
 msgstr "过程代码,例如 ICD-10-PC 或基础"
@@ -299,7 +403,9 @@ msgid ""
 " nitrate therapy, or ECG with pathological         Q waves; do not count "
 "prior coronary revascularization procedure         unless one of the other "
 "criteria for ischemic heart disease is         present"
-msgstr "心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q 波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
+msgstr ""
+"心肌梗死的病历或者一次阳性运动试验,当前投诉的被认为是继发于心肌缺血的胸部疼痛,使用硝酸疗法,或者病理 Q "
+"波心电图;除非存在缺血性心脏病的其他准则之一时不计数事先冠状动脉血运重建过程"
 
 msgctxt "help:gnuhealth.rcri,rcri_kidney_history:"
 msgid "Preoperative serum creatinine >2.0 mg/dL (177 mol/L)"
@@ -311,7 +417,11 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
+"0 点: 第一类非常低 (0.4%并发症)\n"
+"1  点: 第二类低 (0.9%并发症)\n"
+"2 点:第三类中等(6.6%并发症)\n"
+"3 点或以上: 第四类四高 (大于11%并发症)"
 
 msgctxt "help:gnuhealth.surgery,age:"
 msgid ""
@@ -328,8 +438,8 @@ msgid "Urgency level for this surgery"
 msgstr "这种手术的紧迫级别"
 
 msgctxt "help:gnuhealth.surgery,code:"
-msgid "Health Center Unique code"
-msgstr "康复中心代码"
+msgid "Health Center code / sequence"
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,computed_age:"
 msgid "Computed patient age at the moment of the surgery"
@@ -339,6 +449,10 @@ msgctxt "help:gnuhealth.surgery,pathology:"
 msgid "Base Condition / Reason"
 msgstr "基本状况/原因"
 
+msgctxt "help:gnuhealth.surgery,postoperative_dx:"
+msgid "Post-operative diagnosis"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,preop_antibiotics:"
 msgid "Prophylactic antibiotic treatment within the last 60 minutes"
 msgstr "60分钟内是否已使用预防性抗生素"
@@ -364,7 +478,12 @@ msgid ""
 "Points 1: Class II Low (0.9% complications)\n"
 "Points 2: Class III Moderate (6.6% complications)\n"
 "Points 3 or more : Class IV High (>11% complications)"
-msgstr "修订病人心脏风险 指数\n0 点: 第一类非常低 (0.4%并发症)\n1  点: 第二类低 (0.9%并发症)\n2 点:第三类中等(6.6%并发症)\n3 点或以上: 第四类四高 (大于11%并发症)"
+msgstr ""
+"修订病人心脏风险 指数\n"
+"0 点: 第一类非常低 (0.4%并发症)\n"
+"1  点: 第二类低 (0.9%并发症)\n"
+"2 点:第三类中等(6.6%并发症)\n"
+"3 点或以上: 第四类四高 (大于11%并发症)"
 
 msgctxt "help:gnuhealth.surgery,preop_site_marking:"
 msgid "The surgeon has marked the surgical incision"
@@ -384,6 +503,10 @@ msgctxt "help:gnuhealth.surgery,signed_by:"
 msgid "Health Professional that signed this surgery document"
 msgstr "此手术文档签名的卫生专业人员"
 
+msgctxt "help:gnuhealth.surgery,supplies:"
+msgid "List of the supplies required for the surgery"
+msgstr ""
+
 msgctxt "help:gnuhealth.surgery,surgeon:"
 msgid "Surgeon who did the procedure"
 msgstr "完成该流程的手术师"
@@ -393,13 +516,35 @@ msgid "Start of the Surgery"
 msgstr "手术的开始"
 
 msgctxt "help:gnuhealth.surgery,surgery_end_date:"
-msgid "End of the Surgery"
-msgstr "手术的结束"
+msgid ""
+"Automatically set when the surgery is done.It is also the estimated end time"
+" when confirming the surgery."
+msgstr ""
 
 msgctxt "help:gnuhealth.surgery,surgery_length:"
 msgid "Length of the surgery"
 msgstr "手术的程度"
 
+msgctxt "help:gnuhealth.surgery,surgery_team:"
+msgid "Professionals Involved in the surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty:"
+msgid "Initial required quantity"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,qty_used:"
+msgid "Actual amount used"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_supply,supply:"
+msgid "Supply to be used in this surgery"
+msgstr ""
+
+msgctxt "help:gnuhealth.surgery_team,team_member:"
+msgid "Health professional that participated on this surgery"
+msgstr ""
+
 msgctxt "model:gnuhealth.operation,name:"
 msgid "Operation - Surgical Procedures"
 msgstr "手术 - 外科手术流程"
@@ -412,6 +557,14 @@ msgctxt "model:gnuhealth.surgery,name:"
 msgid "Surgery"
 msgstr "手术"
 
+msgctxt "model:gnuhealth.surgery_supply,name:"
+msgid "Supplies related to the surgery"
+msgstr ""
+
+msgctxt "model:gnuhealth.surgery_team,name:"
+msgid "Team Involved in the surgery"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_rcri_form1"
 msgid "RCRI"
 msgstr "改良心脏风险指数"
@@ -428,244 +581,51 @@ msgctxt "model:ir.action,name:report_surgery_report"
 msgid "Surgery Report"
 msgstr "手术报告"
 
-msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "model:res.group,name:group_health_surgery_admin"
-msgid "Health Surgery Administration"
-msgstr "卫生外科管理"
-
-msgctxt "odt:surgery:"
-msgid "( Class"
-msgstr "(类"
-
-msgctxt "odt:surgery:"
-msgid "(ID"
-msgstr "(标识号"
-
-msgctxt "odt:surgery:"
-msgid ")"
-msgstr ")"
-
-msgctxt "odt:surgery:"
-msgid ","
-msgstr "。"
-
-msgctxt "odt:surgery:"
-msgid "1 : Normal healthy patient"
-msgstr "1:正常健康的病人"
-
-msgctxt "odt:surgery:"
-msgid "2 : Patients with mild systemic disease"
-msgstr "2:轻度系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid "3 : Patients with severe systemic disease"
-msgstr "3:严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"4 : Patients with severe systemic disease that is a constant threat to life"
-msgstr "4:不断威胁生命的严重系统性疾病患者"
-
-msgctxt "odt:surgery:"
-msgid ""
-"5 : Moribund patients who are not expected to survive without the operation"
-msgstr "5:不手术就没有希望幸存的垂死的病人"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_all"
+msgid "All"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ""
-"6 : A declared brain-dead patient who organs are being removed for donor "
-"purposes"
-msgstr "6:一个已声明的脑死亡病人,他的器官被捐赠"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid ":"
-msgstr ":"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_done"
+msgid "Done"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "ASA"
-msgstr "乙酰水杨酸"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_draft"
+msgid "Draft"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Age"
-msgstr "年龄"
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_surgery_domain_in_progress"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthesia Report"
-msgstr "麻醉报告"
+msgctxt "model:ir.action.act_window.domain,name:act_surgery_domain_signed"
+msgid "Signed"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Anesthetist"
-msgstr "麻醉师"
+msgctxt "model:ir.sequence,name:seq_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Antibiotic Prophylaxis :"
-msgstr "预防性应用抗生素"
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_surgery_code"
+msgid "Surgery"
+msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Base Condition"
-msgstr "基本条件"
+msgctxt "model:ir.ui.menu,name:gnuhealth_surgery_menu"
+msgid "Surgeries"
+msgstr "手术"
 
-msgctxt "odt:surgery:"
-msgid "Class 1:"
-msgstr "第1类:"
+msgctxt "model:res.group,name:group_health_surgery_admin"
+msgid "Health Surgery Administration"
+msgstr "卫生外科管理"
 
-msgctxt "odt:surgery:"
+msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid ""
-"Class 2: Visibility of hard and soft palate, upper portion of tonsils and "
-"uvula"
-msgstr "第二类:能见度的硬软腭,扁桃腺和小舌的上部"
-
-msgctxt "odt:surgery:"
-msgid "Class 3: Soft and hard palate and base of the uvula are visible"
-msgstr "第三类:能见度的硬软腭和小舌"
-
-msgctxt "odt:surgery:"
-msgid "Class 4: Only Hard Palate visible"
-msgstr "第四类:只有硬腭可见"
-
-msgctxt "odt:surgery:"
-msgid "Classification"
-msgstr "分类"
-
-msgctxt "odt:surgery:"
-msgid "Date"
-msgstr "日期"
-
-msgctxt "odt:surgery:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "odt:surgery:"
-msgid "Emergency"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "Female"
-msgstr "女"
-
-msgctxt "odt:surgery:"
-msgid "Full visibility of tonsils, uvula and soft palate"
-msgstr "扁挑腺,悬雍垂(小舌)和软腭完完全可见"
-
-msgctxt "odt:surgery:"
-msgid "Institution"
-msgstr "机构"
-
-msgctxt "odt:surgery:"
-msgid "Main Surgeon"
-msgstr "主要的外科医生"
-
-msgctxt "odt:surgery:"
-msgid "Male"
-msgstr "男"
-
-msgctxt "odt:surgery:"
-msgid "Mallampati Score"
-msgstr "气道分级"
-
-msgctxt "odt:surgery:"
-msgid "Notes"
-msgstr "注意"
-
-msgctxt "odt:surgery:"
-msgid "Operating Room"
-msgstr "手术室"
-
-msgctxt "odt:surgery:"
-msgid "Optional"
-msgstr "可选"
-
-msgctxt "odt:surgery:"
-msgid "Patient"
-msgstr "患者"
-
-msgctxt "odt:surgery:"
-msgid "Physical Status"
-msgstr "身体状态"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Checklist"
-msgstr "术前检查表"
-
-msgctxt "odt:surgery:"
-msgid "Pre-operation Information"
 msgstr ""
 
-msgctxt "odt:surgery:"
-msgid "Pre-operative"
-msgstr "术前"
-
-msgctxt "odt:surgery:"
-msgid "Print Date"
-msgstr "打印日期"
-
-msgctxt "odt:surgery:"
-msgid "Procedure Code"
-msgstr "过程代码"
-
-msgctxt "odt:surgery:"
-msgid "Pulse Oximeter in place :"
-msgstr "脉搏血氧仪中的地方"
-
-msgctxt "odt:surgery:"
-msgid "Required"
-msgstr "必须"
-
-msgctxt "odt:surgery:"
-msgid "Revised Cardiac Risk Index (RCRI)"
-msgstr "经修订的心脏危险指数 (RCRI)"
-
-msgctxt "odt:surgery:"
-msgid "Risk of Massive bleeding,"
-msgstr "大量出血的危险"
-
-msgctxt "odt:surgery:"
-msgid "Sex"
-msgstr "性别"
-
-msgctxt "odt:surgery:"
-msgid "Sterility confirmed :"
-msgstr "证实不育:"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Details / Incidents"
-msgstr "手术细节 / 事件"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Report :"
-msgstr "手术报告"
-
-msgctxt "odt:surgery:"
-msgid "Surgery Time"
-msgstr "手术时间"
-
-msgctxt "odt:surgery:"
-msgid "Surgical Site Marking :"
-msgstr "外科手术部位标记:"
-
-msgctxt "odt:surgery:"
-msgid "Urgent"
-msgstr "紧急的"
-
-msgctxt "odt:surgery:"
-msgid "at surgery"
-msgstr "在外科手术"
-
-msgctxt "odt:surgery:"
-msgid "e :"
-msgstr "e:"
-
-msgctxt "odt:surgery:"
-msgid "i"
-msgstr "i"
-
-msgctxt "odt:surgery:"
-msgid "ntravenous access and fluids availabl"
-msgstr "静脉访问和流体可用"
-
 msgctxt "selection:gnuhealth.rcri,rcri_class:"
 msgid "I"
 msgstr "我"
@@ -683,6 +643,10 @@ msgid "IV"
 msgstr "IV"
 
 msgctxt "selection:gnuhealth.surgery,classification:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Emergency"
 msgstr "紧急的"
 
@@ -698,6 +662,30 @@ msgctxt "selection:gnuhealth.surgery,classification:"
 msgid "Urgent"
 msgstr "紧急的"
 
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Female -> Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,gender:"
+msgid "Male -> Female"
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_asa:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.surgery,preop_asa:"
 msgid "PS 1 : Normal healthy patient"
 msgstr "等级1:普通患者"
@@ -729,6 +717,10 @@ msgid ""
 msgstr "等级6:脑死亡患者,器官可被移除,用于捐助"
 
 msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.surgery,preop_mallampati:"
 msgid "Class 1: Full visibility of tonsils, uvula and soft palate"
 msgstr "第一类:完整的能见度扁桃体,悬雍垂和软腭"
 
@@ -747,69 +739,45 @@ msgid "Class 4: Only Hard Palate visible"
 msgstr "第四类:只有硬腭可见"
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Cancelled"
+msgstr ""
 
 msgctxt "selection:gnuhealth.surgery,state:"
-msgid "In progress"
-msgstr "进行中"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Operation"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure"
-msgstr "程序"
-
-msgctxt "view:gnuhealth.operation:"
-msgid "Procedure Details / Incidents"
-msgstr "手续细节"
-
-msgctxt "view:gnuhealth.patient:"
-msgid "Surgeries"
-msgstr "手术"
-
-msgctxt "view:gnuhealth.procedure:"
-msgid "Procedure"
-msgstr "流程"
-
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI"
-msgstr "改良心脏风险指数"
+msgid "Confirmed"
+msgstr ""
 
-msgctxt "view:gnuhealth.rcri:"
-msgid "RCRI : Revised Cardiac Risk Index"
-msgstr "RCRI: 修订心脏风险指数"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Done"
+msgstr "完成"
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Anesthesia"
-msgstr "麻醉"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Draft"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Details / Incidents"
-msgstr "细节/事件"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "In Progress"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Finish and sign this surgery ? Itwill become read-only !"
-msgstr "完成并签署这种手术吗?它将变成只读!"
+msgctxt "selection:gnuhealth.surgery,state:"
+msgid "Signed"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Patient Surgical Risk assessment"
-msgstr "患者手术风险评估"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid ""
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Preoperative checklist"
-msgstr "术前核对清单"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean . Class I"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign"
-msgstr "签订"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Clean-Contaminated . Class II"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Sign this surgery"
-msgstr "签署这种手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Contaminated . Class III"
+msgstr ""
 
-msgctxt "view:gnuhealth.surgery:"
-msgid "Surgery"
-msgstr "手术"
+msgctxt "selection:gnuhealth.surgery,surgical_wound:"
+msgid "Dirty-Infected . Class IV"
+msgstr ""
diff --git a/report/surgery_report.odt b/report/surgery_report.odt
index 8d40ac5..9cac495 100644
Binary files a/report/surgery_report.odt and b/report/surgery_report.odt differ
diff --git a/report/surgery_report.py b/report/surgery_report.py
index ee360fd..3e0b074 100644
--- a/report/surgery_report.py
+++ b/report/surgery_report.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <falcon at gnu.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <falcon at gnu.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -43,9 +43,6 @@ class SurgeryReport(Report):
                 timezone = pytz.timezone(company.timezone)
 
         dt = datetime.now()
-        localcontext['print_date'] = datetime.astimezone(dt.replace(
-            tzinfo=pytz.utc), timezone)
-        localcontext['print_time'] = localcontext['print_date'].time()
 
         return super(SurgeryReport, cls).parse(report, objects, data, 
             localcontext)
diff --git a/setup.py b/setup.py
index 4526ab5..aa6420a 100644
--- a/setup.py
+++ b/setup.py
@@ -30,9 +30,9 @@ info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
     if key in info:
         info[key] = info[key].strip().splitlines()
-major_version, minor_version = 3, 4
+major_version, minor_version = 3, 8
 
-requires = []
+requires = ['pytz']
 
 for dep in info.get('depends', []):
     if dep.startswith('health'):
diff --git a/tests/test_health_surgery.py b/tests/test_health_surgery.py
index 7bb4792..196c19f 100644
--- a/tests/test_health_surgery.py
+++ b/tests/test_health_surgery.py
@@ -1,41 +1,17 @@
-#!/usr/bin/env python
-
-import sys, os
-DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
-    '..', '..', '..', '..', '..', 'trytond')))
-if os.path.isdir(DIR):
-    sys.path.insert(0, os.path.dirname(DIR))
-
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view, test_depends
+from trytond.tests.test_tryton import ModuleTestCase
 
 
-class HealthSurgeryTestCase(unittest.TestCase):
+class HealthSurgeryTestCase(ModuleTestCase):
     '''
-    Test HealthSurgery module.
+    Test Health Surgery module.
     '''
+    module = 'health_surgery'
 
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('health_surgery')
-
-    def test0005views(self):
-        '''
-        Test views.
-        '''
-        test_view('health_surgery')
-
-    def test0006depends(self):
-        '''
-        Test depends.
-        '''
-        test_depends()
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         HealthSurgeryTestCase))
     return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 3d5835c..726aa2e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,8 +1,9 @@
 [tryton]
-version=2.8.1
+version=3.0.1
 depends:
     health
 xml:
     health_surgery_view.xml
     security/access_rights.xml
     health_surgery_report.xml
+	data/health_surgery_sequence.xml
diff --git a/trytond_health_surgery.egg-info/PKG-INFO b/trytond_health_surgery.egg-info/PKG-INFO
index 1a991b1..19781a7 100644
--- a/trytond_health_surgery.egg-info/PKG-INFO
+++ b/trytond_health_surgery.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-health-surgery
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Surgery Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/trytond_health_surgery.egg-info/SOURCES.txt b/trytond_health_surgery.egg-info/SOURCES.txt
index 92b809f..754428a 100644
--- a/trytond_health_surgery.egg-info/SOURCES.txt
+++ b/trytond_health_surgery.egg-info/SOURCES.txt
@@ -9,13 +9,23 @@ setup.py
 ./health_surgery_report.xml
 ./health_surgery_view.xml
 ./tryton.cfg
+./data/health_surgery_sequence.xml
 ./doc/index.rst
 ./icons/surgery.svg
+./locale/ar.po
+./locale/de_AT.po
 ./locale/el_GR.po
+./locale/en_GB.po
+./locale/es_AR.po
+./locale/es_EC.po
 ./locale/es_ES.po
+./locale/es_MX.po
+./locale/es_PE.po
 ./locale/fr_FR.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/kn.po
+./locale/lo.po
 ./locale/pt_BR.po
 ./locale/zh_CN.po
 ./report/__init__.py
@@ -32,13 +42,27 @@ setup.py
 ./view/gnuhealth_rcri_form.xml
 ./view/gnuhealth_rcri_tree.xml
 ./view/gnuhealth_surgery.xml
+./view/gnuhealth_surgery_supply.xml
+./view/gnuhealth_surgery_supply_tree.xml
+./view/gnuhealth_surgery_team.xml
+./view/gnuhealth_surgery_team_tree.xml
 ./view/gnuhealth_surgery_tree.xml
+data/health_surgery_sequence.xml
 icons/surgery.svg
+locale/ar.po
+locale/de_AT.po
 locale/el_GR.po
+locale/en_GB.po
+locale/es_AR.po
+locale/es_EC.po
 locale/es_ES.po
+locale/es_MX.po
+locale/es_PE.po
 locale/fr_FR.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/kn.po
+locale/lo.po
 locale/pt_BR.po
 locale/zh_CN.po
 report/surgery_report.odt
@@ -58,4 +82,8 @@ view/gnuhealth_procedure_tree.xml
 view/gnuhealth_rcri_form.xml
 view/gnuhealth_rcri_tree.xml
 view/gnuhealth_surgery.xml
+view/gnuhealth_surgery_supply.xml
+view/gnuhealth_surgery_supply_tree.xml
+view/gnuhealth_surgery_team.xml
+view/gnuhealth_surgery_team_tree.xml
 view/gnuhealth_surgery_tree.xml
\ No newline at end of file
diff --git a/trytond_health_surgery.egg-info/requires.txt b/trytond_health_surgery.egg-info/requires.txt
index fcccb26..a24d80f 100644
--- a/trytond_health_surgery.egg-info/requires.txt
+++ b/trytond_health_surgery.egg-info/requires.txt
@@ -1,2 +1,3 @@
-trytond_health == 2.8.1
-trytond >= 3.4, < 3.5
+pytz
+trytond_health == 3.0.1
+trytond >= 3.8, < 3.9
diff --git a/view/gnuhealth_patient.xml b/view/gnuhealth_patient.xml
index 02ede8f..8955900 100644
--- a/view/gnuhealth_patient.xml
+++ b/view/gnuhealth_patient.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id="patient_diseases"]" position="after">
+    <xpath expr="/form/notebook/page[@id="general_info"]" position="after">
         <page string="Surgeries" id="page_surgery">
             <field name="surgery" colspan="4"/>
         </page>
diff --git a/view/gnuhealth_surgery.xml b/view/gnuhealth_surgery.xml
index e9e0c42..a705d66 100644
--- a/view/gnuhealth_surgery.xml
+++ b/view/gnuhealth_surgery.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0"?>
 <form string="Surgery">
-    <group colspan="4" col="8" id="group_surgery_header">
-        <label name="patient"/>
-        <field name="patient"/>
-        <label name="surgery_date"/>
-        <field name="surgery_date"/>
+    <group string="Patient" colspan="4" col="10" id="group_surgery_patient_header">
+        <field name="patient" colspan="3"/>
+        <field name="gender"/>
         <label name="computed_age"/>
         <field name="computed_age"/>
+        <label name="surgery_date"/>
+        <field name="surgery_date"/>
         <label name="code"/>
         <field name="code"/>
-        <newline/>
+    </group>
+    <newline/>
+    <group colspan="4" col="8" id="group_surgery_header">
         <label name="description"/>
         <field name="description"/>
         <label name="pathology"/>
@@ -20,20 +22,24 @@
         <field name="operating_room"/>
     </group>
     <newline/>
-    <group colspan="4" id="group_surgery_1">
+    <group colspan="4" col="6" id="group_surgery_1">
+        <label name="institution"/>
+        <field name="institution"/>
         <label name="surgeon"/>
         <field name="surgeon"/>
         <label name="anesthetist"/>
         <field name="anesthetist"/>
     </group>
     <newline/>
-    <group string="Patient Surgical Risk assessment" id="group_patient_surgery_risk" colspan="4" col="6">
+    <group string="Patient Surgical Risk assessment" id="group_patient_surgery_risk" colspan="4" col="8">
         <label name="preop_asa"/>
         <field name="preop_asa" width="150"/>
         <label name="preop_rcri"/>
         <field name="preop_rcri"/>
         <label name="preop_mallampati"/>
         <field name="preop_mallampati" width="150"/>
+        <label name="surgical_wound"/>
+        <field name="surgical_wound"/>
     </group>
     <newline/>
     <group string="Preoperative checklist" id="group_preoperative_checklist" colspan="4" col="10">
@@ -49,22 +55,30 @@
         <field name="preop_sterility"/>
     </group>
     <newline/>
-    <separator id="surgery_separator_1" colspan="4"/>
-    <field name="procedures" colspan="4"/>
+    <field name="procedures" colspan="2"/>
+    <field name="supplies" colspan="2"/>
     <newline/>
-    <separator string="Details / Incidents" id="separator_surgery_details" colspan="2"/>
+    <separator string="Details" id="separator_surgery_details" colspan="2"/>
     <separator string="Anesthesia" id="separator_anesthesia_details" colspan="2"/>
     <newline/>
     <field name="extra_info" colspan="2"/>
     <field name="anesthesia_report" colspan="2"/>
     <newline/>
-    <group id="end_surgery" colspan="4" col="12">
+    <field name="surgery_team" colspan="4"/>
+    <newline/>
+    <group id="end_surgery" colspan="4" col="14">
         <label name="surgery_end_date"/>
         <field name="surgery_end_date"/>
         <label name="surgery_length"/>
         <field name="surgery_length"/>
+        <label name="postoperative_dx"/>
+        <field name="postoperative_dx"/>
         <field name="state"/>
+        <button name="confirmed" help="Confirm the scheduled surgery" string="Confirm" icon="tryton-go-next" confirm="Confirm the surgery and reserve the Operating Room ?"/>
+        <button name="cancel" help="Cancel the confirmed surgery" string="Cancel" icon="tryton-go-next" confirm="Cancel surgery ?"/>
+        <button name="start" help="Start the Surgery" string="Start" icon="tryton-go-next" confirm="Start the surgery ?"/>
+        <button name="done" help="Finnish the surgery" string="Finnish" icon="tryton-go-next" confirm="End this surgery ?"/>
         <button name="signsurgery" help="Sign this surgery" string="Sign" icon="tryton-go-next" confirm="Finish and sign this surgery ? Itwill become read-only !"/>
-    <field name="signed_by"/>
+        <field name="signed_by"/>
     </group>
 </form>
diff --git a/view/gnuhealth_surgery_supply.xml b/view/gnuhealth_surgery_supply.xml
new file mode 100644
index 0000000..d794d4f
--- /dev/null
+++ b/view/gnuhealth_surgery_supply.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<form string="Supply">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="qty"/>
+    <field name="qty"/>
+    <label name="supply"/>
+    <field name="supply"/>
+    <label name="qty_used"/>
+    <field name="qty_used"/>
+    <label name="notes"/>
+    <field name="notes"/>
+</form>
diff --git a/view/gnuhealth_surgery_supply_tree.xml b/view/gnuhealth_surgery_supply_tree.xml
new file mode 100644
index 0000000..f73c744
--- /dev/null
+++ b/view/gnuhealth_surgery_supply_tree.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<tree string="Supply" editable="top">
+    <field name="qty"/>
+    <field name="supply"/>
+    <field name="qty_used"/>
+    <field name="notes"/>
+</tree>
diff --git a/view/gnuhealth_surgery_team.xml b/view/gnuhealth_surgery_team.xml
new file mode 100644
index 0000000..f7afef9
--- /dev/null
+++ b/view/gnuhealth_surgery_team.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<form string="Surgery Team">
+    <label name="team_member"/>
+    <field name="team_member"/>
+    <label name="role"/>
+    <field name="role"/>
+    <label name="notes"/>
+    <field name="notes"/>
+</form>
diff --git a/view/gnuhealth_surgery_team_tree.xml b/view/gnuhealth_surgery_team_tree.xml
new file mode 100644
index 0000000..8ee61d4
--- /dev/null
+++ b/view/gnuhealth_surgery_team_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree string="Surgery Team members" editable="top">
+    <field name="team_member" expand="1"/>
+    <field name="role" expand="1"/>
+    <field name="notes"/>
+</tree>
diff --git a/view/gnuhealth_surgery_tree.xml b/view/gnuhealth_surgery_tree.xml
index 27cb257..48175f7 100644
--- a/view/gnuhealth_surgery_tree.xml
+++ b/view/gnuhealth_surgery_tree.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <tree string="Surgery">
     <field name="patient"/>
-    <field name="description"/>
-    <field name="pathology"/>
+    <field name="description" expand="1"/>
+    <field name="pathology" expand="1"/>
     <field name="classification"/>
-    <field name="surgery_date"/>
+    <field name="surgery_date" widget="date"/>
+    <field name="surgery_date" string="Time" widget="time"/>
+    <field name="state"/>
     <field name="surgery_length"/>
     <field name="operating_room"/>
     <field name="computed_age"/>
+    <field name="postoperative_dx"/>
     <field name="institution"/>
 </tree>
commit d97fd42d71af7f857d0063223f39c70dde7191c2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Mar 25 21:58:40 2016 +0100

    Updating copyright years.

diff --git a/debian/copyright b/debian/copyright
index 797cead..bc5aec8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2008-2015 Luis Falcon <lfalcon at gnusolidario.org>
-           2011-2015 GNU Solidario <health at gnusolidario.org>
+Copyright: 2008-2016 Luis Falcon <lfalcon at gnusolidario.org>
+           2011-2016 GNU Solidario <health at gnusolidario.org>
 License: GPL-3+
 
 Files: setup.py
@@ -10,7 +10,7 @@ Copyright: 2011 Cédric Krier <ced at b2ck.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2015 Mathias Behrle <mathiasb at m9s.biz>
+Copyright: 2015-2016 Mathias Behrle <mathiasb at m9s.biz>
 License: GPL-3+
 
 License: GPL-3+
-- 
tryton-modules-health-surgery



More information about the tryton-debian-vcs mailing list