[tryton-debian-vcs] tryton-modules-health-inpatient branch debian updated. debian/2.8.1-1-12-g7047102

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Mon Mar 28 18:27:19 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-inpatient.git;a=commitdiff;h=debian/2.8.1-1-12-g7047102

commit 7047102f1f7e009445225dfb9077c3e852123777
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:39:53 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 dd4493d..8352eb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-health-inpatient (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:39:53 +0200
+
 tryton-modules-health-inpatient (2.8.1-1) unstable; urgency=medium
 
   * Initial packaging.
commit de314e2d6e818529ca9dfddb2d97bc84ca6b74ff
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:39:53 2016 +0200

    Merging upstream version 3.0.1.

diff --git a/PKG-INFO b/PKG-INFO
index f0f5c90..4070474 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_health_inpatient
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Hospitalization 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 662efc9..49fd134 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
@@ -30,19 +30,24 @@ def register():
     Pool.register(
         InpatientSequences,
         DietTherapeutic,
-        DietBelief,
         InpatientRegistration,
         BedTransfer,
         Appointment,
+        PatientEvaluation,
+        ECG,
         PatientData,
         InpatientMedication,
         InpatientMedicationAdminTimes,
         InpatientMedicationLog,
         InpatientDiet,
         CreateBedTransferInit,
+        InpatientMeal,
+        InpatientMealOrder,
+        InpatientMealOrderItem,
         module='health_inpatient', type_='model')
     
     Pool.register(
         CreateBedTransfer,
+        CreateInpatientEvaluation,
         module='health_inpatient', type_='wizard')
 
diff --git a/data/diets_beliefs.xml b/data/diets_beliefs.xml
deleted file mode 100644
index e22b30f..0000000
--- a/data/diets_beliefs.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tryton>
-    <data skiptest="1" noupdate="1">
-
-        <record model="gnuhealth.diet.belief" id="BUDDHIST">
-            <field name="name">Buddhist</field>
-            <field name="code">BUDDHIST</field>
-            <field name="description">While Buddhism does not have specific dietary rules, some buddhists practise vegetarianism based on a strict interpretation of the first of the Five Precepts</field>
-        </record>
-
-        <record model="gnuhealth.diet.belief" id="EDENIC">
-            <field name="name">Edenic</field>
-            <field name="code">EDENIC</field>
-            <field name="description">A diet based on what Adam and Eve are believed to have consumed in Garden of Eden. Usually either vegetarian or vegan, and based predominantly on fruit</field>
-        </record>
-
-        <record model="gnuhealth.diet.belief" id="HALLELUJAH">
-            <field name="name">Hallelujah</field>
-            <field name="code">HALLELUJAH</field>
-            <field name="description">Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. The creators interpret a verse from the Bible as suggesting that Christians should only consume seed bearing plants and fruits.</field>
-        </record>
- 
-        <record model="gnuhealth.diet.belief" id="HINDU">
-            <field name="name">Hindu</field>
-            <field name="code">HINDU</field>
-            <field name="description">Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-vegetarian diets, based on the principle of Ahimsa (non-harming)</field>
-        </record>
-
-        <record model="gnuhealth.diet.belief" id="ISLAMIC">
-            <field name="name">Islamic</field>
-            <field name="code">ISLAMIC</field>
-            <field name="description">Muslims follow a diet consisting solely of food that is halal – permissible under Islamic law. The opposite of halal is haraam, food that is Islamically Impermissible. Haraam substances include alcohol, pork, and any meat from an animal which was not killed through the Islamic method of ritual slaughter (Dhabiha)</field>
-        </record>
-
-        <record model="gnuhealth.diet.belief" id="ITAL">
-            <field name="name">I-tal</field>
-            <field name="code">ITAL</field>
-            <field name="description">I-tal: A set of principles which influences the diet of many members of the Rastafari movement. One principle is that natural foods should be consumed. Some Rastafarians interpret I-tal to advocate vegetarianism or veganism</field>
-        </record>
-
-        <record model="gnuhealth.diet.belief" id="KOSHER">
-            <field name="name">Kosher</field>
-            <field name="code">KOSHER</field>
-            <field name="description">Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws, is said to be Kosher. Some foods and food combinations are non-Kosher, and failure to prepare food in accordance with Kashrut can make otherwise permissible foods non-Kosher.</field>
-        </record>
-
-    </data>
-</tryton>
diff --git a/data/health_inpatient_sequence.xml b/data/health_inpatient_sequence.xml
index 265c0c7..cbeb289 100644
--- a/data/health_inpatient_sequence.xml
+++ b/data/health_inpatient_sequence.xml
@@ -22,5 +22,25 @@
             <field name="value" eval="'ir.sequence,' + str(ref('seq_gnuhealth_inpatient_registration'))"/>
         </record>
 
+<!-- Sequences for Inpatient Meal Orders -->
+
+        <record id="seq_type_gnuhealth_inpatient_meal_order" model="ir.sequence.type">
+            <field name="name">Inpatient Meal Order</field>
+            <field name="code">gnuhealth.inpatient.meal.order</field>
+        </record>
+
+        <record id="seq_gnuhealth_inpatient_meal_order" model="ir.sequence">
+            <field name="name">Inpatient Meal Order</field>
+            <field name="code">gnuhealth.inpatient.meal.order</field>
+            <field name="prefix">MEAL</field>
+            <field name="padding">3</field>
+        </record>
+
+        <record model="ir.property" id="property_inpatient_meal_order_sequence">
+            <field name="field" 
+                search="[('model.model', '=', 'gnuhealth.sequences'), ('name', '=', 'inpatient_meal_order_sequence')]"/>
+            <field name="value" eval="'ir.sequence,' + str(ref('seq_gnuhealth_inpatient_meal_order'))"/>
+        </record>
+
     </data>
 </tryton>
diff --git a/health_inpatient.py b/health_inpatient.py
index 63f65f2..5bebb9c 100644
--- a/health_inpatient.py
+++ b/health_inpatient.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
@@ -21,16 +21,20 @@
 #
 ##############################################################################
 from datetime import datetime
-from trytond.model import ModelView, ModelSingleton, ModelSQL, fields
+from trytond.model import ModelView, ModelSingleton, ModelSQL, fields, Unique
 from trytond.transaction import Transaction
+from trytond.tools import grouped_slice, reduce_ids
+from sql import Literal, Table
 from trytond.pool import Pool
-from trytond.pyson import Eval, Not, Bool, And, Equal
+from trytond.pyson import Eval, Not, Bool, And, Equal, Or
+from trytond import backend
 
 
-__all__ = ['InpatientSequences', 'DietTherapeutic', 'DietBelief',
-    'InpatientRegistration', 'BedTransfer', 'Appointment', 'PatientData',
+__all__ = ['InpatientSequences', 'DietTherapeutic','InpatientRegistration', 
+    'BedTransfer', 'Appointment', 'PatientEvaluation', 'PatientData',
     'InpatientMedication', 'InpatientMedicationAdminTimes',
-    'InpatientMedicationLog', 'InpatientDiet']
+    'InpatientMedicationLog', 'InpatientDiet', 'InpatientMeal',
+    'InpatientMealOrder','InpatientMealOrderItem', 'ECG']
 
 
 class InpatientSequences(ModelSingleton, ModelSQL, ModelView):
@@ -41,6 +45,10 @@ class InpatientSequences(ModelSingleton, ModelSQL, ModelView):
         'ir.sequence', 'Inpatient Sequence', required=True,
         domain=[('code', '=', 'gnuhealth.inpatient.registration')]))
 
+    inpatient_meal_order_sequence = fields.Property(fields.Many2One(
+        'ir.sequence', 'Inpatient Meal Sequence', required=True,
+        domain=[('code', '=', 'gnuhealth.inpatient.meal.order')]))
+
 
 # Therapeutic Diet types
 
@@ -56,96 +64,99 @@ class DietTherapeutic (ModelSQL, ModelView):
     def __setup__(cls):
         super(DietTherapeutic, cls).__setup__()
 
+        t = cls.__table__()
         cls._sql_constraints = [
-            ('code_uniq', 'unique(code)',
-             'The Diet code already exists')]
-
-
-# Diet by belief / religion
-
-class DietBelief (ModelSQL, ModelView):
-    'Diet by Belief'
-    __name__="gnuhealth.diet.belief"
-
-    name = fields.Char('Belief', required=True, translate=True)
-    code = fields.Char('Code', required=True)
-    description = fields.Text('Description', required=True, translate=True)
-
-    @classmethod
-    def __setup__(cls):
-        super(DietBelief, cls).__setup__()
-
-        cls._sql_constraints = [
-            ('code_uniq', 'unique(code)',
-             'The Diet code already exists')]
+            ('code_unique', Unique(t,t.code),
+                'The Diet code already exists'),
+            ]
 
 
 class InpatientRegistration(ModelSQL, ModelView):
     'Patient admission History'
     __name__ = 'gnuhealth.inpatient.registration'
 
+    STATES = {'readonly': Or(Eval('state') == 'done',
+        Eval('state') == 'finished')}
+    
     name = fields.Char('Registration Code', readonly=True, select=True)
     patient = fields.Many2One('gnuhealth.patient', 'Patient',
-     required=True, select=True)
+     required=True, select=True, states = STATES)
     admission_type = fields.Selection([
+        (None, ''),
         ('routine', 'Routine'),
         ('maternity', 'Maternity'),
         ('elective', 'Elective'),
         ('urgent', 'Urgent'),
         ('emergency', 'Emergency'),
-        ], 'Admission type', required=True, select=True)
+        ], 'Admission type', required=True, select=True, states = STATES)
     hospitalization_date = fields.DateTime('Hospitalization date',
-        required=True, select=True)
+        required=True, select=True, states = STATES)
     discharge_date = fields.DateTime('Expected Discharge Date', required=True,
-        select=True)
+        states = STATES)
     attending_physician = fields.Many2One('gnuhealth.healthprofessional',
-        'Attending Physician', select=True)
+        'Attending Physician',  states = STATES)
     operating_physician = fields.Many2One('gnuhealth.healthprofessional',
-        'Operating Physician')
+        'Operating Physician',  states = STATES)
     admission_reason = fields.Many2One('gnuhealth.pathology',
-        'Reason for Admission', help="Reason for Admission", select=True)
+        'Reason for Admission', help="Reason for Admission",  states = STATES,
+        select=True)
     bed = fields.Many2One('gnuhealth.hospital.bed', 'Hospital Bed',
         states={
             'required': Not(Bool(Eval('name'))),
-            'readonly': Bool(Eval('name')),
+            'readonly': Or(Eval('state') == 'done',
+                            Eval('state') == 'finished', 
+                            Bool(Eval('name')),
+                        )
             },
         depends=['name'])
-    nursing_plan = fields.Text('Nursing Plan')
+    nursing_plan = fields.Text('Nursing Plan', states = STATES)
     medications = fields.One2Many('gnuhealth.inpatient.medication', 'name',
-        'Medications')
+        'Medications', states = STATES)
     therapeutic_diets = fields.One2Many('gnuhealth.inpatient.diet', 'name',
-        'Meals / Diet Program')
-    diet_belief = fields.Many2One('gnuhealth.diet.belief',
-        'Belief', help="Enter the patient belief or religion to choose the \
-            proper diet")
-    diet_vegetarian = fields.Selection((
-        ('none', 'None'),
-        ('vegetarian', 'Vegetarian'),
-        ('lacto', 'Lacto vegetarian'),
-        ('lactoovo', 'Lacto-ovo vegetarian'),
-        ('pescetarian', 'Pescetarian'),
-        ('vegan', 'Vegan'),
-        ), 'Vegetarian', sort=False, required=True)
-    nutrition_notes = fields.Text('Nutrition notes / directions')
-    discharge_plan = fields.Text('Discharge Plan')
-    info = fields.Text('Extra Info')
+        'Meals / Diet Program', states = STATES)
+        
+    nutrition_notes = fields.Text('Nutrition notes / directions', states = STATES)
+    discharge_plan = fields.Text('Discharge Plan', states = STATES)
+    info = fields.Text('Notes',states = STATES)
     state = fields.Selection((
+        (None, ''),
         ('free', 'free'),
         ('cancelled', 'cancelled'),
         ('confirmed', 'confirmed'),
         ('hospitalized', 'hospitalized'),
-        ('done','Done'),
-        ), 'Status', select=True)
+        ('done','Discharged - needs cleaning'),
+        ('finished','Finished'),
+        ), 'Status', select=True, readonly=True)
         
     bed_transfers = fields.One2Many('gnuhealth.bed.transfer', 'name',
         'Transfer History', readonly=True)
 
     discharged_by = fields.Many2One(
         'gnuhealth.healthprofessional', 'Discharged by', readonly=True,
-        states={'invisible': Not(Equal(Eval('state'), 'done'))},
         help="Health Professional that discharged the patient")
 
-    institution = fields.Many2One('gnuhealth.institution', 'Institution')
+    discharge_reason = fields.Selection([
+        (None, ''),
+        ('home','Home / Selfcare'),
+        ('transfer','Transferred to another institution'),
+        ('death','Death'),
+        ('against_advice','Left against medical advice')],
+        'Discharge Reason', 
+        states={'readonly': Not(Equal(Eval('state'), 'hospitalized')),},
+        help="Reason for patient discharge")
+
+    discharge_dx = fields.Many2One('gnuhealth.pathology',
+        'Discharge Dx', help="Code for Discharge Diagnosis",
+        states={'readonly': Not(Equal(Eval('state'), 'hospitalized')),})
+  
+    institution = fields.Many2One('gnuhealth.institution', 'Institution',
+        readonly=True)
+
+    puid = fields.Function(
+        fields.Char('PUID', help="Person Unique Identifier"),
+        'get_patient_puid', searcher="search_patient_puid")
+
+
 
     @staticmethod
     def default_institution():
@@ -153,15 +164,48 @@ class InpatientRegistration(ModelSQL, ModelView):
         institution = HealthInst.get_institution()
         return institution
 
+    def get_patient_puid(self, name):
+        return self.patient.name.ref
+
+    @classmethod
+    def search_patient_puid(cls, name, clause):
+        res = []
+        value = clause[2]
+        res.append(('patient.name.ref', clause[1], value))
+        return res
+
+
+    @classmethod
+    def __register__(cls, module_name):
+        super(InpatientRegistration, cls).__register__(module_name)
+
+        cursor = Transaction().cursor
+        TableHandler = backend.get('TableHandler')
+        table = TableHandler(cursor, cls, module_name)
+
+        # Update to version 3.0
+        # The diets based on religion and philosophy
+        # are now in the lifestyle module
+        if table.column_exist('diet_vegetarian'):
+            table.drop_column('diet_vegetarian')
+
+        if table.column_exist('diet_belief'):
+            table.drop_column('diet_belief')
+
+
     @classmethod
     def __setup__(cls):
         super(InpatientRegistration, cls).__setup__()
+        t = cls.__table__()
         cls._sql_constraints = [
-            ('name_uniq', 'unique(name)',
-             'The Registration code already exists')
-        ]
+            ('name_unique', Unique(t,t.name),
+                'The Registration code already exists'),
+            ]
+
         cls._error_messages.update({
                 'bed_is_not_available': 'Bed is not available',
+                'discharge_reason_needed': 'Admission and Discharge reasons \n'
+                'as well as Discharge Dx are needed',
                 'destination_bed_unavailable': 'Destination bed unavailable'})
         cls._buttons.update({
                 'confirmed': {
@@ -171,16 +215,20 @@ class InpatientRegistration(ModelSQL, ModelView):
                 'cancel': {
                     'invisible': Not(Equal(Eval('state'), 'confirmed')),
                     },
+                'admission': {
+                    'invisible': Not(Equal(Eval('state'), 'confirmed')),
+                    },
                 'discharge': {
                     'invisible': Not(Equal(Eval('state'), 'hospitalized')),
                     },
-                'admission': {
-                    'invisible': Not(Equal(Eval('state'), 'confirmed')),
+                'bedclean': {
+                    'invisible': Not(Equal(Eval('state'), 'done')),
                     },
                 })
 
     ## Method to check for availability and make the hospital bed reservation
-
+    # Checks that there are not overlapping dates and status of the bed / room
+    # is not confirmed, hospitalized or done but requiring cleaning ('done')
     @classmethod
     @ModelView.button
     def confirmed(cls, registrations):
@@ -192,11 +240,11 @@ class InpatientRegistration(ModelSQL, ModelView):
             FROM gnuhealth_inpatient_registration \
             WHERE (hospitalization_date::timestamp,discharge_date::timestamp) \
                 OVERLAPS (timestamp %s, timestamp %s) \
-              AND (state = %s or state = %s) \
+              AND (state = %s or state = %s or state = %s) \
               AND bed = CAST(%s AS INTEGER) ",
             (registration_id.hospitalization_date,
             registration_id.discharge_date,
-            'confirmed', 'hospitalized', str(bed_id)))
+            'confirmed', 'hospitalized', 'done', str(bed_id)))
         res = cursor.fetchone()
         if (registration_id.discharge_date.date() <
             registration_id.hospitalization_date.date()):
@@ -222,6 +270,16 @@ class InpatientRegistration(ModelSQL, ModelView):
         cls.write(registrations, {'state': 'done',
             'discharged_by': signing_hp})
 
+        Bed.write([registration_id.bed], {'state': 'to_clean'})
+
+    @classmethod
+    @ModelView.button
+    def bedclean(cls, registrations):
+        registration_id = registrations[0]
+        Bed = Pool().get('gnuhealth.hospital.bed')
+
+        cls.write(registrations, {'state': 'finished'})
+
         Bed.write([registration_id.bed], {'state': 'free'})
 
     @classmethod
@@ -259,33 +317,41 @@ class InpatientRegistration(ModelSQL, ModelView):
                     config.inpatient_registration_sequence.id)
         return super(InpatientRegistration, cls).create(vlist)
 
-    @classmethod
-    def write(cls, registrations, vals):
-        # Don't allow to write the record if the evaluation has been done
-        if registrations[0].state == 'done':
-            cls.raise_user_error(
-                "This hospitalization is at state Done\n"
-                "You can no longer modify it.")
-        return super(InpatientRegistration, cls).write(registrations, vals)
-
     @staticmethod
     def default_state():
         return 'free'
 
-    # Allow searching by the hospitalization code or patient name
+    @classmethod
+    def validate(cls, registrations):
+        super(InpatientRegistration, cls).validate(registrations)
+        for registration in registrations:
+            registration.check_discharge_context()
+
 
+    def check_discharge_context(self):
+        if ((not self.discharge_reason or not self.discharge_dx
+            or not self.admission_reason)
+            and self.state == 'done'):
+                self.raise_user_error('discharge_reason_needed')
+
+    
+    # Format Registration ID : Patient : Bed
     def get_rec_name(self, name):
         if self.patient:
-            return self.name + ': ' + self.patient.name.name + ' ' + \
-             self.patient.name.lastname
+            return self.name + ':' + self.bed.rec_name + ':' \
+                + self.patient.rec_name 
+                
         else:
             return self.name
 
+    # Allow searching by the hospitalization code, patient name
+    # or bed number 
+
     @classmethod
     def search_rec_name(cls, name, clause):
         field = None
         # Search by Registration Code ID or Patient
-        for field in ('name', 'patient'):
+        for field in ('name', 'patient', 'bed'):
             registrations = cls.search([(field,) + tuple(clause[1:])], limit=1)
             if registrations:
                 break
@@ -294,6 +360,8 @@ class InpatientRegistration(ModelSQL, ModelView):
         return [(cls._rec_name,) + tuple(clause[1:])]
 
 
+
+        
 class BedTransfer(ModelSQL, ModelView):
     'Bed transfers'
     __name__ = 'gnuhealth.bed.transfer'
@@ -309,13 +377,89 @@ class BedTransfer(ModelSQL, ModelView):
 
 
 class Appointment(ModelSQL, ModelView):
-    'Add Inpatient Registration field to the Appointment model.'
     __name__ = 'gnuhealth.appointment'
 
     inpatient_registration_code = fields.Many2One(
         'gnuhealth.inpatient.registration', 'Inpatient Registration',
         help="Enter the patient hospitalization code")
 
+class PatientEvaluation(ModelSQL, ModelView):
+    __name__ = 'gnuhealth.patient.evaluation'
+
+    inpatient_registration_code = fields.Many2One(
+        'gnuhealth.inpatient.registration', 'IPC',
+        help="Enter the patient hospitalization code")
+
+class ECG(ModelSQL, ModelView):
+    __name__ = 'gnuhealth.patient.ecg'
+
+    inpatient_registration_code = fields.Many2One(
+        'gnuhealth.inpatient.registration', 'Inpatient Registration',
+        help="Enter the patient hospitalization code")
+
+    @classmethod
+    def __register__(cls, module_name):
+
+        # Upgrade to release 3.0 
+        # Move existing ICU EGC records to the generic gnuhealth.patient.ecg
+        # model
+        
+        super(ECG, cls).__register__(module_name)
+
+        cursor = Transaction().cursor
+        TableHandler = backend.get('TableHandler')
+
+        
+        if TableHandler.table_exist(cursor, 'gnuhealth_icu_ecg'):
+
+            table = TableHandler(cursor, cls, module_name)
+
+            # Retrieve IDs from ECGs at ICU
+
+            cursor.execute('select id,name from gnuhealth_icu_ecg')
+            
+            icu_ecg_ids = cursor.fetchall()
+
+            # Traverse each record on the icu_ecg table
+            for icu_ecg in icu_ecg_ids:
+
+                registration = str(icu_ecg[1])
+
+                # Get the patient ID related to the registration
+                cursor.execute('select patient FROM \
+                gnuhealth_inpatient_registration \
+                where id = %s',registration)
+                
+                patient_id = cursor.fetchone()
+
+                cursor.execute('select name, ecg_date, lead, axis, rate,\
+                rhythm, pacemaker, pr, qrs, qt, st_segment, twave_inversion, \
+                interpretation, ecg_strip FROM gnuhealth_icu_ecg where \
+                name = %s and id = %s', (registration, icu_ecg[0]))
+                
+                ecg = cursor.fetchone()
+                                
+                (name, ecg_date, lead, axis, rate, rhythm, \
+                pacemaker, pr, qrs, qt, st_segment, twave_inversion, \
+                interpretation, ecg_strip) = ecg
+
+                # Insert the values on the new ECG table
+                cursor.execute('insert into gnuhealth_patient_ecg \
+                (name, inpatient_registration_code, ecg_date, lead, axis, \
+                rate,rhythm,pacemaker, pr, qrs, qt, st_segment, \
+                twave_inversion, interpretation, ecg_strip) \
+                VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)',
+                (patient_id, registration, ecg_date, lead, axis, rate, \
+                rhythm, pacemaker, pr, qrs, qt, st_segment, \
+                twave_inversion, interpretation, ecg_strip))
+
+
+                # Rename obsolete table gnuhealth_icu_ecg
+                # Once we know everything is OK we can drop it
+                
+                cursor.execute('alter table gnuhealth_icu_ecg rename \
+                to old_icu_ecg')
+                
 
 class PatientData(ModelSQL, ModelView):
     'Inherit patient model and add the patient status to the patient.'
@@ -323,35 +467,58 @@ class PatientData(ModelSQL, ModelView):
 
     patient_status = fields.Function(fields.Boolean('Hospitalized',
         help="Show the hospitalization status of the patient"),
-        'get_patient_status')
+        getter='get_patient_status', searcher='search_patient_status')
 
-    def get_patient_status(self, name):
-        
+    @classmethod
+    def get_patient_status(cls, patients, name):
         cursor = Transaction().cursor
+        pool = Pool()
+        Registration = pool.get('gnuhealth.inpatient.registration')
+        registration = Registration.__table__()
 
-        def get_hospitalization_status(patient_dbid):
-            is_hospitalized = False
+        # Will store statuses {patient: True/False, ...}
+        ids = map(int, patients)
+        result = dict.fromkeys(ids, False)
 
-            cursor.execute('SELECT count(state) \
-                FROM gnuhealth_inpatient_registration \
-                WHERE patient = %s \
-                AND state = \'hospitalized\' LIMIT 1' , (patient_dbid,))
-            
-            if cursor.fetchone()[0] > 0:
-                is_hospitalized = True
-            
-            return is_hospitalized
+        for sub_ids in grouped_slice(ids):
+            # SQL expression for relevant patient ids
+            clause_ids = reduce_ids(registration.id, sub_ids)
 
-        result = ''
+            # Hospitalized patient ids
+            query = registration.select(registration.patient, Literal(True),
+                where=(registration.state == 'hospitalized') & clause_ids,
+                group_by=registration.patient)
+
+            # Update dictionary of patient ids with True statuses
+            cursor.execute(*query)
+            result.update(cursor.fetchall())
 
-        # Get the patient (DB) id to be used in the search on the medical
-        # inpatient registration table lookup
-        
-        patient_dbid = self.id
-        if patient_dbid:
-            result = get_hospitalization_status(patient_dbid)
         return result
 
+    @classmethod
+    def search_patient_status(cls, name, clause):
+        p = Pool().get('gnuhealth.inpatient.registration')
+        table = p.__table__()
+        pat = cls.__table__()
+        _, operator, value = clause
+
+        # Validate operator and value
+        if operator not in ['=', '!=']:
+            raise ValueError('Wrong operator: %s' % operator)
+        if value is not True and value is not False:
+            raise ValueError('Wrong value: %s' % value)
+
+        # Find hospitalized patient ids
+        j = pat.join(table, condition = pat.id == table.patient)
+        s = j.select(pat.id, where = table.state == 'hospitalized')
+
+        # Choose domain operator
+        if (operator == '=' and value) or (operator == '!=' and not value):
+            d = 'in'
+        else:
+            d = 'not in'
+
+        return [('id', d, s)]
 
 class InpatientMedication (ModelSQL, ModelView):
     'Inpatient Medication'
@@ -497,3 +664,199 @@ class InpatientDiet (ModelSQL, ModelView):
     diet = fields.Many2One('gnuhealth.diet.therapeutic', 'Diet', required=True)
     remarks = fields.Text('Remarks / Directions',
         help='specific remarks for this diet / patient')
+
+class InpatientMeal (ModelSQL, ModelView):
+    'Inpatient Meal'
+    __name__="gnuhealth.inpatient.meal"
+
+    name = fields.Many2One(
+        'product.product', 'Food', required=True,
+        help='Food')
+
+    diet_therapeutic = fields.Many2One('gnuhealth.diet.therapeutic',
+        'Diet')
+
+    diet_belief = fields.Many2One('gnuhealth.diet.belief',
+        'Belief')
+
+    diet_vegetarian = fields.Many2One('gnuhealth.vegetarian_types',
+        'Vegetarian')
+
+    institution = fields.Many2One('gnuhealth.institution', 'Institution')
+
+    @staticmethod
+    def default_institution():
+        HealthInst = Pool().get('gnuhealth.institution')
+        institution = HealthInst.get_institution()
+        return institution
+
+    def get_rec_name(self, name):
+        if self.name:
+            return self.name.name
+
+class InpatientMealOrderItem (ModelSQL, ModelView):
+    'Inpatient Meal Item'
+    __name__="gnuhealth.inpatient.meal.order.item"
+
+    name = fields.Many2One('gnuhealth.inpatient.meal.order',
+        'Meal Order')
+
+    meal = fields.Many2One('gnuhealth.inpatient.meal', 'Meal')
+
+    remarks = fields.Char('Remarks')
+
+
+class InpatientMealOrder (ModelSQL, ModelView):
+    'Inpatient Meal Order'
+    __name__="gnuhealth.inpatient.meal.order"
+
+    name = fields.Many2One('gnuhealth.inpatient.registration',
+        'Registration Code', domain=[('state', '=', 'hospitalized')],
+        required=True)
+
+    mealtime = fields.Selection((
+        (None, ''),
+        ('breakfast', 'Breakfast'),
+        ('lunch', 'Lunch'),
+        ('dinner', 'Dinner'),
+        ('snack', 'Snack'),
+        ('special', 'Special order'),
+        ), 'Meal time', required=True, sort=False)
+
+    meal_item = fields.One2Many('gnuhealth.inpatient.meal.order.item', 'name',
+        'Items')
+
+    meal_order = fields.Char('Order', readonly=True)
+
+    health_professional = fields.Many2One('gnuhealth.healthprofessional',
+        'Health Professional')
+
+    remarks = fields.Text('Remarks')
+
+    meal_warning = fields.Boolean('Warning',readonly=True,
+        help="The patient has special needs on meals")
+
+    meal_warning_ack = fields.Boolean('Ack',
+        help="Check if you have verified the warnings on the"
+        " patient meal items")
+
+    order_date = fields.DateTime('Date',
+        help='Order date', required=True)
+
+    state = fields.Selection((
+        (None, ''),
+        ('draft', 'Draft'),
+        ('cancelled', 'Cancelled'),
+        ('ordered', 'Ordered'),
+        ('processing', 'Processing'),
+        ('done','Done'),
+        ), 'Status', readonly=True)
+
+    @staticmethod
+    def default_order_date():
+        return datetime.now()
+
+    @staticmethod
+    def default_state():
+        return 'draft'
+
+    @staticmethod
+    def default_health_professional():
+        pool = Pool()
+        return pool.get('gnuhealth.healthprofessional').get_health_professional()
+
+    @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('meal_order'):
+                config = Config(1)
+                values['meal_order'] = Sequence.get_id(
+                    config.inpatient_meal_order_sequence.id)
+        return super(InpatientMealOrder, cls).create(vlist)
+
+    @classmethod
+    def validate(cls, meal_orders):
+        super(InpatientMealOrder, cls).validate(meal_orders)
+        for meal_order in meal_orders:
+            meal_order.check_meal_order_warning()
+            meal_order.check_health_professional()
+            
+    def check_meal_order_warning(self):
+        if not self.meal_warning_ack:
+            self.raise_user_error('meal_order_warning')
+
+    def check_health_professional(self):
+        if not self.health_professional:
+            self.raise_user_error('health_professional_warning')
+
+
+    @fields.depends('name')
+    def on_change_name(self):
+        meal_warning = False
+        meal_warning_ack = True
+        if self.name:
+            # Trigger the warning if the patient 
+            # has special needs on meals (religion / philosophy )
+            if (self.name.patient.vegetarian_type or 
+                self.name.patient.diet_belief):
+                meal_warning = True
+                meal_warning_ack = False
+        return {
+            'meal_warning': meal_warning,
+            'meal_warning_ack': meal_warning_ack,
+        }
+
+    @classmethod
+    def __setup__(cls):
+        super(InpatientMealOrder, cls).__setup__()
+        cls._buttons.update({
+            'cancel': {'invisible': Not(Equal(Eval('state'), 'ordered'))}
+            })
+
+        cls._buttons.update({
+            'generate': {'invisible': Or(Equal(Eval('state'), 'ordered'),
+                    Equal(Eval('state'), 'done'))},
+            })
+
+        cls._buttons.update({
+            'done': {'invisible': Not(Equal(Eval('state'), 'ordered'))}
+            })
+
+        cls._error_messages.update({
+            'meal_order_warning':
+            '===== MEAL WARNING ! =====\n\n\n'
+            'This patient has special meal needs \n\n'
+            'Check and acknowledge that\n'
+            'the meal items in this order are correct \n\n',
+            'health_professional_warning':
+            'No health professional associated to this user',
+            })
+
+        t = cls.__table__()
+        cls._sql_constraints = [
+            ('meal_order_uniq', Unique(t,t.meal_order),
+                'The Meal Order code already exists'),
+            ]
+
+
+    @classmethod
+    @ModelView.button
+    def generate(cls, mealorders):
+        cls.write(mealorders, {
+            'state': 'ordered'})
+
+    @classmethod
+    @ModelView.button
+    def cancel(cls, mealorders):
+        cls.write(mealorders, {
+            'state': 'cancelled'})
+
+    @classmethod
+    @ModelView.button
+    def done(cls, mealorders):
+        cls.write(mealorders, {
+            'state': 'done'})
diff --git a/health_inpatient_view.xml b/health_inpatient_view.xml
index 06901a6..bf7c951 100644
--- a/health_inpatient_view.xml
+++ b/health_inpatient_view.xml
@@ -25,6 +25,11 @@
             <field name="path">icons/go-home.svg</field>
         </record>
 
+        <record model="ir.ui.icon" id="gnuhealth_meal_icon">
+            <field name="name">icon-meals</field>
+            <field name="path">icons/meals.svg</field>
+        </record>
+
         <record model="ir.ui.icon" id="gnuhealth_list_icon">
             <field name="name">gnuhealth-list</field>
             <field name="path">../health/icons/tryton-list.svg</field>
@@ -45,6 +50,7 @@
             <field name="name">gnuhealth_inpatient_registration_tree</field>
         </record>
 
+
 <!-- Create the Action -->
 
         <record model="ir.action.act_window" id="gnuhealth_action_inpatient_registration">
@@ -69,6 +75,49 @@
             id="gnuhealth_inpatient_menu" sequence="50"
             icon="icon-hospital-patient"/>
 
+<!-- Domain Action Windows -->
+
+        <record model="ir.action.act_window.domain" id="act_registration_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="10"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_registration"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_registration_domain_draft">
+            <field name="name">Cancelled</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('state', '=', 'cancelled')]" pyson="1"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_registration"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_registration_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="gnuhealth_action_inpatient_registration"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_registration_domain_hospitalized">
+            <field name="name">Hospitalized</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="[('state', '=', 'hospitalized')]" pyson="1"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_registration"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_registration_domain_done">
+            <field name="name">To clean</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('state', '=', 'done')]" pyson="1"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_registration"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_registration_domain_finished">
+            <field name="name">Finished</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('state', '=', 'finished')]" pyson="1"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_registration"/>
+        </record>
+
 <!-- Add the patient hospitalization registration code to the appointment view -->
 
         <record model="ir.ui.view" id="view_partner_form">
@@ -78,6 +127,29 @@
             <field name="name">partner_form</field>
         </record>
 
+<!-- Add the patient hospitalization registration code to the evaluation view -->
+
+        <record model="ir.ui.view" id="view_patient_evaluation_form">
+            <field name="model">gnuhealth.patient.evaluation</field>
+            <field name="inherit" ref="health.gnuhealth_patient_evaluation_view" />
+            <field name="type">form</field>
+            <field name="name">gnuhealth_patient_evaluation_form</field>
+        </record>
+
+<!-- Shortcut to the Hospitalized Patient Evaluations -->
+        <record model="ir.action.act_window" id="act_evaluation_form1">
+            <field name="name">Inpatient Evaluations</field>
+            <field name="res_model">gnuhealth.patient.evaluation</field>
+            <field name="domain" eval="[('inpatient_registration_code', '=', Eval('active_id'))]" pyson="1"/>
+        </record>
+        <record model="ir.action.keyword"
+                id="act_open_evaluation_keyword1">
+            <field name="keyword">form_relate</field>
+            <field name="model">gnuhealth.inpatient.registration,-1</field>
+            <field name="action" ref="act_evaluation_form1"/>
+        </record>
+
+
 <!-- Add the patient Hospitalization Status to the partner form -->
 
         <record id="view_patient_form" model="ir.ui.view">
@@ -94,6 +166,15 @@
             <field name="name">gnuhealth_patient_extd_tree</field>
         </record>
 
+<!-- Add the patient hospitalization registration code to the ecg view -->
+
+        <record model="ir.ui.view" id="view_ecg_registration_form1">
+            <field name="model">gnuhealth.patient.ecg</field>
+            <field name="inherit" ref="health.gnuhealth_patient_ecg_form" />
+            <field name="type">form</field>
+            <field name="name">ecg_registration</field>
+        </record>
+
 <!-- Inpatient Medication -->
 
 
@@ -141,21 +222,7 @@
             <field name="name">gnuhealth_inpatient_med_log_tree</field>
         </record>
 
-<!-- Form view for diets related to beliefs / religions -->
 
-        <record id="gnuhealth_inpatient_diet_belief_form" model="ir.ui.view">
-            <field name="model">gnuhealth.diet.belief</field>
-            <field name="type">form</field>
-            <field name="name">gnuhealth_inpatient_diet_belief_form</field>
-        </record>
-
-<!-- Tree view for the Beliefs and religon related diets -->
-
-        <record id="gnuhealth_inpatient_diet_belief_tree" model="ir.ui.view">
-            <field name="model">gnuhealth.diet.belief</field>
-            <field name="type">tree</field>
-            <field name="name">gnuhealth_inpatient_diet_belief_tree</field>
-        </record>
 
 <!-- Form view for the Therapeutic diet -->
 
@@ -170,9 +237,31 @@
         <record id="gnuhealth_inpatient_diet_therapeutic_tree" model="ir.ui.view">
             <field name="model">gnuhealth.diet.therapeutic</field>
             <field name="type">tree</field>
-            <field name="name">gnuhealth_inpatient_diet_belief_tree</field>
+            <field name="name">gnuhealth_inpatient_diet_therapeutic_tree</field>
+        </record>
+
+<!-- Add Therapeutic Diets to configuration menu -->
+
+        <record model="ir.action.act_window" id="gnuhealth_action_diet_therapeutic">
+            <field name="name">Therapeutic diets</field>
+            <field name="res_model">gnuhealth.diet.therapeutic</field>
         </record>
 
+        <record model="ir.action.act_window.view" id="act_diet_therapeutic_list_view">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="gnuhealth_inpatient_diet_therapeutic_tree"/>
+            <field name="act_window" ref="gnuhealth_action_diet_therapeutic"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_diet_therapeutic_form_view">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="gnuhealth_inpatient_diet_therapeutic_form"/>
+            <field name="act_window" ref="gnuhealth_action_diet_therapeutic"/>
+        </record>
+
+        <menuitem name="Therapeutic diets" action="gnuhealth_action_diet_therapeutic"
+            id="gnuhealth_conf_diet_therapeutic" parent="health_lifestyle.gnuhealth_conf_diets"
+            icon="gnuhealth-list"/>
+
 <!-- Form view for the Inpatient diet -->
 
         <record id="gnuhealth_inpatient_diet_form" model="ir.ui.view">
@@ -191,6 +280,146 @@
         </record>
 
 
+
+<!-- SECTION FOR HOSPITALIZATION MEALS-->
+
+
+<!-- Form view related to meals -->
+
+        <record id="gnuhealth_inpatient_meal_form" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_inpatient_meal_form</field>
+        </record>
+
+<!-- Tree view for the meals -->
+
+        <record id="gnuhealth_inpatient_meal_tree" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_inpatient_meal_tree</field>
+        </record>
+
+<!-- Add Inpatient Meal to configuration menu -->
+
+        <record model="ir.action.act_window" id="gnuhealth_action_inpatient_meal">
+            <field name="name">Inpatient Meal</field>
+            <field name="res_model">gnuhealth.inpatient.meal</field>
+        </record>
+
+        <record model="ir.action.act_window.view" id="act_inpatient_meal_list_view">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="gnuhealth_inpatient_meal_tree"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_inpatient_meal_form_view">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="gnuhealth_inpatient_meal_form"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal"/>
+        </record>
+
+        <menuitem name="Inpatient Meals" action="gnuhealth_action_inpatient_meal"
+            id="gnuhealth_conf_inpatient_meal" parent="health.gnuhealth_conf_misc"
+            icon="icon-meals"/>
+
+
+
+<!-- MEAL ORDERS -->
+
+<!-- Form view related to meal orders-->
+
+        <record id="gnuhealth_inpatient_meal_order_form" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal.order</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_inpatient_meal_order_form</field>
+        </record>
+
+<!-- Tree view for the meal orders -->
+
+        <record id="gnuhealth_inpatient_meal_order_tree" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal.order</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_inpatient_meal_order_tree</field>
+        </record>
+
+<!-- Add Inpatient Meal Orders to configuration menu -->
+
+        <record model="ir.action.act_window" id="gnuhealth_action_inpatient_meal_order">
+            <field name="name">Meal Orders</field>
+            <field name="res_model">gnuhealth.inpatient.meal.order</field>
+        </record>
+
+        <record model="ir.action.act_window.view" id="act_inpatient_meal_order_list_view">
+            <field name="sequence" eval="10"/>
+            <field name="view" ref="gnuhealth_inpatient_meal_order_tree"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+        <record model="ir.action.act_window.view" id="act_inpatient_meal_order_form_view">
+            <field name="sequence" eval="20"/>
+            <field name="view" ref="gnuhealth_inpatient_meal_order_form"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+
+
+<!-- DOMAIN WINDOWS -->
+
+        <record model="ir.action.act_window.domain" id="act_inpatient_meal_order_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="10"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_inpatient_meal_order_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="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_inpatient_meal_order_domain_ordered">
+            <field name="name">Ordered</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('state', '=', 'ordered')]" pyson="1"/>
+            <field name="act_window" ref="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+
+        <record model="ir.action.act_window.domain" id="act_inpatient_meal_order_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="gnuhealth_action_inpatient_meal_order"/>
+        </record>
+
+
+        <menuitem name="Meal Orders" action="gnuhealth_action_inpatient_meal_order"
+            id="gnuhealth_inpatient_meal_order" parent="gnuhealth_inpatient_menu"
+            icon="icon-meals"/>
+
+
+
+<!-- MEAL ORDERS ITEMS -->
+
+<!-- Form view related to meal order item -->
+
+        <record id="gnuhealth_inpatient_meal_order_item_form" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal.order.item</field>
+            <field name="type">form</field>
+            <field name="name">gnuhealth_inpatient_meal_order_item_form</field>
+        </record>
+
+<!-- Tree view for the meal order item -->
+
+        <record id="gnuhealth_inpatient_meal_order_item_tree" model="ir.ui.view">
+            <field name="model">gnuhealth.inpatient.meal.order.item</field>
+            <field name="type">tree</field>
+            <field name="name">gnuhealth_inpatient_meal_order_item_tree</field>
+        </record>
+
+
+
+
+
+
 <!-- Bed transfer history -->
 
         <record id="gnuhealth_bed_transfer_form" model="ir.ui.view">
diff --git a/icons/meals.svg b/icons/meals.svg
new file mode 100644
index 0000000..3319e25
--- /dev/null
+++ b/icons/meals.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="97px" height="97px" viewBox="0 0 97 97" enable-background="new 0 0 97 97" xml:space="preserve">
+<g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-105.9487" y1="248.0742" x2="-69.9409" y2="248.0742" gradientTransform="matrix(1 0 0 -1 114.9448 296.7246)">
+			<stop  offset="0" style="stop-color:#F1D0A0"/>
+			<stop  offset="1" style="stop-color:#D88622"/>
+		</linearGradient>
+		
+			<path fill="url(#SVGID_1_)" stroke="#4A8189" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="22.9256" d="
+			M24.008,1.446c4.231-0.873,8.767,0.255,12.191,2.57c3.514,2.378,6.024,5.828,7.389,9.553c2.58,6.861,1.645,14.81-2.896,20.856
+			c-1.782,2.407-4.239,4.393-7.087,5.749c-0.004,16.605,0.016,33.214-0.007,49.823c0.062,2.354-1.516,4.663-3.931,5.63
+			c-2.432,1.048-5.523,0.478-7.351-1.28c-1.402-1.22-1.96-2.998-1.927-4.702c-0.008-16.498,0-32.994-0.003-49.486
+			c-5.135-2.352-8.64-6.89-10.245-11.752c-2.14-6.389-1.288-13.601,2.586-19.33C15.224,5.386,19.219,2.354,24.008,1.446z"/>
+	</g>
+</g>
+<g>
+	
+		<path fill="#81BBC1" stroke="#498088" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="22.9256" d="
+		M55.155,3.577c0.004-1.833,2.745-3.032,4.547-2.096c1.226,0.536,1.762,1.76,1.692,2.887c0,6.642-0.011,13.28,0.002,19.92
+		c1.831,0.003,3.671,0.003,5.498,0.003c-0.003-6.766,0.01-13.536-0.003-20.31c-0.115-1.495,1.447-2.913,3.223-2.817
+		c1.678,0.008,3.113,1.362,3.086,2.78c0.052,6.778,0.007,13.564,0.021,20.346c1.827,0.003,3.662,0.003,5.492-0.007
+		c0.038-6.873-0.03-13.748,0.03-20.622c-0.003-1.851,2.676-3.141,4.541-2.189c1.266,0.522,1.815,1.757,1.699,2.902
+		c-0.015,7.35,0,14.7-0.005,22.049c-0.043,2.617,0.271,5.309-0.753,7.832c-1.057,3.176-3.767,5.901-7.346,7.2
+		c-0.021,16.296-0.002,32.594-0.002,48.891c0.034,2.271-1.745,4.404-4.16,5.281c-4.402,1.867-9.949-1.543-9.575-5.659
+		c0-16.274,0-32.554,0-48.825c-5.139-2.228-8.147-7.196-8.021-12.04C55.159,20.593,55.099,12.086,55.155,3.577z"/>
+</g>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-93.2798" y1="265.5059" x2="-82.1619" y2="284.7627" gradientTransform="matrix(1 0 0 -1 114.9448 296.7246)">
+	<stop  offset="0" style="stop-color:#EBBD76"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<ellipse fill="url(#SVGID_2_)" cx="27.225" cy="21.588" rx="10.835" ry="13.296"/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-44.2485" y1="269.7783" x2="-44.2485" y2="260.2917" gradientTransform="matrix(1 0 0 -1 114.9448 296.7246)">
+	<stop  offset="0" style="stop-color:#81BBC1"/>
+	<stop  offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path fill="url(#SVGID_3_)" d="M79.93,29.628l0.009-2.067l-18.498,0l-0.009,2.026h0.036c-0.022,0.186-0.035,0.371-0.036,0.561
+	c-0.013,3.64,4.124,6.601,9.24,6.611c5.114,0.011,9.274-2.93,9.289-6.571C79.961,29.999,79.95,29.813,79.93,29.628L79.93,29.628z"/>
+<path opacity="0.9" fill="none" stroke="#F6F6F6" stroke-width="3.1456" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" enable-background="new    " d="
+	M27.83,42.614c0,0,0.104,32.924,0,42.995c-0.021,2.053,0.87,5.378-2.424,4.549"/>
+<path fill="none" stroke="#F6F6F6" stroke-width="3.1353" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
+	M70.807,42.617c0,0,0.101,32.924,0,42.994c-0.022,2.053,0.862,5.378-2.409,4.549"/>
+</svg>
\ No newline at end of file
diff --git a/locale/fr_FR.po b/locale/ar.po
similarity index 51%
copy from locale/fr_FR.po
copy to locale/ar.po
index 96806b1..4bd0d4b 100644
--- a/locale/fr_FR.po
+++ b/locale/ar.po
@@ -1,309 +1,437 @@
-# 
-# Translators:
-# Emmanuel Simond, 2014
-# Eriam Schaffter <eriam at mediavirtuel.com>, 2012
-# Eric Vernichon <eric at vernichon.fr>, 2011
-# gestionRessources <klinik_mailinglist at gestion-ressources.com>, 2011
-# Mathieu Anquetin <mathieu at anquetin.eu>, 2013
-# fnonga <nonga.fabien at orange.fr>, 2014
-# rootio <david at vmail.me>, 2013
+# 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: 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"
+"PO-Revision-Date: 2016-01-08 12:18+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: fr_FR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\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: 1452255536.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "Le lit de destination n'est pas disponible"
+msgstr "سرير الوجهة غير متوفر"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "Vous avez choisi plus de 1 enregistrement. Prière d'en choisir un seul"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "Ce code de régime existe déjà"
+msgstr "لقد إخترت أكثر من 1 نتائج. الرجاء اختيار واحد فقط"
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "Ce code de régime existe déjà"
+msgstr "رمز النظام الغذائي موجود بالفعل"
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "Pas de professionnel de santé associé à l'utilisateur"
+msgstr "لا خبير صحي مرتبط بهذا المستخدم"
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "Lit indisponible"
+msgstr "السرير غير متوفر"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "Le lit de destination n'est pas disponible"
+msgstr "الوجهة السرير غير متاح"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "Ce code d'enregistrement existe déjà"
+msgstr "رمز التسجيل موجود بالفعل"
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr "تسجيل المرضى الداخليين"
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "De"
+msgstr "من"
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "A"
+msgstr "إلى"
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr "رمز التسجيل "
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "Motif"
+msgstr "سبب"
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "Date"
+msgstr "تاريخ"
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "Nouveau lit"
+msgstr "سرير جديد"
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "Motif"
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Code"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Date de création"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Utilisateur qui a crée"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Croyance"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Date d'écriture"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "سبب"
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "Code"
+msgstr "الرمز"
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "Indications"
+msgstr "دواعي الإستعمال "
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "Type de régime"
+msgstr "نوع النظام الغذائي"
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "Régime"
+msgstr "النظام الغذائي"
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr "رمز التسجيل "
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "Remarques / Directives"
+msgstr "تصريحات / الاتجاهات"
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "Heures d'administration"
+msgstr "وقت  الإشراف"
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "Effets indésirables"
+msgstr "ردود الفعل السلبية"
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "Fréquence"
+msgstr "التكرار"
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "Cours Terminé"
+msgstr "مجموعة الجرعات اكتملت"
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "Interrompu"
+msgstr "متوقف"
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "Raison de l'arrêt"
+msgstr "سبب التوقف"
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr "الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr "وحدة الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "Fin"
+msgstr "انهاء"
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "Forme"
+msgstr "الشكل"
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "Fréquence"
+msgstr "التكرار"
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "le cas échéant (pro re nata)"
+msgstr "PRN"
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "l'unité"
+msgstr "وحدة"
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "Indication"
+msgstr "دواعي الإستعمال"
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "Actif"
+msgstr "نشط"
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "Historique"
+msgstr "سجل التاريخ"
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "Médicament"
+msgstr "الدواء"
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr "رمز التسجيل "
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
@@ -311,159 +439,159 @@ msgstr "x"
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "Voie d'administration"
+msgstr "إدارة المسار"
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "Début"
+msgstr "بدء"
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "Heure"
+msgstr "الوقت"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr "الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr "وحدة الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "Médicaments"
+msgstr "الادويه"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "Remarques"
+msgstr "الملاحظات"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "Date"
+msgstr "تاريخ"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات "
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr "الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr "وحدة الجرعة"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "Professionnel de santé"
+msgstr "الصحة المهنية"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "Médicaments"
+msgstr "الادويه"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "Remarques"
+msgstr "الملاحظات"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motif d'admission"
+msgstr "سبب القبول والتسجيل"
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "Type d'admission"
+msgstr "نوع القبول والتسجيل"
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "Médecin traitant"
+msgstr "الطبيب الحاضر"
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "Lit hospitalier"
+msgstr "سرير في المستشفى"
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "Historique des transferts"
+msgstr "تاريخ الإنتقالات"
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr "أنشئ معلومات"
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "Créer utilisateur"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Croyance"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Végétarien"
+msgstr "إنشاء مستخدم"
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "Date de sortie prévue"
+msgstr "من المتوقع تفريغ السجل"
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "Plan de sortie"
+msgstr "خطة التسديد"
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
@@ -471,291 +599,265 @@ msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "Date d'hospitalisation"
+msgstr "تاريخ دخول المستشفى"
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "المُعرّف"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Info extra."
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "Institution"
+msgstr "مؤسسة"
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "Medications"
+msgstr "الأدوية"
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr "رمز التسجيل"
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "Plan de soins"
+msgstr "خطة التمريض"
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "Notes / Directives nutritionnelles"
+msgstr "ملاحظة التغذية / الاتجاهات"
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "Médecin référant"
+msgstr "الطبيب العامل"
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "Patient"
+msgstr "المريض"
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr "الاسم"
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "Statut"
+msgstr "الوضع"
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr ""
+msgstr "نظام الحمية"
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "Inscrivez date"
+msgstr "كتابة معلومات"
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "Inscrivez utilisateur"
+msgstr "كتابة مستخدم"
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "Séquence patient"
+msgstr "تسلسل المرضى الداخليين"
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "Entrez le code d'hospitalisation du patient"
+msgstr "أدخل رمز إقامة المريض في المستشفى"
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "Remarques spécifiques pour ce régime / patient"
+msgstr "تصريحات محددة لهذا النظام الغذائي / المريض"
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "Effets secondaires ou effets indésirables que le patient a éprouvé"
+msgstr "الآثار الجانبية أو ردود الفعل العكسية التي حدثت للمريض"
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "Fréquence de dosage commune / standard pour ce médicament"
+msgstr "الشائع / تواتر الجرعة القياسية لهذا الدواء"
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "Brève description pour l'interruption du traitement"
+msgstr "وصف مختصر لسبب  وقف العلاج"
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr "كمية الدواء (على سبيل المثال ، 250 ملغ) في الجرعة الواحدة"
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr "وحدة القياس للأدوية التي يجب اتخاذها"
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "Date de début de traitement"
+msgstr "تاريخ بدء العلاج"
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "Forme du médicaments, tels que comprimés ou gel"
+msgstr "شكل الدواء ، مثل قرص أو هلام"
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Temps d'attente entre les doses au patient (c'est à dire, pour une pilule chaque huit heures, mettez ici 8 et sélectionnez \"heure\" dans le domaine de l'unité)"
+msgstr ""
+"الوقت الواجب على المريض انتظاره بين الجرعات (مثلا, من أجل حبة دواء واحدة كل "
+"8 ساعات, ضع هنا 8 و اختر \"ساعات\" في حقل الوحدة "
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "Utilisez si nécessaire, pro re nata"
+msgstr "استخدامه حسب الحاجة، حسب الظروف"
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Choisissez une maladie pour ce médicament parmi la liste des maladies. Elle peut être une maladie existante du patient ou de prophylaxie."
+msgstr ""
+"اختر مرض لهذا الدواء من قائمة الأمراض. يمكن ان يكون مرض موجود عند المريض أو "
+"وقائي"
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "Cochez cette case si le patient est actuellement sous traitement par ce médicament"
+msgstr "حدد  إذا كان المريض يأخذ الدواء في الوقت الراهن"
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "Medicament Prescrit"
+msgstr "الدواء الموصوف"
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "Quantité d'unités (par exemple, 2 gélules) du médicament"
+msgstr "كمية  الوحدات (على سبيل المثال ، 2 كبسولة) من الدواء"
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "Code de voie d'administration du médicament."
+msgstr "رمز مسار إعطاء الدواء"
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "Date de début de traitement"
+msgstr "تاريخ بدء العلاج"
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr "كمية الدواء (على سبيل المثال ، 250 ملغ) في الجرعة الواحدة"
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr "وحدة القياس للأدوية التي يجب اتخاذها"
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "Remarques spécifiques pour ce dosage"
+msgstr "تصريحات محددة لهذه الجرعة"
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr "كمية الدواء (على سبيل المثال ، 250 ملغ) في الجرعة الواحدة"
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr "وحدة القياس للأدوية التي يجب اتخاذها"
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "Remarques spécifiques pour ce dosage"
+msgstr "تصريحات محددة لهذه الجرعة"
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motif d'admission"
+msgstr "سبب القبول"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Entrer la croyance ou la religion du patient pour choisir le régime approprié"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "Transferts de lit"
+msgstr "نقل السرير"
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "Initialiser le transfert de lit"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Même si le Bouddhisme ne définit pas de règles alimentaires spécifiques, certains bouddhistes sont végétariens en raison d'un interprétation stricte des Cinq Principes"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Un régime basé sur la croyance de ce qui aurait été consommé par Adam et Eve dans le Jardin d'Eden. Régulièrement soit végétarien, soit végan et principalement composé de fruits"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Régime Hallelujah : Une forme de végétarisme chrétien développé dans les années 70. Leurs créateurs interprètent un verset de la Bible comme suggérant que les chrétiens ne devraient consommer que des plantes à graines et des fruits."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Régimes hindous et jaïns : Les pratiquants de l'hindouisme et du jaïnisme suivent souvent un régime lacto-végétarien en application du principe d'Ahimsâ (non-violence)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Les musulmans suivent un régime uniquement composé de nourriture dite halal - autorisée par la loi islamique. L'opposé de halal est haraam, une nourriture interdite par l'Islam. Les denrées haraam incluent l'alcool, le porc et toutes la viande issue d'un animal qui n'aurait pas été abattu selon les méthodes islamiques de sacrifice rituel (Dhabiba)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal : Un ensemble de principes qui influence le régime de nombreux membre du mouvement Rastafari. Un de ces principes est la consommation de nourriture naturelle. Certains rastafariens interprètent l'I-tal pour promouvoir le végétarisme ou le véganisme"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Régime kacher : La nourriture autorisée par la cacherout, l'ensemble des lois alimentaires juives, est dite kacher. Certains aliments ou préparations sont non-kacher et l'impossibilité de préparer un aliment en respectant la cacherout peut rendre celui-ci non-kasher."
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Régime religieux"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Bouddhiste"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edénique"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Hallelujah"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Hindou"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Musulman"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Cachère"
+msgstr "إنشاء تحويل سرير التهيئة"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Utilisé dans le traitement des affections caractérisées par œdème, y compris ce qui suit: cirrhose du \nfoie avec ascite, Insuffisance Cardiaque Congestive - ICC, hypertension artérielle essentielle et les maladies rénales."
+msgstr ""
+"المستخدمة في علاج الحالات التي تتميز ذمة، بما في ذلك ما يلي: تليف ⏎\n"
+"الكبد مع استسقاء، وفشل القلب المكتظة - CHF، ارتفاع ضغط الدم الأساسي ومرض "
+"كلوي."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "Le régime elimine les aliments et condiments assaisonnés qui peuvent stimuler un inconfort gastrique et RGO"
+msgstr ""
+"النظام الغذائي يلغي الأطعمة والبهارات محنك التي قد تحفز عدم الراحة في المعدة "
+"وارتجاع المريء"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Fournit des quantités contrôlées de sodium, cholestérol, graisses saturées et totale"
+msgstr "يوفر كميات محددة من الصوديوم والكولسترول والدهون المشبعة والمشاركات"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -763,45 +865,61 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/jour. Le régime fournit des quantités constantes de glucides en fonction du niveau calorique pour permettre le contrôle de la glycémie optimale. La dièt offre une collation au coucher pour tous les niveaux de calories. (45% glucides, 25% protéines, 30% matière grasse)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/jour. Le régime fournit des quantités constantes de glucides en fonction du niveau calorique pour permettre le contrôle de la glycémie optimale. Des collations entre les repas pour fournir environ 35-40% de Kcal de glucides."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "Le régime est indiqué pour une utilisation à court terme quand une maladie aiguë ou une intervention chirurgicale provoque une intolérance à la nourriture; ou pour restreindre temporairement le matériau non digérés dans le tractus gastro-intestinal. Le régime n'est pas nutritionnellement adéquate."
+msgstr ""
+"يشار إلى النظام الغذائي للاستخدام على المدى القصير كلما مرض حاد أو الجراحة "
+"تسبب التعصب في الغذاء، أو لتقييد مؤقتا المواد غير مهضوم في الجهاز الهضمي. "
+"النظام الغذائي ليست كافية من الناحية التغذوية."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Alimentation liquide à base de produits sans sucre ( sans sucre concentré). Ce"
+msgstr ""
+"منتجات clear حمية سائلة توفير خالية من السكر فقط (وليس السكر المركزة). هذا "
+"النظام الغذائي يوفر كميات محدودة جدا من الكربوهيدرات."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
 msgstr ""
+"تغيير ميكانيكيا. هي الأرض اللحوم أو مفروم. الأطعمة هي رطبة وناعمة مزخرفة، "
+"وشكلت بسهولة في البلعة. جميع الخضروات ⏎\n"
+"هي شوكة-ماشابل. يجب أن يكون أمر السوائل بشكل منفصل كما العادية، رحيق، أو "
+"العسل."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
 msgstr ""
+"هي الأطعمة القوام العادية تقريبا مع استثناء من الصعب، لزجة، أو مقدد الأطعمة. "
+"الأطعمة هي رطبة قطعة، لدغة الحجم. جميع ⏎\n"
+"الخضروات هي شوكة-ماشابل. يجب أن يكون أمر السوائل بشكل منفصل كما العادية، "
+"رحيق، أو العسل."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
 msgstr ""
+"للمرضى الذين يعانون من مشاكل المضغ والبلع أو التهاب المريء أو دوالي. يتم "
+"مزجه الاتساق الغذاء. يجب أن يكون أمر السوائل ⏎\n"
+"بشكل منفصل العادية، رحيق، أو العسل."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -810,18 +928,25 @@ msgid ""
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
 msgstr ""
+"النظام الغذائي يوفر لطيف، درجة حرارة الغرفة أو الأطعمة الباردة في فصل المواد "
+"الصلبة والسوائل. المرضى على هذا النظام الغذائي قد طلب الأطعمة الإضافية التي "
+"يشعر يمكن السكوت عليها. ويتم تشجيع المرضى لفصل استهلاكهم من الطعام والشراب"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
 msgstr ""
+"وأشار للمرضى الذين قد لا تكون قادرة على استخدام أواني أو للمرضى محصورة في "
+"موقف الاستلقاء الذين يحتاجون إلى أطعمة صحية في القلب."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
 msgstr ""
+"وكثيرا ما يستخدم هذا النظام الغذائي لGYN المرضى لعمليات جراحية. يقدم الأطعمة "
+"مثل الحساء غير كريم أساس، جيلو، عصير، حليب lactaid والشاي والقهوة"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
@@ -829,164 +954,179 @@ msgid ""
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
 msgstr ""
+"النظام الغذائي يتكون من الأطعمة التي تكون سائلة في درجة حرارة الجسم. الأطعمة "
+"سهلة الهضم وتوفير الحد الأدنى من التحفيز على الجهاز الهضمي. النظام الغذائي "
+"ليست كافية من الناحية التغذوية."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "Liquides sans sucre"
+msgstr "السوائل الخالية من السكر"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "Facile à digérer, aliments semi-liquides à consommer en petites quantités."
+msgstr "هضمها بسهولة، والأطعمة شبه السائلة إلى أن تستهلك بكميات صغيرة."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "Aliments mous ou en purée qui sont faciles à mâcher et à digérer"
+msgstr "الأطعمة اللينة أو المهروسة التي هي سهلة لمضغ وهضم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "Aliments mous comme par exemple des légumes cuits et de la viande tendre ou hachée"
+msgstr "الأطعمة اللينة مثل الخضار المطبوخة واللحوم لينة أو الأرض"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr ""
+msgstr "الأطعمة اللينة مثل الخضار المطبوخة واللحوم لينة أو الأرض"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
 msgstr ""
+"النظام الغذائي يغفل الأطعمة المصنعة مع الغلوتين. النظام الغذائي هو الوسيلة "
+"الأساسية لعلاج الاضطرابات الهضمية ذرب"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "Fournit moins de 30% d'énergie provenant des lipides."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "Pour les patients qui ont des difficultés à mâcher ou à avaler"
+msgstr "بالنسبة للمرضى الذين لديهم صعوبة في المضغ أو البلع"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
 msgstr ""
+"4 غرام الصوديوم. يوفر تقييد الصوديوم المعتدلة من خلال القضاء على الأطعمة "
+"والبهارات نسبة عالية من الصوديوم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "Le régime élimine certains aliments afin de fournir un niveau inférieur de bactéries que ce qui est présent dans un régime typique d'hôpital."
+msgstr ""
+"4 غرام الصوديوم. يوفر تقييد الصوديوم المعتدلة من خلال القضاء على الأطعمة "
+"والبهارات نسبة عالية من الصوديوم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr ""
+msgstr "النيل في نظام التشغيل. حجب الطعام عن طريق الفم والسوائل من المريض"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Aliment à faible teneur en sucre, lipide, et lactose. Pas de liquides avec le repas. Snacks réguliers."
+msgstr ""
+"انخفاض نسبة السكر والدهون منخفضة، والأطعمة منخفضة اللاكتوز. لا السوائل مع "
+"وجبات الطعام. رضعات صغيرة متكررة"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
 msgstr ""
+"يوفر كميات محدودة من البروتين (40-60G / د) والبوتاسيوم (2G / د)، والصوديوم "
+"(2G / د) بالنسبة للمريض قبل مدال."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "Aucune modification du régime alimentaire nécessaire"
+msgstr "أي تعديلات الغذائية اللازمة"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
 msgstr ""
+"يوفر كافية من البروتين (80 - 100G / د) وكميات محدودة من البوتاسيوم (2G) "
+"والصوديوم (2G) للمريض مدال."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "Le régime se compose de 6 petits repas par jour"
+msgstr "النظام الغذائي يوفر 6 وجبات صغيرة يوميا"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr ""
+msgstr "الأطعمة لطيف لينة التي تحتوي على محتوى منخفض الألياف. اللاكتوز محدودة."
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "Thérapie Diététique"
+msgstr "الحمية العلاج"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 gr Sodium"
+msgstr "2 غرام صوديوم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "fade"
+msgstr "لطيف"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "Cardiaque"
+msgstr "القلب"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr ""
+msgstr "الكربوهيدرات متسقة"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr ""
+msgstr "حمية السكري الحملي"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "Liquide Clair"
+msgstr "واضح السائل"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "Liquide Clair / Pas de sucre concentrés"
+msgstr "واضح السائل / NCS"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "Dysphagie Altérée"
+msgstr "تعديل عسر البلع "
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "Dysphagie Avancée"
+msgstr "عسر البلع المتقدم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "Dysphagie Purée"
+msgstr "عسر البلع معجون"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "Hyperemesis"
+msgstr "التقيء"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "Nourriture à la main"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "Seulement du liquide sans lactose"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "Seulement du liquide"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "Bypass Gastrique Étape 1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "Bypass Gastrique Étape 2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "Bypass Gastrique Étape 3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "Bypass Gastrique Étape 4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
@@ -994,59 +1134,71 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "Sans Gluten"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "Pauvre en matières grasses"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "Moux à macher"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "Sans sucre ajouté - SSA"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "Neutropénique"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "Rien par voie orale / RPVO"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "Post-Gastrectomie"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "PRERENALE"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "Normal"
+msgstr "منتظم"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "RENAL"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "Petits Repas Fréquents"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "Chirurgicale faible teneur en lactose"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "Diét Patient Hospitalisé"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "Médication Patient Hospitalisé"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
@@ -1054,280 +1206,305 @@ msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "Historique Médication Patient Hospitalisé"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "Historique d'admission du patient"
+msgstr "سجل قبول المريض"
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "Transfer Lit"
+msgstr "نقل سريري"
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "Hospitalisations"
+msgstr "المستشفيات"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr "تسجيل المرضى الداخليين"
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr "تسجيل المرضى الداخليين"
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "Hospitalisations"
+msgstr "سجل الإقامات في المشفى"
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "Administration des patients"
+msgstr "الإدارة الصحية للمرضى المقيمين"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "jours"
+msgstr "ايام"
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "heures"
+msgstr "ساعات"
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "minutes"
+msgstr "دقائق"
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "secondes"
+msgstr "ثانية"
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "semaine"
+msgstr "أسبوع"
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "lorsque requis"
+msgstr "عند الحاجة"
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "Électif"
+msgstr "اختياري"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "Urgence"
+msgstr "الطوارئ"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "Maternité"
+msgstr "الأمومة"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "Routine"
+msgstr "روتين"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "Urgence"
+msgstr "مٌستعجل"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Lacto végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Lacto-ovo végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Aucun"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Végétalien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Fait"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "annulé"
+msgstr "إلغاء"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "confirmé"
+msgstr "مؤكَّد"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "libre"
+msgstr "حر"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "hospitalisé"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Patient Transfert Lit"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Historique Transfert Lit"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Diét Description"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Régime lié à des croyances"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Thérapeutique Diét"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Diét Description et Indications"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Thérapeutique Diét"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Diét Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr ""
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Historique Médication Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Administration"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Effets indésirables et observations"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Dosage"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Info extra."
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Informations Générales"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Médication Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Médicaments"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Statut"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Période du traitement"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Données administratives"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Admission"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Admettez le patient dans l'institution et assignez le lit"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Annulé"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Annulé enregistrement"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "Annuler le processus d'enregistrement du patient ?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Plan de soins"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confirmez"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confirmez enregistrement / effectuez la réservation"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Sortie"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Sortie patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Info enregistrement du patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Info enregistrement du patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr ""
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrition"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Autres notes nutritionnelle / directions"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Admission patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr ""
+msgstr "نزيل في المشفى"
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "Transfert Patient"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "Annuler "
+msgstr "إلغاء"
diff --git a/locale/zh_CN.po b/locale/de_AT.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/de_AT.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/de_AT.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/el_GR.po b/locale/el_GR.po
index 2cbaeee..3dd52ba 100644
--- a/locale/el_GR.po
+++ b/locale/el_GR.po
@@ -1,21 +1,14 @@
-# 
-# Translators:
-# kvisitor <kvisitor at gnugr.org>, 2013-2014
-# kvisitor <kvisitor at gnugr.org>, 2011, 2012
-# Vassilis Perantzakis <vaspervnp at yahoo.gr>, 2015
+# 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-29 16:51+0000\n"
-"Last-Translator: Vassilis Perantzakis <vaspervnp at yahoo.gr>\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: 1452445397.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -25,19 +18,41 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "Επιλέξατε περισσότερους από έναν φάκελο. Παρακαλώ επιλέξτε μόνον έναν"
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "Ο κωδικός δίαιτας υπάρχει ήδη"
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
 msgstr "Ο κωδικός δίαιτας υπάρχει ήδη"
 
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
+
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "Δεν υπάρχει συσχετισμένος επαγγελματίας υγείας με αυτόν τον χρήστη"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
 msgstr "Η κλίνη δεν είναι διαθέσιμη"
 
@@ -49,6 +64,10 @@ msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
 msgstr "Ο κωδικός εγγραφής ήδη υπάρχει"
 
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
+
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
 msgstr "Εγγραφή εσωτερικού ασθενούς"
@@ -105,46 +124,14 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "Νέα κλίνη"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "Αιτία"
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Κωδικός"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Δημιουργία ημερομηνίας"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Δημιουργία χρήστη"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Περιγραφή"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Θρησκευτικές Πεποιθήσεις"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Όνομα"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Γράψτε την Ημερομηνία"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Γράψτε τον χρήστη"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "Κωδικός"
@@ -217,6 +204,150 @@ msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
 msgstr "Γράψτε τον χρήστη"
 
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
 msgstr "Διοικητικοί χρόνοι"
@@ -445,22 +576,22 @@ msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
 msgstr "Δημιουργία χρήστη"
 
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Θρησκευτικές Πεποιθήσεις"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Χορτοφάγος"
-
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "Αναμενόμενη ημερομ. εξιτηρίου"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
 msgstr "Πλάνο εξιτηρίου"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
 msgstr "Πήρε εξιτήριο από"
@@ -474,8 +605,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Πρόσθετες πληροφορίες"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -505,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "Ασθενής"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "Όνομα"
@@ -529,6 +664,18 @@ msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr "Νοσηλευόμενος"
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "Σειρά εσωτερικών ασθενών"
@@ -541,6 +688,22 @@ msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
 msgstr "ειδκές παρατηρήσεις για αυτή τη δίαιτα / αυτόν τον ασθενή"
 
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
+
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
 msgstr "Παρενέργειες που υπέστη ο ασθενής"
@@ -573,7 +736,10 @@ msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Χρονικό διάστημα ανάμεσα στις δόσεις, που ο ασθενής πρέπει να περιμένει (πχ, για 1 χάπι κάθε 8 ώρες, βάλτε εδώ το 8 και, στο πεδίο των μονάδων, επιλέξτε \"ώρες\""
+msgstr ""
+"Χρονικό διάστημα ανάμεσα στις δόσεις, που ο ασθενής πρέπει να περιμένει (πχ, "
+"για 1 χάπι κάθε 8 ώρες, βάλτε εδώ το 8 και, στο πεδίο των μονάδων, επιλέξτε "
+"\"ώρες\""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
@@ -583,7 +749,10 @@ msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Από τον κατάλογο ασθενειών, επιλέξτε μία ασθένεια για το φάρμακο αυτό. Μπορεί να είναι κάποιο προϋπάρχον νόσημα του ασθενούς, ή ακόμη και προφυλακτικό."
+msgstr ""
+"Από τον κατάλογο ασθενειών, επιλέξτε μία ασθένεια για το φάρμακο αυτό. "
+"Μπορεί να είναι κάποιο προϋπάρχον νόσημα του ασθενούς, ή ακόμη και "
+"προφυλακτικό."
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
@@ -633,19 +802,34 @@ msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
 msgstr "Αιτία εισαγωγής"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Εισάγετε τις πεποιθήσεις ή τη θρησκεία του ασθενούς για την επιλογή της κατάλληλης δίαιτας"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr "Επαγγελματίας υγείας που έδωσε εξιτήριο στον ασθενή"
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr "Προβολή της κατάστασης νοσηλείας του ασθενούς"
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
 msgstr "Μεταφορές κλίνης"
@@ -654,104 +838,30 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "Δημιουργία Init για Μεταφορά Κλίνης"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Αν και ο Βουδισμός δεν προβλέπει ειδικούς διατροφικούς κανόνες, μερικοί Βουδιστές ασκούν μια Φυτοφαγία που βασίζεται σε μια αυστηρή ερμηνεία του πρώτης από τις Πέντε Εντολές"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Μία δίαιτα που βασίζεται σε όσα κατανάλωναν ο Αδάμ και η Εύα στον Κήπο της Εδέμ. Συνήθως, είτε Φυτοφαγική, είτε Βέγκαν, και που βασίζεται κυρίως στα φρούτα."
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Δίαιτα Αλληλούια: μια μορφή Χριστιανικής Φυτοφαγίας που αναπτύχθηκε κατά τη δεκαετία του 70. Σύμφωνα με τους δημιουργούς της, η ερμηνεία ενός εδαφίου της Βίβλου σημαίνει πως οι Χριστιανοί θα έπρεπε να τρώνε μόνον φυτά που έχουν σπόρους και φρούτα."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Ινδουιστική και Τζαϊνική Δίαιτα : Οι οπαδοί του Ινδουισμού και του Τζαϊνισμού ακολουθούν συχνά γαλακτο-φυτοφάγες/lacto-vegetarian δίαιτες, οι οποίες βασίζονται στην αρχή του μη βλάπτειν (Ahisma)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Οι Μουσουλμάνοι ακολουθούν μι δίιτ που συνίστται μόνο σε τροφή χαλάλ - επιτρεπτή από τον ισλαμικό νόμο. Το αντίθετο του χαλάλ είναι το χαράαμ, δηλαδή τροφή που είναι ισλαμικά απαράδεκτη. Οι ουσίες χαράαμ περιλαμβάνουν το οινόπνευμα, το χοιρινό και οποιοδήποτε κρέας από ζώο που δεν σφάχτηκε σύμφωνα με την Ισλαμική μέθοδο της τελετουργικής σφαγής (Dhabibha)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal: Ένα σύνολο αρχών που επηρρεάζουν την δίαιτα πολλών μελών του κινήματος Rastafari. Μία αρχή λέει ότι θα πρέπει να καταναλώνονται φυσικές τροφές. Μερικοί Rastafarians θεωρούν ότι το I-tal υποστηρίζει τη φυτοφαγία ή τον Βεγκανισμό"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Δίαιτα Κόσερ: Οι τροφές που επιτρέπονται από το Κάσρουτ, το σύνολο τωνΕβραϊκών διαιτητικών νόμων, ονομάζονται Κόσερ. Μερικές τροφές ή συνδυασμοί τροφών δεν είναι Κόσερ και η μη παρασκευή τροφής σύμφωνα με το Κάσρουτ μπορεί να κάνει κάποιες, κατά τα άλλα αποδεκτές τροφές, μη-Κόσερ."
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Δίαιτα ανά πεποίθηση"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Βουδιστής"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Εδεμική"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Αλληλούια"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Ινδουιστής"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Μουσουλμάνος"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Εβραίος/ Κόσερ"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Χρησιμοποιείται στη θεραπεία καταστάσεων που χαρακτηρίζονται από οίδημα και περιλαμβάνει τα εξής: κίρρωση του\nήπατος με ασκίτη, Συμφορητική καρδιακή ανεπάρκεια - Ιδιοπαθή υπέρταση και Νεφρική νόσο."
+msgstr ""
+"Χρησιμοποιείται στη θεραπεία καταστάσεων που χαρακτηρίζονται από οίδημα και "
+"περιλαμβάνει τα εξής: κίρρωση του\n"
+"ήπατος με ασκίτη, Συμφορητική καρδιακή ανεπάρκεια - Ιδιοπαθή υπέρταση και "
+"Νεφρική νόσο."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "Η δίαιτα αποκλείει συντηρημένες τροφές και καρυκεύματα που μπορούν να προκαλέσουν γαστρικό ερεθισμό και ΓΟΠ."
+msgstr ""
+"Η δίαιτα αποκλείει συντηρημένες τροφές και καρυκεύματα που μπορούν να "
+"προκαλέσουν γαστρικό ερεθισμό και ΓΟΠ."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Προσφέρει ελεγχόμενες ποσότητες νατρίου, χοληστερίνης, κορεσμένου και συνολικού λίπους"
+msgstr ""
+"Προσφέρει ελεγχόμενες ποσότητες νατρίου, χοληστερίνης, κορεσμένου και "
+"συνολικού λίπους"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -759,45 +869,72 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/ημέρα. Η δίαιτα παρέχει μεγάλες ποσότητες υδατανθράκων, βασισμένων σε ένα επίπεδο θερμίδων για τον βέλτιστο έλεγχο της γλυκόζης αίματος. Η δίαιτα προβλέπει ένα σνακ κατά την ώρα της κατάκλισης για όλα τα επίπεδα θερμίδων. (45% CHO, 25% protein, 30% fat)"
+msgstr ""
+"1200-3000 cal/ημέρα. Η δίαιτα παρέχει μεγάλες ποσότητες υδατανθράκων, "
+"βασισμένων σε ένα επίπεδο θερμίδων για τον βέλτιστο έλεγχο της γλυκόζης "
+"αίματος. Η δίαιτα προβλέπει ένα σνακ κατά την ώρα της κατάκλισης για όλα τα "
+"επίπεδα θερμίδων. (45% CHO, 25% protein, 30% fat)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/ημέρα. Η δίαιτα παρέχει σημαντικό ποσό υδατανθράκων, βασισμένων σε ένα επίπεδο θερμίδων που επιτρέπει τον βέλτιστο έλεγχο γλυκόζης αίματος. Προβλέπονται σνακς μετξύ των γευμάτων, για να παρέχουν περίπου 35-40% of Kcal από τους CHO."
+msgstr ""
+"1800-3000 cal/ημέρα. Η δίαιτα παρέχει σημαντικό ποσό υδατανθράκων, "
+"βασισμένων σε ένα επίπεδο θερμίδων που επιτρέπει τον βέλτιστο έλεγχο "
+"γλυκόζης αίματος. Προβλέπονται σνακς μετξύ των γευμάτων, για να παρέχουν "
+"περίπου 35-40% of Kcal από τους CHO."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "Η δίαιτα ενδείκνυται για βραχυπρόθεσμη χρήση, όποτε μία οξεία νόσος ή ένα χειρουργείο προκαλεί δυσανεξία στην τροφή. Ή για τον παροδικό περιορισμό άπεπτων συστατικών στο γαστρεντερικό σύστημα. Η δίαιτα δεν είναι διατροφικά κατάλληλη."
+msgstr ""
+"Η δίαιτα ενδείκνυται για βραχυπρόθεσμη χρήση, όποτε μία οξεία νόσος ή ένα "
+"χειρουργείο προκαλεί δυσανεξία στην τροφή. Ή για τον παροδικό περιορισμό "
+"άπεπτων συστατικών στο γαστρεντερικό σύστημα. Η δίαιτα δεν είναι διατροφικά "
+"κατάλληλη."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Δίαιτα καθαρών υγρών που προβλέπει μόνον προϊόντα χωρίς ζάχαρη (Όχι συμπυκνωμένη ζάχαρη). Αυτή η δίαιτα προσφέρει πολύ περορισμένες ποσότητες υδατανθράκων."
+msgstr ""
+"Δίαιτα καθαρών υγρών που προβλέπει μόνον προϊόντα χωρίς ζάχαρη (Όχι "
+"συμπυκνωμένη ζάχαρη). Αυτή η δίαιτα προσφέρει πολύ περορισμένες ποσότητες "
+"υδατανθράκων."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Με μηχανική αλλοίωση. Τα κρέατα είναι αλεσμένα. Οι τροφές είναι υγρές, με μαλακή υφή, και μετατρέπονται εύκολα σε μπουκιές. Όλα τα χορταρικά\nμπορούν να πατηθούν με το πηρούνι. Τα υγρά πρέπει να παραγγέλλονται χωριστά, σαν κανονικό νέκταρ ή μέλι."
+msgstr ""
+"Με μηχανική αλλοίωση. Τα κρέατα είναι αλεσμένα. Οι τροφές είναι υγρές, με "
+"μαλακή υφή, και μετατρέπονται εύκολα σε μπουκιές. Όλα τα χορταρικά\n"
+"μπορούν να πατηθούν με το πηρούνι. Τα υγρά πρέπει να παραγγέλλονται χωριστά, "
+"σαν κανονικό νέκταρ ή μέλι."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Οι τροφές έχουν σχεδόν κανονική υφή, εκτός από τις σκληρές, κολλώδιες ή τραγανιστές τροφές.΄Οι τροφές είναι υγρές, σε κομματάκια μεγέθους μπουκιάς. Όλα\nτα λαχανικά και χόρτα είναι συμπιέσιμα με το πηρούνι. Τα υγρά πρέπει να παραγγέλλονται χωριστά, όπως το συνηθισμένο μέλι, ή ο βασιλικός πολτός."
+msgstr ""
+"Οι τροφές έχουν σχεδόν κανονική υφή, εκτός από τις σκληρές, κολλώδιες ή "
+"τραγανιστές τροφές.΄Οι τροφές είναι υγρές, σε κομματάκια μεγέθους μπουκιάς. "
+"Όλα\n"
+"τα λαχανικά και χόρτα είναι συμπιέσιμα με το πηρούνι. Τα υγρά πρέπει να "
+"παραγγέλλονται χωριστά, όπως το συνηθισμένο μέλι, ή ο βασιλικός πολτός."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "Για ασθενείς με προβλήματα μάσησης και κατάποσης, ή με οισοφαγίτιδα ή κιρσούς. Η τροφή έχει υφή αλεσμένου πολτού. Τα υγρά πρέπει να παραγέλλονται\nχωριστά, σαν το συνηθισμένο μέλι, ή τον βασιλικό πολτό."
+msgstr ""
+"Για ασθενείς με προβλήματα μάσησης και κατάποσης, ή με οισοφαγίτιδα ή "
+"κιρσούς. Η τροφή έχει υφή αλεσμένου πολτού. Τα υγρά πρέπει να παραγέλλονται\n"
+"χωριστά, σαν το συνηθισμένο μέλι, ή τον βασιλικό πολτό."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -805,26 +942,40 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "Η δίαιτα προσφέρεται σε ήπια θερμοκρασία δωματίου ή και υπό μορφή κρύας τροφής, σε στερεά και υγρά. Οι ασθενείς που είναι σε αυτή τη δίαιτα δικαιούται να ζητήσουν πρόσθετες τροφές που νοιώθουν ότι μπορούν να ανεχθούν. Οι ασθενείς ενθαρρύνονται να κάνουν διαχωρισμούς στην πρόσληψη της τροφής και των ποτών τους."
+msgstr ""
+"Η δίαιτα προσφέρεται σε ήπια θερμοκρασία δωματίου ή και υπό μορφή κρύας "
+"τροφής, σε στερεά και υγρά. Οι ασθενείς που είναι σε αυτή τη δίαιτα "
+"δικαιούται να ζητήσουν πρόσθετες τροφές που νοιώθουν ότι μπορούν να "
+"ανεχθούν. Οι ασθενείς ενθαρρύνονται να κάνουν διαχωρισμούς στην πρόσληψη της "
+"τροφής και των ποτών τους."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "Ενδείκνυται για ασθενείς που δεν είναι σε θέση να χειρίζονται σκεύη, ή για ασθενείς που βρίσκονται σε υποχρεωτική κατάκλιση και χρειάζονται τροφές κατάλληλες για την καρδιοαγγειακή τους υγεία."
+msgstr ""
+"Ενδείκνυται για ασθενείς που δεν είναι σε θέση να χειρίζονται σκεύη, ή για "
+"ασθενείς που βρίσκονται σε υποχρεωτική κατάκλιση και χρειάζονται τροφές "
+"κατάλληλες για την καρδιοαγγειακή τους υγεία."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "Αυτή η δίαιτα χρησιμοποιείται συχνά για περιστατικά Γυναικολογικών χειρουργείων. Προσφέρει τροφές όπως μη-κρεμοειδείς σούπες, ζελέ, χυμούς, ξυνόγαλα, τσάι και καφέ."
+msgstr ""
+"Αυτή η δίαιτα χρησιμοποιείται συχνά για περιστατικά Γυναικολογικών "
+"χειρουργείων. Προσφέρει τροφές όπως μη-κρεμοειδείς σούπες, ζελέ, χυμούς, "
+"ξυνόγαλα, τσάι και καφέ."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "Η δίαιτα περιλαμβάνει τροφές που είνι υγρές σε θερμοκρασία σώματος. Οι τροφές είναι ευκολόπεπτες και προσφέρουν ελάχιστο γαστρεντερικό ερεθισμό. Η δίαιτα δεν είναι διατροφικά άρτια."
+msgstr ""
+"Η δίαιτα περιλαμβάνει τροφές που είνι υγρές σε θερμοκρασία σώματος. Οι "
+"τροφές είναι ευκολόπεπτες και προσφέρουν ελάχιστο γαστρεντερικό ερεθισμό. Η "
+"δίαιτα δεν είναι διατροφικά άρτια."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
@@ -832,11 +983,14 @@ msgstr "Υγρά χωρίς ζάχαρη"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "Ευκολόπεπτες, ημίυγρες τροφές, που να καταναλώνονται σε μικρές ποσότητες."
+msgstr ""
+"Ευκολόπεπτες, ημίυγρες τροφές, που να καταναλώνονται σε μικρές ποσότητες."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "Μαλακές πολτοποιημένες τροφές σε πουρέ, οι οποίες είναι εύκολες στη μάσηση και στην πέψη"
+msgstr ""
+"Μαλακές πολτοποιημένες τροφές σε πουρέ, οι οποίες είναι εύκολες στη μάσηση "
+"και στην πέψη"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
@@ -846,13 +1000,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "Η δίαιτα περιορίζει τις περισσότερες ωμές, συντηρημένες ή εποχιακές τροφές. Η δίαιτα περιλαμβάνει μόνο περιορισμένη ποσότητα ινών."
+msgstr ""
+"Η δίαιτα περιορίζει τις περισσότερες ωμές, συντηρημένες ή εποχιακές τροφές. "
+"Η δίαιτα περιλαμβάνει μόνο περιορισμένη ποσότητα ινών."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "Η δίαιτα αποκλείει τις τροφές που περιλαμβάνουν στη σύστασή τους την γλουτένη. Η δίαιτα αυτή είναι το βασικό μέσο θεραπείας της κοιλιοκάκης."
+msgstr ""
+"Η δίαιτα αποκλείει τις τροφές που περιλαμβάνουν στη σύστασή τους την "
+"γλουτένη. Η δίαιτα αυτή είναι το βασικό μέσο θεραπείας της κοιλιοκάκης."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
@@ -866,29 +1024,39 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4 γραμμάρια Νάτριο. Προσφέρει έναν μέτριο περιορισμό σε Νάτριο, αφαιρώντας τις τροφές και τα καρυκεύματα που έχουν υψηλή περιεκτικότητα σε Νάτριο."
+msgstr ""
+"4 γραμμάρια Νάτριο. Προσφέρει έναν μέτριο περιορισμό σε Νάτριο, αφαιρώντας "
+"τις τροφές και τα καρυκεύματα που έχουν υψηλή περιεκτικότητα σε Νάτριο."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "Η δίαιτα αφαιρεί ορισμένες τροφές για να προσφέρει ένα χαμηλότερο επίπεδο βακτηρίων που είναι παρόν σε μία τυπική νοσοκομειακή δίαιτα."
+msgstr ""
+"Η δίαιτα αφαιρεί ορισμένες τροφές για να προσφέρει ένα χαμηλότερο επίπεδο "
+"βακτηρίων που είναι παρόν σε μία τυπική νοσοκομειακή δίαιτα."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "Ουδέν από του στόματος. Απαγορεύονται η τροφή και τα υγρά από του στόματος για τον ασθνεή"
+msgstr ""
+"Ουδέν από του στόματος. Απαγορεύονται η τροφή και τα υγρά από του στόματος "
+"για τον ασθνεή"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Τροφές χαμηλές σε ζάχαρη, σε λίπος και σε λακτόζη. Καθόλου υγρά με τα γεύματα. Μικρές και συχνές σιτίσεις"
+msgstr ""
+"Τροφές χαμηλές σε ζάχαρη, σε λίπος και σε λακτόζη. Καθόλου υγρά με τα "
+"γεύματα. Μικρές και συχνές σιτίσεις"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "Προσφέρει περιορισμένες ποσότητες πρωτείνης (40-60 g/d), καλλίου (2g/d) και νατρίου (2g/d) για τον ασθενή πριν το στάδιο της διάλυσης."
+msgstr ""
+"Προσφέρει περιορισμένες ποσότητες πρωτείνης (40-60 g/d), καλλίου (2g/d) και "
+"νατρίου (2g/d) για τον ασθενή πριν το στάδιο της διάλυσης."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
@@ -898,7 +1066,9 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "Προσφέρει κατάλληλη ποσότητα πρωτείνης (80 - 100g/d) και περιορισμένες ποσότητες καλλίου (2g) και νατρίου (2g) για τον ασθενή σε διάλυση."
+msgstr ""
+"Προσφέρει κατάλληλη ποσότητα πρωτείνης (80 - 100g/d) και περιορισμένες "
+"ποσότητες καλλίου (2g) και νατρίου (2g) για τον ασθενή σε διάλυση."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
@@ -906,7 +1076,9 @@ msgstr "Η δίαιτα παρέχει 6 μικρά γεύματα ημερησ
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "Μαλακές ήπιες τροφές που έχουν χαμηλή περιεκτικότητα σε ίνα. Η λακτόζη είναι περιορισμένη."
+msgstr ""
+"Μαλακές ήπιες τροφές που έχουν χαμηλή περιεκτικότητα σε ίνα. Η λακτόζη είναι "
+"περιορισμένη."
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
@@ -1040,6 +1212,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "Δίαιτα νοσηλευομένου"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "Φάρμακα νοσηλευομένου"
@@ -1056,23 +1240,114 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "Ιστορικό εισαγωγής του Ασθενούς "
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "Μεταφορά κλίνης"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "Νοσοκομ. Νοσηλείες"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Εγγραφή Εσωτερ. Ασθενών"
 
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Εγγραφή Εσωτερ. Ασθενών"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
 msgstr "Νοσοκομ. Νοσηλείες"
@@ -1081,6 +1356,82 @@ msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
 msgstr "Διαχείριση Εσωτερικού ασθενούς"
 
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
 msgstr "ημέρες"
@@ -1106,6 +1457,10 @@ msgid "when required"
 msgstr "όταν απαιτείται"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "Επιλεκτικά"
 
@@ -1125,33 +1480,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "Επειγόντως"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Γαλακτο-φυτοφαγική"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Αυγο-Γαλακτο φυτοφαγική"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Καμία"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Ιχθυοφαγική"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Βέγκαν"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Χορτοφάγος"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Έγινε"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1169,156 +1528,6 @@ msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "Σε νοσοκομειακή νοσηλεία"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Μεταφορά κλίνης ασθενούς"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Ιστορικό μεταφοράς κλίνης"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Περιγραφή δίαιτας"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Δίαιτα σχετική με θρησκευτικές πεποιθήσεις"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Θεραπευτική δίαιτα"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Περιγραφή και Ενδείξεις δίαιτας"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Θεραπευτική δίαιτα"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Δίαιτα νοσηλευομένου"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "Χρόνοι χορήγησης φαρμάκων νοσηλευομένου"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Αρχείο καταγραφής φαρμάκων ασθενούς"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Διαχείριση"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Ανεπιθύμητες ενέργειες και Σημειώσεις"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Δοσολογία"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Πρόσθετες πληροφορίες"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Γενικές πληροφορίες"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Φάρμακα νοσηλευομένου"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Φάρμακα"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Κατάσταση"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Περίοδος θεραπείας"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Διοικητικά στοιχεία"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Εισαγωγή"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Κάντε εισαγωγή του ασθενούς στο νοσηλευτικό ίδρυμα και αποδώστε μία κλίνη"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Διαγραφή"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Διαγραφή της εγγραφής"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "Διαγραφή της διαδικασίας εγγραφής του ασθενούς;"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Πλάνο φροντίδας"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Επιβεβαίωση εγγραφής / Κάντε την κράτηση"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Εξιτήριο"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Εξιτήριο ασθενούς"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Πληροφορίες εγγραφής ασθενούς"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Πληροφορίες εγγραφής εσωτερικού ασθνεούς"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "Πλάνο φαρμακευτικής αγωγής"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Διατροφή"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Άλλες οδηγίες / σημειώσεις για την διατροφή"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Εισαγωγή ασθενούς"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "Πρόκειται να ΥΠΟΓΡΑΨΕΤΕ το εξιτήριο του ασθενούς από το νοσηλευτικό ίδρυμα. Το αρχείο θα καταστεί ΜΟΝΟ ΓΙΑ ΑΝΑΓΝΩΣΗ"
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/locale/zh_CN.po b/locale/en_GB.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/en_GB.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/en_GB.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_AR.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/es_AR.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/es_AR.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_EC.po
similarity index 61%
copy from locale/es_ES.po
copy to locale/es_EC.po
index b0970f9..0a78563 100644
--- a/locale/es_ES.po
+++ b/locale/es_EC.po
@@ -1,29 +1,14 @@
-# 
-# Translators:
-# @atzerritik, 2014
-# @atzerritik, 2014
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014-2015
-# Carlos <carloschebair at gmail.com>, 2013
-# cristina <cmelgosa at thymbra.com>, 2012
-# cristina <cmelgosa at thymbra.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011,2013
-# Sebastián Marró <smarro at thymbra.com>, 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:31+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:08+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: 1452283726.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -33,21 +18,43 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "Ha elegido más de un registro. Por favor elija solo uno"
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "El código de Dieta ya existe"
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "El código de Dieta ya existe"
+msgstr "El código de dieta ya existe"
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr "Falta asociar profesional de la salud a este usuario"
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr "El código de solicitud de la comida ya existe"
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "Falta asociar profesional de la salud a este usuario"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "Cama no disponible"
+msgstr "Cama no está disponible"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
@@ -55,11 +62,15 @@ msgstr "Cama no disponible"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "El código de registro ya existe"
+msgstr "El código de Registro ya existe"
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "Registro de internación"
+msgstr "Registro de Paciente Hospitalizado"
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
@@ -71,11 +82,11 @@ msgstr "A"
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
@@ -83,7 +94,7 @@ msgstr "ID"
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "Código de registro"
+msgstr "Código de Registro"
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
@@ -99,11 +110,11 @@ msgstr "Fecha"
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
@@ -113,57 +124,25 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "Nueva cama"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "Razón"
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Código"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Creencia"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "Código"
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
@@ -183,19 +162,19 @@ msgstr "Nombre"
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
@@ -207,7 +186,7 @@ msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "Código de registro"
+msgstr "Código de Registro"
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
@@ -215,15 +194,159 @@ msgstr "Nombre"
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "Notas / Pautas"
+msgstr "Observaciones / Pautas"
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr "Creencia"
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr "Dieta"
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr "Vegetariano"
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr "Institución"
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr "Profesional de la Salud"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr "Advertencia"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr "Hora de comida"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr "Código de Registro"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr "Fecha"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr "Observaciones"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr "Estado"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr "Creado por usuario"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr "ID"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr "Comida"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr "Nombre"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr "Observaciones"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr "Fecha de modificación"
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
@@ -239,15 +362,15 @@ msgstr "Frecuencia"
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "Completó el tratamiento"
+msgstr "Tratamiento Completado"
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
@@ -255,7 +378,7 @@ msgstr "Suspendido"
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "Razón para abandonar el tratamiento"
+msgstr "Razón para suspender el tratamiento"
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
@@ -307,7 +430,7 @@ msgstr "Medicamento"
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "Código de registro"
+msgstr "Código de Registro"
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
@@ -319,7 +442,7 @@ msgstr "Nombre"
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "Vía de Administración"
+msgstr "Vía de administración"
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
@@ -327,11 +450,11 @@ msgstr "Inicio"
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
@@ -339,11 +462,11 @@ msgstr "Tiempo"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
@@ -371,11 +494,11 @@ msgstr "Observaciones"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
@@ -383,11 +506,11 @@ msgstr "Fecha"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
@@ -399,7 +522,7 @@ msgstr "unidad de la dosis"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "Profesional de la salud"
+msgstr "Profesional de la Salud"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
@@ -419,27 +542,27 @@ msgstr "Observaciones"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motivo de admisión"
+msgstr "Motivo de Ingreso"
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "Tipo de admisión"
+msgstr "Tipo de ingreso"
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "Doctor a cargo"
+msgstr "Médico Tratante"
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "Cama de hospital"
+msgstr "Cama de Hospital"
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
@@ -447,27 +570,27 @@ msgstr "Historial de Transferencias"
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Creencia"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "Fecha de alta prevista"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "Plan de alta médica"
+msgstr "Plan de Alta Médica"
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
@@ -482,8 +605,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Información adicional"
+msgid "Notes"
+msgstr "Notas"
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -495,11 +618,11 @@ msgstr "Medicaciones"
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "Código de registro"
+msgstr "Código de Registro"
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "Plan de enfermería"
+msgstr "Plan de Enfermería"
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
@@ -513,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr "IDUP"
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -527,16 +654,28 @@ msgstr "Programa de Comidas / Dieta"
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr "Hospitalizado"
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr "Registro de Paciente Hospitalizado"
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "Secuencia de Internación"
@@ -547,7 +686,23 @@ msgstr "Ingrese el código de hospitalización del paciente"
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "Observaciones específicas para esta dieta / paciente"
+msgstr "Observaciones específicas para esta/e dieta / paciente"
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr "El paciente tiene necesidades especiales en las comidas"
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
@@ -581,7 +736,9 @@ msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Tiempo entre las dosis que el paciente debe esperar (por ej. para píldoras cada 8 horas, coloque aquí 8 y seleccione 'horas' en el campo unidad"
+msgstr ""
+"Tiempo entre las dosis que el paciente debe esperar (por ej. para píldoras "
+"cada 8 horas, coloque aquí 8 y seleccione 'horas' en el campo unidad"
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
@@ -591,11 +748,14 @@ msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Elija una enfermedad de la lista de enfermedades. Puede ser una enfermedad existente o una medida preventiva o profiláctica"
+msgstr ""
+"Elija una enfermedad de la lista de enfermedades. Puede ser una enfermedad "
+"existente del paciente o una medida preventiva o profiláctica"
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "Tilde esta opción si el paciente está actualmente tomando la medicación"
+msgstr ""
+"Marque esta opción si el paciente está actualmente tomando la medicación"
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
@@ -639,20 +799,35 @@ msgstr "observaciones específicas para esta dosis"
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motivo de admisión"
+msgstr "Motivo de Ingreso"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Introduzca las creencias o religión del paciente para seleccionar la dieta adecuada"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr "Profesional de la Salud que dio de baja al paciente"
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr "Identificador Único de Persona"
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
-msgstr "Muestra el estado de la hospitalización del paciente"
+msgstr "Muestra el estado de hospitalización del paciente"
+
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr "Ingrese el código de hospitalización del paciente"
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr "Ingrese el código de hospitalización del paciente"
 
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
@@ -662,104 +837,29 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "Crear proceso de transferencia de cama"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Aunque el Budismo no tiene una dieta específica, algunos budistas son vegetarianos basándose en una estricta interpretación del primero de los Cinco Preceptos"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Una dieta basada en lo que se pensó que Adán y Eva consumían en el jardín del Edén. Predominantemente basada en frutas, vegetariana o vegana."
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Dieta Aleluya : Una forma de vegetarianismo cristiano desarrollado en los 70s. Los creadores interpretaron un verso de la Biblia como que sugería que los cristianos sólo deberían comer semillas y frutas."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Dietas Hinduísta y Jainista : Induístas y Jainistas suelen usar dietas lacto-vegetarianas, basadas en el principio de Ahimsa (No-dañar)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Los Musulmanes siguen una dieta basada únicamente en comida que sea halal - permitida bajo la ley islámica. Lo contrario de halal es haraam, comida no permitida por el islam. Las substancias haraam incluyen el alcohol, cerdo, y cualquier carne procedente de un animal que no ha sido sacrificado según el método islámico o ritual (Dhabiha)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal : Una serie de principios que influencia la dieta de muchos miembros del movimiento Rastafari. Un principio es que la comida natural debe ser consumida. Algunos Rastafaris interpretan I-tal para abocarse al vegetarianismo o veganismo"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Dieta Kosher: Comida permitida por el Kashrut, el conjunto de leyes dietéticas judías. Algunas comidas o combinaciones son no-Kosher, y el no preparar la comida de acuerdo al Kashrut puede covertir comidas permitidas en no-Kosher"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Dieta por Creencia"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Budista"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edénica"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Aleluya"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Hindú"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Musulmán"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Kosher"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Para el tratamiento de condiciones caracterizados por edema, incluyendo cirrosis hepática con ascitis, Insuficiencia Cardíaca Congestiva,  hipertensión esencial y enfermedad renal"
+msgstr ""
+"Para el tratamiento de condiciones caracterizados por edema, incluyendo "
+"cirrosis hepática con ascitis, Insuficiencia Cardíaca Congestiva,  "
+"hipertensión esencial y enfermedad renal"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "La dieta elimina comidas sazonadas y condimentos que induzcan disconfort gástrico y reflujo gastro esofágico."
+msgstr ""
+"La dieta elimina comidas sazonadas y condimentos que induzcan disconfort "
+"gástrico y reflujo gastro esofágico."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Proporciona cantidades controladas de sodio, cholesterol, saturación y grasas"
+msgstr ""
+"Proporciona cantidades controladas de sodio, cholesterol, saturación y "
+"grasas"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -767,45 +867,71 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/día. La dieta proporciona una cantidad consistente de carbohidratos, basado en el nivel calórico para un óptmo control de glucemia. Hay un snack antes de acostarse (45% Carbs, 25% proteínas, 30% f -grasa)"
+msgstr ""
+"1200-3000 cal/día. La dieta proporciona una cantidad consistente de "
+"carbohidratos, basado en el nivel calórico para un óptmo control de "
+"glucemia. Hay un snack antes de acostarse (45% Carbs, 25% proteínas, 30% f "
+"-grasa)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/día. Esta dieta proporciona suficiente cantidad de carbohidratos basado en el nivel valórico que permita un control óptimo de la glucemia. Los snacks se entre comidas para obtener aproximadamente 35-40% o de las calorías provenientes de carbohidratos."
+msgstr ""
+"1800-3000 cal/día. Esta dieta proporciona suficiente cantidad de "
+"carbohidratos basado en el nivel valórico que permita un control óptimo de "
+"la glucemia. Los snacks se entre comidas para obtener aproximadamente 35-40% "
+"o de las calorías provenientes de carbohidratos."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "La dieta se indica en enfermedades agudas o cirugías que causan intolerancia alimenticia; o para una restricción temporaria de material no-digerido en el gasto intestinal. La dieta no es adecuada desde el punto de vista nutricional."
+msgstr ""
+"La dieta se indica en enfermedades agudas o cirugías que causan intolerancia "
+"alimenticia; o para una restricción temporaria de material no-digerido en "
+"el gasto intestinal. La dieta no es adecuada desde el punto de vista "
+"nutricional."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Dieta líquida basada en únicamente en productos sin azúcar (sin azúcar concentrada). Esta dieta proporciona una cantidad de carbohidratos muy limitada"
+msgstr ""
+"Dieta líquida basada en únicamente en productos sin azúcar (sin azúcar "
+"concentrada). Esta dieta proporciona una cantidad de carbohidratos muy "
+"limitada"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Alterada mecánicamente. Las carnes son molidas o troceadas. Los alimentos son suaves y tiernos; y fácilmente forman un bolo. Todos los vegetales se pueden triturar con el tenedor. Los líquidos se deben pedir por separado, como normal, néctar o miel."
+msgstr ""
+"Alterada mecánicamente. Las carnes son molidas o troceadas. Los alimentos "
+"son suaves y tiernos; y fácilmente forman un bolo. Todos los vegetales se "
+"pueden triturar con el tenedor. Los líquidos se deben pedir por separado, "
+"como normal, néctar o miel."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Las comidas tienen la consistencia similar a la normal, con la excepción de las comidas duras, pegajosas o crocantes. Las comidas son húmedas, de tamaño de bocado. Todos los vegetales se pueden triturar con el tenedor. Los líquidos se deben pedir por separado, como normales, néctar o miel"
+msgstr ""
+"Las comidas tienen la consistencia similar a la normal, con la excepción de "
+"las comidas duras, pegajosas o crocantes. Las comidas son húmedas, de tamaño "
+"de bocado. Todos los vegetales se pueden triturar con el tenedor. Los "
+"líquidos se deben pedir por separado, como normales, néctar o miel"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "Para pacientes con problemas de masticación e inflamación, o con inflamación esofágica o varices. La consistencia de la comida es batida. Los líquidos se piden por separado como normal, néctar o miel"
+msgstr ""
+"Para pacientes con problemas de masticación e inflamación, o con inflamación "
+"esofágica o varices. La consistencia de la comida es batida. Los líquidos "
+"se piden por separado como normal, néctar o miel"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -813,26 +939,39 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "La dieta proporciona comida blanda, fría o a temperatura ambiente, divida en sólida y en líquida. Los pacientes que están con esta dieta pueden pedir alimentos adicionales que consideren que pueden tolerar. Se alienta a los pacientes a separar sus tomas de comida y bebida."
+msgstr ""
+"La dieta proporciona comida blanda, fría o a temperatura ambiente, divida en "
+"sólida y en líquida. Los pacientes que están con esta dieta pueden pedir "
+"alimentos adicionales que consideren que pueden tolerar. Se alienta a los "
+"pacientes a separar sus tomas de comida y bebida."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "Está indicada en paciente que no pueden usar cubiertos, o para pacientes que están en una posición horizontal que necesitan comidas saludables para el corazón."
+msgstr ""
+"Está indicada en paciente que no pueden usar cubiertos, o para pacientes que "
+"están en una posición horizontal que necesitan comidas saludables para el "
+"corazón."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "Esta dieta es común en pacientes quirúrgicos ginecológicos. Proporciona alimentos como sopas no cremosas, gelatina, leche deslactosada, té y café "
+msgstr ""
+"Esta dieta es común en pacientes quirúrgicos ginecológicos. Proporciona "
+"alimentos como sopas no cremosas, gelatina, leche deslactosada, té y café "
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "La dieta consiste en alimentos líquidos a temperatura corporal. Los alimentos son fáciles de digerir y generan mínima estimulación gastrointestinal. Esta dieta no es adecuada desde un punto de vista nutricional."
+msgstr ""
+"La dieta consiste en alimentos líquidos a temperatura corporal. Los "
+"alimentos son fáciles de digerir y generan mínima estimulación "
+"gastrointestinal. Esta dieta no es adecuada desde un punto de vista "
+"nutricional."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
@@ -840,7 +979,9 @@ msgstr "Fluidos sin azucar"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "De fácil digestión, alimentos semi-líquidos para consumo en pequeñas cantidades"
+msgstr ""
+"De fácil digestión, alimentos semi-líquidos para consumo en pequeñas "
+"cantidades"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
@@ -854,13 +995,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "La dieta excluye alimentos crudos, condimentados y fritos. Contiene una cantidad moderada de fibra."
+msgstr ""
+"La dieta excluye alimentos crudos, condimentados y fritos. Contiene una "
+"cantidad moderada de fibra."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "La dieta omite comidas con Gluten. Está indicada principalmente para pacientes celíacos."
+msgstr ""
+"La dieta omite comidas con Gluten. Está indicada principalmente para "
+"pacientes celíacos."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
@@ -874,13 +1019,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4 gramos de sodio. Proporciona una restricción moderada en sodio eliminando alimentos y condimentos con alto contenido en sodio"
+msgstr ""
+"4 gramos de sodio. Proporciona una restricción moderada en sodio eliminando "
+"alimentos y condimentos con alto contenido en sodio"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "la dieta elliminaciertos alimentos para proporcionar un nivel inferior de bacterias que estaría presente en una dieta típica de hospital"
+msgstr ""
+"la dieta elliminaciertos alimentos para proporcionar un nivel inferior de "
+"bacterias que estaría presente en una dieta típica de hospital"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
@@ -890,13 +1039,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Alimentos bajos en azúcar, bajos en grasa y  bajos en lactosa. Líquidos no permitidos con las comidas. Alimentación frecuente en pequeñas cantidades"
+msgstr ""
+"Alimentos bajos en azúcar, bajos en grasa y  bajos en lactosa. Líquidos no "
+"permitidos con las comidas. Alimentación frecuente en pequeñas cantidades"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "Proporciona cantidades limitadas de proteína (40-60g/d), potasio (2g/d), y sodio (2g/d) para el paciente pre-dializado"
+msgstr ""
+"Proporciona cantidades limitadas de proteína (40-60g/d), potasio (2g/d), y "
+"sodio (2g/d) para el paciente pre-dializado"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
@@ -906,7 +1059,9 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "Proporciona una cantidad de proteína adecuada (80 - 100g/d) y una cantidad limitada de potasio (2g) y sodio (2g) para el paciente dializado."
+msgstr ""
+"Proporciona una cantidad de proteína adecuada (80 - 100g/d) y una cantidad "
+"limitada de potasio (2g) y sodio (2g) para el paciente dializado."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
@@ -914,7 +1069,8 @@ msgstr "La dieta proporciona 6 pequeñas comidas diarias"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "Alimentos blandos que tienen bajo contenido en fibra. Lactosa es limitada."
+msgstr ""
+"Alimentos blandos que tienen bajo contenido en fibra. Lactosa es limitada."
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
@@ -966,11 +1122,11 @@ msgstr "Hiperemesis"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "Alimentación con dedos"
+msgstr "Alimentación con los Dedos"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "Solo líquido sin lactosa"
+msgstr "Solo Líquido sin Lactosa"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
@@ -978,19 +1134,19 @@ msgstr "Solo líquidos"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "Bypass gástrico etapa 1"
+msgstr "Bypass Gástrico Etapa 1"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "Bypass gástrico etapa 2"
+msgstr "Bypass Gástrico Etapa 2"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "Bypass gástrico etapa 3"
+msgstr "Bypass Gástrico Etapa 3"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "Bypass gástrico etapa 4"
+msgstr "Bypass Gástrico Etapa 4"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
@@ -1002,7 +1158,7 @@ msgstr "Sin Gluten"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "Bajo en grasas"
+msgstr "Bajo en Grasas"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
@@ -1010,7 +1166,7 @@ msgstr "Mecánica Suave / Suave Dental"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "Sin sales añadidas - SSA"
+msgstr "Sin Sales Añadidas - SSA"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
@@ -1018,7 +1174,7 @@ msgstr "Neutropénica"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "Nada por la boca / NPO"
+msgstr "Nada por la Boca / NPO"
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
@@ -1048,6 +1204,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "Dieta Hospitalaria"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "Medicación Hospitalaria"
@@ -1064,22 +1232,113 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "Historial de hospitalizaciones"
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "Transferencia de cama"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "Hospitalizaciones"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr "Realizada"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr "Confirmado"
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr "Finalizado"
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr "Hospitalizado"
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Registro de internación"
+msgstr "Ingreso de Paciente Hospitalizado"
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Registro de internación"
+msgstr "Ingreso de Paciente Hospitalizado"
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr "Dietas Terapéuticas"
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
@@ -1087,7 +1346,83 @@ msgstr "Hospitalizaciones"
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "Administración de internación de Health"
+msgstr "Administración de Pacientes Hospitalizados de Salud"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr "Libre"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr "Necesita limpieza"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr "No disponible"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr "Ocupada"
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr "Almuerzo"
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr "Bocadillo"
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr "Cancelado"
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr "Realizada"
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr "Borrador"
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
@@ -1114,6 +1449,10 @@ msgid "when required"
 msgstr "cuando sea necesario"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "Electivo"
 
@@ -1133,33 +1472,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "Urgente"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Lacto vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Ovo-Lacto vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Ninguno"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Vegano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Realizada"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr "Finalizado"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1171,162 +1514,12 @@ msgstr "confirmado"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "Libre"
+msgstr "libre"
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "hospitalizado"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Transferencia de Cama del Paciente"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Historial de transferencia de cama"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Descripción dieta"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Dietas asociadas a creencias"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Dieta terapéutica"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Descripción de la DIeta e indicaciones"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Dieta terapéutica"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Dieta Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "Horarios de Administración de Medicación Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Historial de Medicación Intrahospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Administración"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Reacciones adversas y notas"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Dosis"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Información adicional"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Información general"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Medicación Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Medicación"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Estado"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Período del tratamiento"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Datos administrativos"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Admisión"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Admitir el paciente en el centro de salud y asignar la cama"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Cancelar registro"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "¿Cancelar el proceso de registro del paciente?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Plan de cuidados"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confirmar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confirmar el registro / Hacer la reserva"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Alta"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Alta de paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Información del Registro de Hospitalización del paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Información del Registro de Internación"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "Plan de Medicación"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrición"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Otras notas e indicaciones nutricionales"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Admisión del Paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "Usted está a punto de FIRMAR el alta del paciente de la institución de salud. Este registro se convertirá en SOLO LECTURA"
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index b0970f9..038e643 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -1,29 +1,14 @@
-# 
-# Translators:
-# @atzerritik, 2014
-# @atzerritik, 2014
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014-2015
-# Carlos <carloschebair at gmail.com>, 2013
-# cristina <cmelgosa at thymbra.com>, 2012
-# cristina <cmelgosa at thymbra.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Iván López Pérez <ioloo00 at eresmas.com>, 2012
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2011,2013
-# Sebastián Marró <smarro at thymbra.com>, 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:31+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:18+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: 1452251928.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -33,19 +18,41 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "Ha elegido más de un registro. Por favor elija solo uno"
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "El código de Dieta ya existe"
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
 msgstr "El código de Dieta ya existe"
 
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
+
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "Falta asociar profesional de la salud a este usuario"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
 msgstr "Cama no disponible"
 
@@ -57,6 +64,10 @@ msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
 msgstr "El código de registro ya existe"
 
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
+
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
 msgstr "Registro de internación"
@@ -113,46 +124,14 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "Nueva cama"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "Razón"
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Código"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Descripción"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Creencia"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "Código"
@@ -225,6 +204,150 @@ msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
 msgstr "Usuario modificación"
 
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
 msgstr "Tiempos admin."
@@ -453,22 +576,22 @@ msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
 msgstr "Usuario creación"
 
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Creencia"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
-
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "Fecha de alta prevista"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
 msgstr "Plan de alta médica"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
 msgstr "Dado de baja por"
@@ -482,8 +605,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Información adicional"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -513,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "Nombre"
@@ -537,6 +664,18 @@ msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr "Hospitalizado"
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "Secuencia de Internación"
@@ -549,6 +688,22 @@ msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
 msgstr "Observaciones específicas para esta dieta / paciente"
 
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
+
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
 msgstr "Efectos secundarios / reacciones adversas que experimentó el paciente"
@@ -581,7 +736,9 @@ msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Tiempo entre las dosis que el paciente debe esperar (por ej. para píldoras cada 8 horas, coloque aquí 8 y seleccione 'horas' en el campo unidad"
+msgstr ""
+"Tiempo entre las dosis que el paciente debe esperar (por ej. para píldoras "
+"cada 8 horas, coloque aquí 8 y seleccione 'horas' en el campo unidad"
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
@@ -591,7 +748,9 @@ msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Elija una enfermedad de la lista de enfermedades. Puede ser una enfermedad existente o una medida preventiva o profiláctica"
+msgstr ""
+"Elija una enfermedad de la lista de enfermedades. Puede ser una enfermedad "
+"existente o una medida preventiva o profiláctica"
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
@@ -641,19 +800,34 @@ msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
 msgstr "Motivo de admisión"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Introduzca las creencias o religión del paciente para seleccionar la dieta adecuada"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr "Profesional de la Salud que dio de baja al paciente"
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr "Muestra el estado de la hospitalización del paciente"
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
 msgstr "Transferencias de camas"
@@ -662,104 +836,29 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "Crear proceso de transferencia de cama"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Aunque el Budismo no tiene una dieta específica, algunos budistas son vegetarianos basándose en una estricta interpretación del primero de los Cinco Preceptos"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Una dieta basada en lo que se pensó que Adán y Eva consumían en el jardín del Edén. Predominantemente basada en frutas, vegetariana o vegana."
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Dieta Aleluya : Una forma de vegetarianismo cristiano desarrollado en los 70s. Los creadores interpretaron un verso de la Biblia como que sugería que los cristianos sólo deberían comer semillas y frutas."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Dietas Hinduísta y Jainista : Induístas y Jainistas suelen usar dietas lacto-vegetarianas, basadas en el principio de Ahimsa (No-dañar)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Los Musulmanes siguen una dieta basada únicamente en comida que sea halal - permitida bajo la ley islámica. Lo contrario de halal es haraam, comida no permitida por el islam. Las substancias haraam incluyen el alcohol, cerdo, y cualquier carne procedente de un animal que no ha sido sacrificado según el método islámico o ritual (Dhabiha)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal : Una serie de principios que influencia la dieta de muchos miembros del movimiento Rastafari. Un principio es que la comida natural debe ser consumida. Algunos Rastafaris interpretan I-tal para abocarse al vegetarianismo o veganismo"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Dieta Kosher: Comida permitida por el Kashrut, el conjunto de leyes dietéticas judías. Algunas comidas o combinaciones son no-Kosher, y el no preparar la comida de acuerdo al Kashrut puede covertir comidas permitidas en no-Kosher"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Dieta por Creencia"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Budista"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edénica"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Aleluya"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Hindú"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Musulmán"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Kosher"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Para el tratamiento de condiciones caracterizados por edema, incluyendo cirrosis hepática con ascitis, Insuficiencia Cardíaca Congestiva,  hipertensión esencial y enfermedad renal"
+msgstr ""
+"Para el tratamiento de condiciones caracterizados por edema, incluyendo "
+"cirrosis hepática con ascitis, Insuficiencia Cardíaca Congestiva,  "
+"hipertensión esencial y enfermedad renal"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "La dieta elimina comidas sazonadas y condimentos que induzcan disconfort gástrico y reflujo gastro esofágico."
+msgstr ""
+"La dieta elimina comidas sazonadas y condimentos que induzcan disconfort "
+"gástrico y reflujo gastro esofágico."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Proporciona cantidades controladas de sodio, cholesterol, saturación y grasas"
+msgstr ""
+"Proporciona cantidades controladas de sodio, cholesterol, saturación y "
+"grasas"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -767,45 +866,71 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/día. La dieta proporciona una cantidad consistente de carbohidratos, basado en el nivel calórico para un óptmo control de glucemia. Hay un snack antes de acostarse (45% Carbs, 25% proteínas, 30% f -grasa)"
+msgstr ""
+"1200-3000 cal/día. La dieta proporciona una cantidad consistente de "
+"carbohidratos, basado en el nivel calórico para un óptmo control de "
+"glucemia. Hay un snack antes de acostarse (45% Carbs, 25% proteínas, 30% f "
+"-grasa)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/día. Esta dieta proporciona suficiente cantidad de carbohidratos basado en el nivel valórico que permita un control óptimo de la glucemia. Los snacks se entre comidas para obtener aproximadamente 35-40% o de las calorías provenientes de carbohidratos."
+msgstr ""
+"1800-3000 cal/día. Esta dieta proporciona suficiente cantidad de "
+"carbohidratos basado en el nivel valórico que permita un control óptimo de "
+"la glucemia. Los snacks se entre comidas para obtener aproximadamente 35-40% "
+"o de las calorías provenientes de carbohidratos."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "La dieta se indica en enfermedades agudas o cirugías que causan intolerancia alimenticia; o para una restricción temporaria de material no-digerido en el gasto intestinal. La dieta no es adecuada desde el punto de vista nutricional."
+msgstr ""
+"La dieta se indica en enfermedades agudas o cirugías que causan intolerancia "
+"alimenticia; o para una restricción temporaria de material no-digerido en "
+"el gasto intestinal. La dieta no es adecuada desde el punto de vista "
+"nutricional."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Dieta líquida basada en únicamente en productos sin azúcar (sin azúcar concentrada). Esta dieta proporciona una cantidad de carbohidratos muy limitada"
+msgstr ""
+"Dieta líquida basada en únicamente en productos sin azúcar (sin azúcar "
+"concentrada). Esta dieta proporciona una cantidad de carbohidratos muy "
+"limitada"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Alterada mecánicamente. Las carnes son molidas o troceadas. Los alimentos son suaves y tiernos; y fácilmente forman un bolo. Todos los vegetales se pueden triturar con el tenedor. Los líquidos se deben pedir por separado, como normal, néctar o miel."
+msgstr ""
+"Alterada mecánicamente. Las carnes son molidas o troceadas. Los alimentos "
+"son suaves y tiernos; y fácilmente forman un bolo. Todos los vegetales se "
+"pueden triturar con el tenedor. Los líquidos se deben pedir por separado, "
+"como normal, néctar o miel."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Las comidas tienen la consistencia similar a la normal, con la excepción de las comidas duras, pegajosas o crocantes. Las comidas son húmedas, de tamaño de bocado. Todos los vegetales se pueden triturar con el tenedor. Los líquidos se deben pedir por separado, como normales, néctar o miel"
+msgstr ""
+"Las comidas tienen la consistencia similar a la normal, con la excepción de "
+"las comidas duras, pegajosas o crocantes. Las comidas son húmedas, de tamaño "
+"de bocado. Todos los vegetales se pueden triturar con el tenedor. Los "
+"líquidos se deben pedir por separado, como normales, néctar o miel"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "Para pacientes con problemas de masticación e inflamación, o con inflamación esofágica o varices. La consistencia de la comida es batida. Los líquidos se piden por separado como normal, néctar o miel"
+msgstr ""
+"Para pacientes con problemas de masticación e inflamación, o con inflamación "
+"esofágica o varices. La consistencia de la comida es batida. Los líquidos "
+"se piden por separado como normal, néctar o miel"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -813,26 +938,39 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "La dieta proporciona comida blanda, fría o a temperatura ambiente, divida en sólida y en líquida. Los pacientes que están con esta dieta pueden pedir alimentos adicionales que consideren que pueden tolerar. Se alienta a los pacientes a separar sus tomas de comida y bebida."
+msgstr ""
+"La dieta proporciona comida blanda, fría o a temperatura ambiente, divida en "
+"sólida y en líquida. Los pacientes que están con esta dieta pueden pedir "
+"alimentos adicionales que consideren que pueden tolerar. Se alienta a los "
+"pacientes a separar sus tomas de comida y bebida."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "Está indicada en paciente que no pueden usar cubiertos, o para pacientes que están en una posición horizontal que necesitan comidas saludables para el corazón."
+msgstr ""
+"Está indicada en paciente que no pueden usar cubiertos, o para pacientes que "
+"están en una posición horizontal que necesitan comidas saludables para el "
+"corazón."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "Esta dieta es común en pacientes quirúrgicos ginecológicos. Proporciona alimentos como sopas no cremosas, gelatina, leche deslactosada, té y café "
+msgstr ""
+"Esta dieta es común en pacientes quirúrgicos ginecológicos. Proporciona "
+"alimentos como sopas no cremosas, gelatina, leche deslactosada, té y café "
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "La dieta consiste en alimentos líquidos a temperatura corporal. Los alimentos son fáciles de digerir y generan mínima estimulación gastrointestinal. Esta dieta no es adecuada desde un punto de vista nutricional."
+msgstr ""
+"La dieta consiste en alimentos líquidos a temperatura corporal. Los "
+"alimentos son fáciles de digerir y generan mínima estimulación "
+"gastrointestinal. Esta dieta no es adecuada desde un punto de vista "
+"nutricional."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
@@ -840,7 +978,9 @@ msgstr "Fluidos sin azucar"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "De fácil digestión, alimentos semi-líquidos para consumo en pequeñas cantidades"
+msgstr ""
+"De fácil digestión, alimentos semi-líquidos para consumo en pequeñas "
+"cantidades"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
@@ -854,13 +994,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "La dieta excluye alimentos crudos, condimentados y fritos. Contiene una cantidad moderada de fibra."
+msgstr ""
+"La dieta excluye alimentos crudos, condimentados y fritos. Contiene una "
+"cantidad moderada de fibra."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "La dieta omite comidas con Gluten. Está indicada principalmente para pacientes celíacos."
+msgstr ""
+"La dieta omite comidas con Gluten. Está indicada principalmente para "
+"pacientes celíacos."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
@@ -874,13 +1018,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4 gramos de sodio. Proporciona una restricción moderada en sodio eliminando alimentos y condimentos con alto contenido en sodio"
+msgstr ""
+"4 gramos de sodio. Proporciona una restricción moderada en sodio eliminando "
+"alimentos y condimentos con alto contenido en sodio"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "la dieta elliminaciertos alimentos para proporcionar un nivel inferior de bacterias que estaría presente en una dieta típica de hospital"
+msgstr ""
+"la dieta elliminaciertos alimentos para proporcionar un nivel inferior de "
+"bacterias que estaría presente en una dieta típica de hospital"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
@@ -890,13 +1038,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Alimentos bajos en azúcar, bajos en grasa y  bajos en lactosa. Líquidos no permitidos con las comidas. Alimentación frecuente en pequeñas cantidades"
+msgstr ""
+"Alimentos bajos en azúcar, bajos en grasa y  bajos en lactosa. Líquidos no "
+"permitidos con las comidas. Alimentación frecuente en pequeñas cantidades"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "Proporciona cantidades limitadas de proteína (40-60g/d), potasio (2g/d), y sodio (2g/d) para el paciente pre-dializado"
+msgstr ""
+"Proporciona cantidades limitadas de proteína (40-60g/d), potasio (2g/d), y "
+"sodio (2g/d) para el paciente pre-dializado"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
@@ -906,7 +1058,9 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "Proporciona una cantidad de proteína adecuada (80 - 100g/d) y una cantidad limitada de potasio (2g) y sodio (2g) para el paciente dializado."
+msgstr ""
+"Proporciona una cantidad de proteína adecuada (80 - 100g/d) y una cantidad "
+"limitada de potasio (2g) y sodio (2g) para el paciente dializado."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
@@ -914,7 +1068,8 @@ msgstr "La dieta proporciona 6 pequeñas comidas diarias"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "Alimentos blandos que tienen bajo contenido en fibra. Lactosa es limitada."
+msgstr ""
+"Alimentos blandos que tienen bajo contenido en fibra. Lactosa es limitada."
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
@@ -1048,6 +1203,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "Dieta Hospitalaria"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "Medicación Hospitalaria"
@@ -1064,23 +1231,114 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "Historial de hospitalizaciones"
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "Transferencia de cama"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "Hospitalizaciones"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Registro de internación"
 
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Registro de internación"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
 msgstr "Hospitalizaciones"
@@ -1089,6 +1347,82 @@ msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
 msgstr "Administración de internación de Health"
 
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
 msgstr "días"
@@ -1114,6 +1448,10 @@ msgid "when required"
 msgstr "cuando sea necesario"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "Electivo"
 
@@ -1133,33 +1471,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "Urgente"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Lacto vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Ovo-Lacto vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Ninguno"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Vegano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Realizada"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1177,156 +1519,6 @@ msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "hospitalizado"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Transferencia de Cama del Paciente"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Historial de transferencia de cama"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Descripción dieta"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Dietas asociadas a creencias"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Dieta terapéutica"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Descripción de la DIeta e indicaciones"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Dieta terapéutica"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Dieta Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "Horarios de Administración de Medicación Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Historial de Medicación Intrahospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Administración"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Reacciones adversas y notas"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Dosis"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Información adicional"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Información general"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Medicación Hospitalaria"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Medicación"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Estado"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Período del tratamiento"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Datos administrativos"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Admisión"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Admitir el paciente en el centro de salud y asignar la cama"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Cancelar registro"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "¿Cancelar el proceso de registro del paciente?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Plan de cuidados"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confirmar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confirmar el registro / Hacer la reserva"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Alta"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Alta de paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Información del Registro de Hospitalización del paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Información del Registro de Internación"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "Plan de Medicación"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrición"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Otras notas e indicaciones nutricionales"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Admisión del Paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "Usted está a punto de FIRMAR el alta del paciente de la institución de salud. Este registro se convertirá en SOLO LECTURA"
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/locale/zh_CN.po b/locale/es_MX.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/es_MX.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/es_MX.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_PE.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/es_PE.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/es_PE.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 96806b1..5af0416 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -1,469 +1,588 @@
-# 
-# Translators:
-# Emmanuel Simond, 2014
-# Eriam Schaffter <eriam at mediavirtuel.com>, 2012
-# Eric Vernichon <eric at vernichon.fr>, 2011
-# gestionRessources <klinik_mailinglist at gestion-ressources.com>, 2011
-# Mathieu Anquetin <mathieu at anquetin.eu>, 2013
-# fnonga <nonga.fabien at orange.fr>, 2014
-# 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "Le lit de destination n'est pas disponible"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "Vous avez choisi plus de 1 enregistrement. Prière d'en choisir un seul"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "Ce code de régime existe déjà"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "Ce code de régime existe déjà"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "Pas de professionnel de santé associé à l'utilisateur"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "Lit indisponible"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "Le lit de destination n'est pas disponible"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "Ce code d'enregistrement existe déjà"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "De"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "A"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "Motif"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "Nouveau lit"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "Motif"
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Code"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Date de création"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Utilisateur qui a crée"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Croyance"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Date d'écriture"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "Code"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "Indications"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "Type de régime"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "Régime"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "Remarques / Directives"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "Heures d'administration"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "Effets indésirables"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "Fréquence"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "Cours Terminé"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "Interrompu"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "Raison de l'arrêt"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "Fin"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "Forme"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "Fréquence"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "le cas échéant (pro re nata)"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "l'unité"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "Indication"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "Actif"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "Historique"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "Médicament"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "Voie d'administration"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "Début"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "Heure"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "Médicaments"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "Remarques"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "Date"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "Dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "unité de dose"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "Professionnel de santé"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "Médicaments"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "Remarques"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motif d'admission"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "Type d'admission"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "Médecin traitant"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "Lit hospitalier"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "Historique des transferts"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "Créer utilisateur"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Croyance"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Végétarien"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "Date de sortie prévue"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "Plan de sortie"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
@@ -471,51 +590,55 @@ msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "Date d'hospitalisation"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Info extra."
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "Institution"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "Medications"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "Code d'enregistrement"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "Plan de soins"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "Notes / Directives nutritionnelles"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "Médecin référant"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "Patient"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "Statut"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
@@ -523,239 +646,200 @@ msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "Inscrivez date"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "Inscrivez utilisateur"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "Séquence patient"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "Entrez le code d'hospitalisation du patient"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "Remarques spécifiques pour ce régime / patient"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "Effets secondaires ou effets indésirables que le patient a éprouvé"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "Fréquence de dosage commune / standard pour ce médicament"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "Brève description pour l'interruption du traitement"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "Date de début de traitement"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "Forme du médicaments, tels que comprimés ou gel"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Temps d'attente entre les doses au patient (c'est à dire, pour une pilule chaque huit heures, mettez ici 8 et sélectionnez \"heure\" dans le domaine de l'unité)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "Utilisez si nécessaire, pro re nata"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Choisissez une maladie pour ce médicament parmi la liste des maladies. Elle peut être une maladie existante du patient ou de prophylaxie."
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "Cochez cette case si le patient est actuellement sous traitement par ce médicament"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "Medicament Prescrit"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "Quantité d'unités (par exemple, 2 gélules) du médicament"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "Code de voie d'administration du médicament."
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "Date de début de traitement"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "Remarques spécifiques pour ce dosage"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "Quantité de médicament par dose (par exemple, 250 mg)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "Unité de mesure pour les médicaments à prendre"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "Remarques spécifiques pour ce dosage"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "Motif d'admission"
-
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Entrer la croyance ou la religion du patient pour choisir le régime approprié"
-
-msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
-msgid "Health Professional that discharged the patient"
 msgstr ""
 
-msgctxt "help:gnuhealth.patient,patient_status:"
-msgid "Show the hospitalization status of the patient"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
 msgstr ""
 
-msgctxt "model:gnuhealth.bed.transfer,name:"
-msgid "Bed transfers"
-msgstr "Transferts de lit"
-
-msgctxt "model:gnuhealth.bed.transfer.init,name:"
-msgid "Create Bed Transfer Init"
-msgstr "Initialiser le transfert de lit"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Même si le Bouddhisme ne définit pas de règles alimentaires spécifiques, certains bouddhistes sont végétariens en raison d'un interprétation stricte des Cinq Principes"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Un régime basé sur la croyance de ce qui aurait été consommé par Adam et Eve dans le Jardin d'Eden. Régulièrement soit végétarien, soit végan et principalement composé de fruits"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Régime Hallelujah : Une forme de végétarisme chrétien développé dans les années 70. Leurs créateurs interprètent un verset de la Bible comme suggérant que les chrétiens ne devraient consommer que des plantes à graines et des fruits."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Régimes hindous et jaïns : Les pratiquants de l'hindouisme et du jaïnisme suivent souvent un régime lacto-végétarien en application du principe d'Ahimsâ (non-violence)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Les musulmans suivent un régime uniquement composé de nourriture dite halal - autorisée par la loi islamique. L'opposé de halal est haraam, une nourriture interdite par l'Islam. Les denrées haraam incluent l'alcool, le porc et toutes la viande issue d'un animal qui n'aurait pas été abattu selon les méthodes islamiques de sacrifice rituel (Dhabiba)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal : Un ensemble de principes qui influence le régime de nombreux membre du mouvement Rastafari. Un de ces principes est la consommation de nourriture naturelle. Certains rastafariens interprètent l'I-tal pour promouvoir le végétarisme ou le véganisme"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Régime kacher : La nourriture autorisée par la cacherout, l'ensemble des lois alimentaires juives, est dite kacher. Certains aliments ou préparations sont non-kacher et l'impossibilité de préparer un aliment en respectant la cacherout peut rendre celui-ci non-kasher."
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Régime religieux"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Bouddhiste"
+msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
+msgid "Health Professional that discharged the patient"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edénique"
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Hallelujah"
+msgctxt "help:gnuhealth.patient,patient_status:"
+msgid "Show the hospitalization status of the patient"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Hindou"
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Musulman"
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
+msgctxt "model:gnuhealth.bed.transfer,name:"
+msgid "Bed transfers"
+msgstr ""
 
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Cachère"
+msgctxt "model:gnuhealth.bed.transfer.init,name:"
+msgid "Create Bed Transfer Init"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Utilisé dans le traitement des affections caractérisées par œdème, y compris ce qui suit: cirrhose du \nfoie avec ascite, Insuffisance Cardiaque Congestive - ICC, hypertension artérielle essentielle et les maladies rénales."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "Le régime elimine les aliments et condiments assaisonnés qui peuvent stimuler un inconfort gastrique et RGO"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Fournit des quantités contrôlées de sodium, cholestérol, graisses saturées et totale"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -763,27 +847,27 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/jour. Le régime fournit des quantités constantes de glucides en fonction du niveau calorique pour permettre le contrôle de la glycémie optimale. La dièt offre une collation au coucher pour tous les niveaux de calories. (45% glucides, 25% protéines, 30% matière grasse)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/jour. Le régime fournit des quantités constantes de glucides en fonction du niveau calorique pour permettre le contrôle de la glycémie optimale. Des collations entre les repas pour fournir environ 35-40% de Kcal de glucides."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "Le régime est indiqué pour une utilisation à court terme quand une maladie aiguë ou une intervention chirurgicale provoque une intolérance à la nourriture; ou pour restreindre temporairement le matériau non digérés dans le tractus gastro-intestinal. Le régime n'est pas nutritionnellement adéquate."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Alimentation liquide à base de produits sans sucre ( sans sucre concentré). Ce"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
@@ -832,19 +916,19 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "Liquides sans sucre"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "Facile à digérer, aliments semi-liquides à consommer en petites quantités."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "Aliments mous ou en purée qui sont faciles à mâcher et à digérer"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "Aliments mous comme par exemple des légumes cuits et de la viande tendre ou hachée"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
@@ -860,11 +944,11 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "Fournit moins de 30% d'énergie provenant des lipides."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "Pour les patients qui ont des difficultés à mâcher ou à avaler"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
@@ -876,7 +960,7 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "Le régime élimine certains aliments afin de fournir un niveau inférieur de bactéries que ce qui est présent dans un régime typique d'hôpital."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
@@ -886,7 +970,7 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Aliment à faible teneur en sucre, lipide, et lactose. Pas de liquides avec le repas. Snacks réguliers."
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
@@ -896,7 +980,7 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "Aucune modification du régime alimentaire nécessaire"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
@@ -906,7 +990,7 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "Le régime se compose de 6 petits repas par jour"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
@@ -914,19 +998,19 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "Thérapie Diététique"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 gr Sodium"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "fade"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "Cardiaque"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
@@ -938,55 +1022,55 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "Liquide Clair"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "Liquide Clair / Pas de sucre concentrés"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "Dysphagie Altérée"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "Dysphagie Avancée"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "Dysphagie Purée"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "Hyperemesis"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "Nourriture à la main"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "Seulement du liquide sans lactose"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "Seulement du liquide"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "Bypass Gastrique Étape 1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "Bypass Gastrique Étape 2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "Bypass Gastrique Étape 3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "Bypass Gastrique Étape 4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
@@ -994,59 +1078,71 @@ msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "Sans Gluten"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "Pauvre en matières grasses"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "Moux à macher"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "Sans sucre ajouté - SSA"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "Neutropénique"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "Rien par voie orale / RPVO"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "Post-Gastrectomie"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "PRERENALE"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "Normal"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "RENAL"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "Petits Repas Fréquents"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "Chirurgicale faible teneur en lactose"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "Diét Patient Hospitalisé"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "Médication Patient Hospitalisé"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
@@ -1054,280 +1150,305 @@ msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "Historique Médication Patient Hospitalisé"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "Historique d'admission du patient"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "Transfer Lit"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "Hospitalisations"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "Enregistrement du patient"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "Hospitalisations"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "Administration des patients"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "jours"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "heures"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "minutes"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "secondes"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "semaine"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "lorsque requis"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "Électif"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "Urgence"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "Maternité"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "Routine"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "Urgence"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Lacto végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Lacto-ovo végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Aucun"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Végétalien"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Végétarien"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Fait"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "annulé"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "confirmé"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "libre"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "hospitalisé"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Patient Transfert Lit"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Historique Transfert Lit"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Diét Description"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Régime lié à des croyances"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Thérapeutique Diét"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Diét Description et Indications"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Thérapeutique Diét"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Diét Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr ""
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Historique Médication Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Administration"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Effets indésirables et observations"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Dosage"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Info extra."
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Informations Générales"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Médication Patient Hospitalisé"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Médicaments"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Statut"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Période du traitement"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Données administratives"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Admission"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Admettez le patient dans l'institution et assignez le lit"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Annulé"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Annulé enregistrement"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "Annuler le processus d'enregistrement du patient ?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Plan de soins"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confirmez"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confirmez enregistrement / effectuez la réservation"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Sortie"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Sortie patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Info enregistrement du patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Info enregistrement du patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr ""
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrition"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Autres notes nutritionnelle / directions"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Admission patient"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "Transfert Patient"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "Annuler "
+msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index e38288b..53031e2 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,23 +1,14 @@
-# 
-# Translators:
-# Gabriele Meloncelli <gabriele.meloncelli at virgilio.it>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Selene <scordara at thymbra.com>, 2013
-# Selene <scordara at thymbra.com>, 2011, 2012
-# Selene <scordara at thymbra.com>, 2011
+# 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: 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"
+"PO-Revision-Date: 2016-01-08 11:15+0000\n"
+"Last-Translator: Anonymous Pootle User\n"
 "Language: it\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: 1452251707.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -27,19 +18,41 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "Hai scelto più di un record. Selezionane solo uno, grazie."
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "Il codice della dieta esiste già."
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
 msgstr "Il codice della dieta esiste già."
 
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
+
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "Nessun professionista sanitario associato a questo utente"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
 msgstr "Letto non disponibile"
 
@@ -51,6 +64,10 @@ msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
 msgstr "Il codice di iscrizione già esiste"
 
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
+
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
 msgstr "Registrazione Ricovere"
@@ -107,46 +124,14 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "Nuovo letto"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "Motivo"
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Codice"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Creare Data"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Creare utente"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Descrizione"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "Identificazione"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Fede"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nome"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Scrivere Data"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Scrivere nome utente"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "Codice"
@@ -219,6 +204,150 @@ msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
 msgstr "Scrivere nome utente"
 
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
 msgstr "Tempi di amministrazione"
@@ -447,22 +576,22 @@ msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
 msgstr "Creare Utente"
 
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Fede"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
-
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "Data prevista di dimissione"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
 msgstr "Programma dimissione"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
 msgstr ""
@@ -476,8 +605,8 @@ msgid "ID"
 msgstr "I"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Ulteriori informazioni"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -507,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "Paziente"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "Nome"
@@ -531,6 +664,18 @@ msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "Sequenza del Ricovero"
@@ -543,6 +688,22 @@ msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
 msgstr "osservazioni specifiche per questa dieta / paziente"
 
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
+
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
 msgstr "Effetti secondaro o reazioni avverse che abbia vissuto il paziente"
@@ -575,7 +736,9 @@ msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Periodo tra dose e dose (per esempio, 1 pillola ogni 8 ore, inserire 8 e selezionare \"ore\" nel campo unità"
+msgstr ""
+"Periodo tra dose e dose (per esempio, 1 pillola ogni 8 ore, inserire 8 e "
+"selezionare \"ore\" nel campo unità"
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
@@ -585,7 +748,9 @@ msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Scegliere una malattia per questo medicamento dalla lista malattie. Può essere una già esistente o di prevenzione"
+msgstr ""
+"Scegliere una malattia per questo medicamento dalla lista malattie. Può "
+"essere una già esistente o di prevenzione"
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
@@ -635,19 +800,34 @@ msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
 msgstr "Motivo del Ricovero"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Introdurre la fede o la religione del paziente per scegliere la dieta corretta"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
 msgstr "Trasferimenti di letto"
@@ -656,104 +836,30 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "Crea un trasferimento di letto"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Anche se il Buddismo non ha specifiche regole dietetiche, alcuni buddisti sono vegetariani in ossequio a una interpretazione stretta dei Cinque Precetti"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Una dieta basata su ciò che si pensa mangiassero Adamo ed Eva nel Giardino dell'Eden. Solitamente vegetariana o vegana, e basata principalmente sulla frutta"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Dieta Alleluia: Forma di vegetarianesimo cristiano sviluppatosi negli anni '70. I creatori interpretano un verso della Bibbia come suggerimento che i Cristiani dovrebbero cibarsi solo di piante e frutti con semi."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Dieta Indù e Giainista: I seguaci dell'Induismo e del Giainismo spesso seguno una dieta latto-vegetariana, basata sul principio dell'Ahimsa (nonviolenza)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "I Musulmani seguono una dieta che consiste unicamente di cibo halal, ovvero consentito dalla legge islamica. L'opposto di halal è haram, cibo che  non è islamicamente ammissibile. Le materie prime haram includono alcol, maiale e qualsiasi carne proveniente da animali non uccisi secondoil metodo islamico di macellazion rituale (Dhabiha)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal: Un insieme di principi che influenzano la dieta di molti membri del movimento Rastafari. Un principio è che devono essere consumati cibi naturali. Alcuni membri del movimento ritengono che I-tal promuova la dieta vegetariana o quella vegana"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Dieta Kosher: I cibi permessi dal Kashrut, l'insieme delle leggi alimentari dell'Ebraismo, sono detti Kosher. Qualche cibo e combinazione di cibi non sono Kosher e la mancata preparazione del cibo secondo  il Kashrut può rendere non Kosher alimenti che altrimenti lo sarebbero."
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Dieta per Fede"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Buddista"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edenista"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Alleluia"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Indù"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "Islamico"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Kosher"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Usato nella cura di condizioni caratterizate da edema, incluse le seguenti: cirrosi del\nfegato con ascite, Insufficienza Cardiaca Congestizia, ipertensione essenziale e malattie renali."
+msgstr ""
+"Usato nella cura di condizioni caratterizate da edema, incluse le seguenti: "
+"cirrosi del\n"
+"fegato con ascite, Insufficienza Cardiaca Congestizia, ipertensione "
+"essenziale e malattie renali."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "La dieta elimina i cibi stagionati e i condimenti che possono stimolare sofferenza gastrica e MRGE"
+msgstr ""
+"La dieta elimina i cibi stagionati e i condimenti che possono stimolare "
+"sofferenza gastrica e MRGE"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Fornisce quantità controllate di sodio, colesterolo, grassi saturi e grassi totali"
+msgstr ""
+"Fornisce quantità controllate di sodio, colesterolo, grassi saturi e grassi "
+"totali"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -761,45 +867,73 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/gg .La dieta fornisce una quantità appropriata di carboidrati basata sul livello calorico per permettere un controllo ottimale del livello ematico di glucosio. La dieta fornisce uno spuntino prima di coricarsi per tutti i livelli di calorie  levels. (45% Carboidrati, 25% proteine, 30% fat-grassi)"
+msgstr ""
+"1200-3000 cal/gg .La dieta fornisce una quantità appropriata di carboidrati "
+"basata sul livello calorico per permettere un controllo ottimale del livello "
+"ematico di glucosio. La dieta fornisce uno spuntino prima di coricarsi per "
+"tutti i livelli di calorie  levels. (45% Carboidrati, 25% proteine, 30% fat-"
+"grassi)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/gg . La dieta fornisce una quantità appropriata di carboidrati basata sul livello calorico per permettere un controllo ottimale del livello ematico di glucosio. Vengono forniti spuntini tra un pasto e l'altro per garantire il 35-40% o di Kcal da carboidrati."
+msgstr ""
+"1800-3000 cal/gg . La dieta fornisce una quantità appropriata di carboidrati "
+"basata sul livello calorico per permettere un controllo ottimale del "
+"livello ematico di glucosio. Vengono forniti spuntini tra un pasto e l'altro "
+"per garantire il 35-40% o di Kcal da carboidrati."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "La dieta è indicata per brevi periodi in tutti i casi in cui una malattia acuta o il trattamento chirurgico causano una intolleranza al cibo; oppure per confinare il materiale non digerito nel tratto gastrointestinale. La dieta non è nutrizionalmente adeguata."
+msgstr ""
+"La dieta è indicata per brevi periodi in tutti i casi in cui una malattia "
+"acuta o il trattamento chirurgico causano una intolleranza al cibo; oppure "
+"per confinare il materiale non digerito nel tratto gastrointestinale. La "
+"dieta non è nutrizionalmente adeguata."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Dieta liquida trasparente che fornisce solo prodotti senza zucchero (senza zucchero concentrato). Questa dieta fornisce un apporto di carboidrati molto limitato."
+msgstr ""
+"Dieta liquida trasparente che fornisce solo prodotti senza zucchero (senza "
+"zucchero concentrato). Questa dieta fornisce un apporto di carboidrati molto "
+"limitato."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Alterata meccanicamente. Le carni  sono macinate o tritate. I cibi sono umidi, morbidi e facilmente riducibili a bolo. Tutte le verdure\nsono schiacciabili con la forchetta. I liquidi devono essere ordinati separatamente come normale, nettare o miele."
+msgstr ""
+"Alterata meccanicamente. Le carni  sono macinate o tritate. I cibi sono "
+"umidi, morbidi e facilmente riducibili a bolo. Tutte le verdure\n"
+"sono schiacciabili con la forchetta. I liquidi devono essere ordinati "
+"separatamente come normale, nettare o miele."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "I cibi hanno consistenza quasi uniforme con l'eccezione dei cibi duri, collosi o croccanti. I cibi sono formati da bocconi umidi. Tutte⏎\nle verdure sono schiacciabili con la forchetta. I liquidi devono essere ordinati separatamente come normale, nettare o miele."
+msgstr ""
+"I cibi hanno consistenza quasi uniforme con l'eccezione dei cibi duri, "
+"collosi o croccanti. I cibi sono formati da bocconi umidi. Tutte⏎\n"
+"le verdure sono schiacciabili con la forchetta. I liquidi devono essere "
+"ordinati separatamente come normale, nettare o miele."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "Per i pazienti che hanno problemi nel masticare e inghiottire o infiammazioni o varici esofagee.  La consistenza del cibo è amalgamata.  I liquidi devono essere ordinati\nseparatamente come normale, nettare o miele."
+msgstr ""
+"Per i pazienti che hanno problemi nel masticare e inghiottire o "
+"infiammazioni o varici esofagee.  La consistenza del cibo è amalgamata.  I "
+"liquidi devono essere ordinati\n"
+"separatamente come normale, nettare o miele."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -807,26 +941,39 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "La dieta fornisce cibi insipidi, a temperatura ambiente o freddi separati in solidi e liquidi. I pazienti con questo regime dietetico possono richiedere cibi addizionali che ritengono di poter tollerare. I pazienti vengono incoraggiati a separare l'assunzione di cibo da quella delle bevande."
+msgstr ""
+"La dieta fornisce cibi insipidi, a temperatura ambiente o freddi separati in "
+"solidi e liquidi. I pazienti con questo regime dietetico possono richiedere "
+"cibi addizionali che ritengono di poter tollerare. I pazienti vengono "
+"incoraggiati a separare l'assunzione di cibo da quella delle bevande."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "Indicata per pazienti che non possono utilizzare utensili o pazienti costretti a una posizione orizzontale che richiedono cibi salutari per il cuore."
+msgstr ""
+"Indicata per pazienti che non possono utilizzare utensili o pazienti "
+"costretti a una posizione orizzontale che richiedono cibi salutari per il "
+"cuore."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "Questa dieta è utilizzata frequentemente per pazienti di chirurgia ginecologica. Fornisce cibi come zuppe non a base di crema, gelatine, succhi, latte senza lattosio, te e caffè."
+msgstr ""
+"Questa dieta è utilizzata frequentemente per pazienti di chirurgia "
+"ginecologica. Fornisce cibi come zuppe non a base di crema, gelatine, "
+"succhi, latte senza lattosio, te e caffè."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "La dieta consiste di cibi che sono liquidi a temperatura corporea. Questi cibi sono facili da digerire e forniscono uno stimolo minimale al tratto gastrointestinale. La dieta non è nutrizionalmente adeguata."
+msgstr ""
+"La dieta consiste di cibi che sono liquidi a temperatura corporea. Questi "
+"cibi sono facili da digerire e forniscono uno stimolo minimale al tratto "
+"gastrointestinale. La dieta non è nutrizionalmente adeguata."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
@@ -834,7 +981,8 @@ msgstr "Fluidi senza zucchero"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "Cibi semiliquidi facilmente digeribili da consumarsi in quantità limitate."
+msgstr ""
+"Cibi semiliquidi facilmente digeribili da consumarsi in quantità limitate."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
@@ -848,13 +996,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "La dieta limita i cibi grezzi, molto stagionati e fritti. La dieta contiene solo moderatequantità di fibre"
+msgstr ""
+"La dieta limita i cibi grezzi, molto stagionati e fritti. La dieta contiene "
+"solo moderatequantità di fibre"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "La dieta elimina cibi preparati con glutine. La dieta è il mezzo principale per la cura della sprue celiaca"
+msgstr ""
+"La dieta elimina cibi preparati con glutine. La dieta è il mezzo principale "
+"per la cura della sprue celiaca"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
@@ -868,13 +1020,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4 grammi di sodio. Fornisce una moderata restrizione del sodio eliminando cibi e condimenti con alte quantità di sodio"
+msgstr ""
+"4 grammi di sodio. Fornisce una moderata restrizione del sodio eliminando "
+"cibi e condimenti con alte quantità di sodio"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "La dieta elimina certi cibi per fornire un livello inferiore di batteri rispetto a quello presente in una tipica dieta ospedaliera"
+msgstr ""
+"La dieta elimina certi cibi per fornire un livello inferiore di batteri "
+"rispetto a quello presente in una tipica dieta ospedaliera"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
@@ -884,13 +1040,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Cibi a basso tenore di zucchero, grasso e lattosio. Nessun fluido durante i pasti. Pasti piccoli e frequenti"
+msgstr ""
+"Cibi a basso tenore di zucchero, grasso e lattosio. Nessun fluido durante i "
+"pasti. Pasti piccoli e frequenti"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "Fornisce un apporto limitato di proteine (40-60g/gg), potassio (2g/gg) e sodio (2g/gg) per il paziente in pre-dialisi."
+msgstr ""
+"Fornisce un apporto limitato di proteine (40-60g/gg), potassio (2g/gg) e "
+"sodio (2g/gg) per il paziente in pre-dialisi."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
@@ -900,7 +1060,9 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "Fornisce un apporto adeguato di proteine (80 - 100g/gg) e apporti limitati di potassio (2g) e sodio (2g) per il paziente dializzato."
+msgstr ""
+"Fornisce un apporto adeguato di proteine (80 - 100g/gg) e apporti limitati "
+"di potassio (2g) e sodio (2g) per il paziente dializzato."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
@@ -908,7 +1070,9 @@ msgstr "La dieta fornisce 6 piccoli pasti al giorno"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "Cibi morbidi e insipidi con basso contenuto di fibre. Il lattosio è limitato."
+msgstr ""
+"Cibi morbidi e insipidi con basso contenuto di fibre. Il lattosio è "
+"limitato."
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
@@ -1042,6 +1206,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "Dieta del Paziente"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "Medicazione del Paziente"
@@ -1058,23 +1234,114 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "Storia Clinica Ricovero del Paziene"
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "Trasferimento di Letto"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "Ricoveri"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Ricovero"
 
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Ricovero"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
 msgstr "Ricoveri"
@@ -1083,6 +1350,82 @@ msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
 msgstr "Amministrazione Ricovero Health"
 
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
 msgstr "giorni"
@@ -1108,6 +1451,10 @@ msgid "when required"
 msgstr "quando necessario"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "Elettivo"
 
@@ -1127,33 +1474,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "Urgente"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Latto vegetariana"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Latto-ovo vegetariana"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Nessuno"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescetariana"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Vegana"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Fatto"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1171,156 +1522,6 @@ msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "Ricoverato"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Trasferimento di Letto del Paziente"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Storia dei Trasferimenti di Letto"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Descrizione della Dieta"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Dieta dettata dalla fede"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Dieta Terapeutica"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Descrizione della Dieta e Indicazioni"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Dieta Terapeutica"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Dieta del Paziente"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "Tempi Amministrativi per la Medicazione del Paziente"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Registro delle Medicazioni del Paziente"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Amministrazione"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Reazioni Avverse e note"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Dosaggio"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "informazioni extra"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Informazioni generali"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Medicazione del Paziente"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Farmaci"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Stato"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "periodo di trattamento"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Dati amministrativi"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Ricovero"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Ricoverare il paziente nell` istituto sanitario e asseganre un letto"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Cancellare"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Cancellare Ricovero"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "Cancellare il processo di registrazione del paziente ?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Programma di assistenza"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confermare"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confermare Registrazione / Fare una prenotazione"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Dimettere"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Dimettere il paziente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Informazioni registrazione Ricovero"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Informazioni registrazione Ricovero"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr ""
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrizione"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Altre note / istruzioni sulla nutrizione"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Ricovero paziente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr ""
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/locale/zh_CN.po b/locale/kn.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/kn.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/kn.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/lo.po
similarity index 56%
copy from locale/zh_CN.po
copy to locale/lo.po
index 317d24d..5af0416 100644
--- a/locale/zh_CN.po
+++ b/locale/lo.po
@@ -1,755 +1,845 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+#
 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
-msgstr "你选择看不止1条记录。请只选择1条。"
-
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
 
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
-msgstr "没有为用户指定健康专家"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
-msgstr "床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Destination bed unavailable"
-msgstr "目标床位不可用"
+msgstr ""
 
 msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
-msgstr "注册代码已经存在了"
+msgstr ""
+
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
 
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_from:"
 msgid "From"
-msgstr "原来的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,bed_to:"
 msgid "To"
-msgstr "转入的床位"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,reason:"
 msgid "Reason"
-msgstr "换床位原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,transfer_date:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
-msgstr "新床位"
+msgstr ""
+
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
 
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
-msgstr "原因 "
-
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
-msgstr "代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,description:"
 msgid "Indications"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,name:"
 msgid "Diet type"
-msgstr "饮食类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.diet.therapeutic,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,diet:"
 msgid "Diet"
-msgstr "饮食"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,remarks:"
 msgid "Remarks / Directions"
-msgstr "记录/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
-msgstr "管理时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Adverse Reactions"
-msgstr "不良反应"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,course_completed:"
 msgid "Course Completed"
-msgstr "疗程结束"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued:"
 msgid "Discontinued"
-msgstr "停产"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Reason for discontinuation"
-msgstr "停产原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,end_treatment:"
 msgid "End"
-msgstr "结束日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,form:"
 msgid "Form"
-msgstr "类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency:"
 msgid "Frequency"
-msgstr "频率"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "PRN"
-msgstr "需要时"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "unit"
-msgstr "单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,indication:"
 msgid "Indication"
-msgstr "指示"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,is_active:"
 msgid "Active"
-msgstr "活跃"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,log_history:"
 msgid "Log History"
-msgstr "日志历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,qty:"
 msgid "x"
-msgstr "x"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,route:"
 msgid "Administration Route"
-msgstr "管理路线"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Start"
-msgstr "开始"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,admin_time:"
 msgid "Time"
-msgstr "时间"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.admin_time,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,admin_time:"
 msgid "Date"
-msgstr "日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose:"
 msgid "Dose"
-msgstr "剂量"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "dose unit"
-msgstr "剂量单位"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,health_professional:"
 msgid "Health Professional"
-msgstr "专业卫生机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,name:"
 msgid "Medication"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,remarks:"
 msgid "Remarks"
-msgstr "备注"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.medication.log,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,admission_type:"
 msgid "Admission type"
-msgstr "入院类型"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,attending_physician:"
 msgid "Attending Physician"
-msgstr "主治医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed:"
 msgid "Hospital Bed"
-msgstr "病床"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,bed_transfers:"
 msgid "Transfer History"
-msgstr "换床位历史"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
-msgstr "预计出院日期"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
-msgstr "出院计划"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
-msgstr "出院"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,hospitalization_date:"
 msgid "Hospitalization date"
-msgstr "住院日"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
-msgstr "机构"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,medications:"
 msgid "Medications"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,name:"
 msgid "Registration Code"
-msgstr "注册代码"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nursing_plan:"
 msgid "Nursing Plan"
-msgstr "护理计划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,nutrition_notes:"
 msgid "Nutrition notes / directions"
-msgstr "饮食建议/指导"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,operating_physician:"
 msgid "Operating Physician"
-msgstr "操作医师"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
-msgstr "患者"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,state:"
 msgid "Status"
-msgstr "状况"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,therapeutic_diets:"
 msgid "Meals / Diet Program"
-msgstr "伙食/饮食规划"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
-msgstr "住院序列"
+msgstr ""
 
 msgctxt "help:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Enter the patient hospitalization code"
-msgstr "输入病人的住院编号"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
-msgstr "该饮食/病人的详细记录"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "患者经历过的副作用或不良反应"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
-msgstr "这种药剂的标准用量频率"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,discontinued_reason:"
 msgid "Short description for discontinuing the treatment"
-msgstr "停止治疗的简短说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,end_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,form:"
 msgid "Drug form, such as tablet or gel"
-msgstr "剂型,如片剂或凝胶"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "间隔时间,患者在服用一剂量药后需等待的时间(每8小时1丸,即在这里8,选择\"时\",在单位栏)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
-msgstr "使用这个必须的,临时事件"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "对这种药物从疾病清单选择一种病列。它可以是一个现有的疾病或预防性"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
-msgstr "选中此项,如果病人当前服用此药品"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,medicament:"
 msgid "Prescribed Medicament"
-msgstr "订明的药剂"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,qty:"
 msgid "Quantity of units (eg, 2 capsules) of the medicament"
-msgstr "药剂的数量单位(例如,2粒)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,route:"
 msgid "Drug administration route code."
-msgstr "药品监督管理路由代码"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication,start_treatment:"
 msgid "Date of start of Treatment"
-msgstr "治疗开始时间"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.admin_time,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose:"
 msgid "Amount of medication (eg, 250 mg) per dose"
-msgstr "每剂用药量(如250毫克)"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,dose_unit:"
 msgid "Unit of measure for the medication to be taken"
-msgstr "要采取药物计量单位"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.medication.log,remarks:"
 msgid "specific remarks for this dose"
-msgstr "这一剂量的详细记录"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
-msgstr "入院原因"
+msgstr ""
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
-msgstr "健康专家允许病人出院"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
-msgstr "病床转移"
+msgstr ""
 
 msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
-msgstr "创建病床转移初始化"
-
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "使用在包括带有腹水的肝硬变,充血性心力衰竭,特发性高血压,肾疾病下等以水肿作为特征的情况下治疗方法"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "这种食谱去除了会刺激嘈杂病或者胃食管反流病的风干食物和调味品。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "提供适量的钠、胆固醇、饱和全脂"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -757,45 +847,45 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "每天1800-3000卡路里。根据热量水平,这种食谱提供一致的碳水化合物以允许最佳的血糖控制。饭间小吃从胆固醇中提供大约35-40%千卡的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "该食谱适应于短期使用,每当急性疾病或手术导致不耐受食物,或者临时的肠胃道不消化食物限制。该食谱营养不足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "透明液体饮食只提供无糖产品(无浓缩糖)。该食谱提供了非常有限的碳水化合物。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "机械地改变。肉是磨碎或者切碎的。食物是微湿的,柔软织地粗糙的,并且容易形成丸。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "食物是接近常规的口感,除了硬、粘性或松脆的食物。所有的蔬菜要叉式混搭。饮料必须按照常规、果汁饮料、蜂蜜分开整理。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "对于那些咀嚼困难或者或有食道炎或者食道静脉曲张的病人来说,食物是混杂的。定期单独食用液态食物,如花蜜或者蜂蜜等等"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -803,525 +893,562 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "适用于那些可能无法使用炊具的病人或者那些需要健康食物的平躺病人。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "这种饮食经常使用于妇科手术患者,提供食物,例如无添加奶油的汤,果子冻,果汁,Lactaid牛奶,茶和咖啡"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "饮食由体温温度的液体组成。食物易于消化并使其对胃肠道刺激最小。但饮食营养不充足。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
-msgstr "无糖液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "易于消化,半流质的食物将少量使用"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
-msgstr "质软或者煮烂的食物容易咀嚼和消化"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB4"
 msgid "Soft foods such as cooked vegetables and soft or ground meats"
-msgstr "软质食品比如煮好的蔬菜或者肉馅"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "食用大多数原料,精心调味和油炸食品。这样的饮食中只含有适量的纤维"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "饮食中省略了面筋食品加工。合理饮食是治疗脂肪痢的主要手段"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
-msgstr "脂肪中提供至少30%的能量"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:MS"
 msgid "For patients who have difficulty in chewing or swallowing"
-msgstr "对于那些嚼咽比较困难的人来说"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4克钠.通过淘汰钠含量高的食物和调味品来提供了一个温和的钠限制"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "食谱中排除某些食物,使得该食谱比典型的医院食谱中含有细菌水平更低。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
-msgstr "禁食,停止病人口服食物和液体"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "低糖、低脂、低乳糖食物。不喝汤。少吃多食。"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "对于要做透析的病人,要提供限量的蛋白质(40-60g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
-msgstr "不需要修改饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "对于做了透析的病人,要提供足够的蛋白质(80-100g/d)、限量钾(2g)、限量钠(2g)"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
-msgstr "这种食疗每天需要6餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SLL"
 msgid "Soft bland foods that have low fiber content. Lactose is limited."
-msgstr "软质食物含有纤维较少。乳糖也很有限"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:"
 msgid "Diet Therapy"
-msgstr "食疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:2GS"
 msgid "2 gram Sodium"
-msgstr "2 g 钠"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:BLAND"
 msgid "Bland"
-msgstr "平淡口味的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CARDIAC"
 msgid "Cardiac"
-msgstr "心脏的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CCH"
 msgid "Consistent Carbohydrate"
-msgstr "固定碳水混合物"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CDD"
 msgid "Gestational Diabetic Diet"
-msgstr "妊娠期的糖尿病患者的饮食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUID"
 msgid "Clear Liquid"
-msgstr "清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:CLIQUIDNCS"
 msgid "Clear Liquid / NCS"
-msgstr "清液/低糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSA"
 msgid "Dysphagia Altered"
-msgstr "改变吞咽方式"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSAD"
 msgid "Dysphagia Advanced"
-msgstr "先进吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:DYSP"
 msgid "Dysphagia Puree"
-msgstr "煮烂吞咽"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:EMESIS"
 msgid "Hyperemesis"
-msgstr "剧吐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FINGERFOOD"
 msgid "Finger Food"
-msgstr "零食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FLLF"
 msgid "Full Liquid Lactose Free"
-msgstr "不含乳糖的清液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:FULLLIQUID"
 msgid "Full Liquid"
-msgstr "全液"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB1"
 msgid "Gastric Bypass Stage 1"
-msgstr "胃癌期1"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB2"
 msgid "Gastric Bypass Stage 2"
-msgstr "胃癌期2"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB3"
 msgid "Gastric Bypass Stage 3"
-msgstr "胃癌期3"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GB4"
 msgid "Gastric Bypass Stage 4"
-msgstr "胃癌期4"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GISOFT"
 msgid "GI Soft - Low Residue"
-msgstr "胃肠道软质-低残渣"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:GLUTENFREE"
 msgid "Gluten Free"
-msgstr "无谷蛋白,无谷胶"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:LOWFAT"
 msgid "Low-Fat"
-msgstr "低脂的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:MS"
 msgid "Mechanical Soft / Dental Soft"
-msgstr "机械性软/牙科软"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NAS"
 msgid "Not Added Salt - NAS"
-msgstr "不加盐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NEUTROPENIC"
 msgid "Neutropenic"
-msgstr "中性白细胞减少症的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:NPO"
 msgid "Nothing by Mouth / NPO "
-msgstr "禁食,绝食"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PGMY"
 msgid "Post-Gastrectomy"
-msgstr "胃切除术后"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:PRERENAL"
 msgid "PRERENAL"
-msgstr "肾前的"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:REG"
 msgid "Regular"
-msgstr "定期"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:RENAL"
 msgid "RENAL"
-msgstr "肾"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SFM"
 msgid "Small Frequent Meals"
-msgstr "少吃多餐"
+msgstr ""
 
 msgctxt "model:gnuhealth.diet.therapeutic,name:SLL"
 msgid "Surgical Low Lactose"
-msgstr "外科手术中低乳糖"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
-msgstr "住院饮食"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
-msgstr "住院药物治疗"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.admin_time,name:"
 msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.medication.log,name:"
 msgid "Inpatient Medication Log History"
-msgstr "住院药物治疗日志历史"
+msgstr ""
 
 msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
-msgstr "病人入院历史"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
-msgstr "病床转移"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
 
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
-msgstr "住院登记"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
-msgstr "住院治疗"
+msgstr ""
 
 msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
-msgstr "住院健康管理"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
-msgstr "天"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "hours"
-msgstr "小时"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "minutes"
-msgstr "分"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "seconds"
-msgstr "秒"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "weeks"
-msgstr "周"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "when required"
-msgstr "必要时"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
-msgstr "非急需的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Emergency"
-msgstr "紧急的"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Maternity"
-msgstr "妇产科"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Routine"
-msgstr "日常工作"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
-msgstr "紧急的"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Discharged - needs cleaning"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
-msgstr "已取消"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "confirmed"
-msgstr "已确认"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "free"
-msgstr "免费"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
-msgstr "入院"
-
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
-msgstr "转移病人"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.bed.transfer.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 8006f13..741901f 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,25 +1,14 @@
-# 
-# Translators:
-# carlo giusepe tadei valente sasaki <carlo.gt.valente at gmail.com>, 2014
-# Felipe Barros <facbarros at gmail.com>, 2011
-# Flávio Veras <flaviove at gmail.com>, 2013
-# Frederico Ribeiro <freddy.boc at gmail.com>, 2013
-# Paulo Nunes <paulonunes at gmail.com>, 2012
-# Roberto Vasconcelos Novaes <rvnovaes at gmail.com>, 2014
-# Sandro Regis Cardoso <projetaty at gmail.com>, 2013
+# 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.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -29,19 +18,41 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "Você escolheu mais de 1 registro. Seleccionar apenas um"
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "O código da dieta já existe"
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
 msgstr "O código da dieta já existe"
 
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
+
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "Nenhum profissional de saúde associado a este usuário"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
 msgstr "Leito indisponível"
 
@@ -53,6 +64,10 @@ msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
 msgstr "O código de registro já existe"
 
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
+
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
 msgstr "Registro da internação"
@@ -109,46 +124,14 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "Novo Leito"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "Razão"
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "Código"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "Data de criação"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "Criado por"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "Descrição"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "Crença"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "Nome"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "Data de gravação"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "Criado por"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "Código"
@@ -221,6 +204,150 @@ msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
 msgstr "Criado por"
 
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
 msgstr "Horários de administração"
@@ -449,22 +576,22 @@ msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
 msgstr "Criado por"
 
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "Religião"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
-
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "Data Esperada de Alta"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
 msgstr "Plano de Alta"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
 msgstr "Recebeu Alta de"
@@ -478,8 +605,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "Informações Extras"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -509,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "Paciente"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "Nome"
@@ -533,6 +664,18 @@ msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "Sequência de Internação"
@@ -545,9 +688,26 @@ msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
 msgstr "observações específicas para esta dieta / paciente"
 
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
+
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
-msgstr "Os efeitos colaterais ou reações adversas que o experimentadas pelo paciente"
+msgstr ""
+"Os efeitos colaterais ou reações adversas que o experimentadas pelo paciente"
 
 msgctxt "help:gnuhealth.inpatient.medication,common_dosage:"
 msgid "Common / standard dosage frequency for this medicament"
@@ -577,7 +737,10 @@ msgctxt "help:gnuhealth.inpatient.medication,frequency:"
 msgid ""
 "Time in between doses the patient must wait (ie, for 1 pill each 8 hours, "
 "put here 8 and select \"hours\" in the unit field"
-msgstr "Intervalor entre as doses que deve ser observado pelo paciente  (ou seja, para um comprimido a cada 8 horas, colocar aqui 8 e selecione \"horas\" no campo de unidade)"
+msgstr ""
+"Intervalor entre as doses que deve ser observado pelo paciente  (ou seja, "
+"para um comprimido a cada 8 horas, colocar aqui 8 e selecione \"horas\" no "
+"campo de unidade)"
 
 msgctxt "help:gnuhealth.inpatient.medication,frequency_prn:"
 msgid "Use it as needed, pro re nata"
@@ -587,7 +750,9 @@ msgctxt "help:gnuhealth.inpatient.medication,indication:"
 msgid ""
 "Choose a disease for this medicament from the disease list. It can be an "
 "existing disease of the patient or a prophylactic."
-msgstr "Escolher uma doença relativa a este medicamento a partir da lista de doenças. Pode ser uma doença do paciente ou de um profilático existente."
+msgstr ""
+"Escolher uma doença relativa a este medicamento a partir da lista de "
+"doenças. Pode ser uma doença do paciente ou de um profilático existente."
 
 msgctxt "help:gnuhealth.inpatient.medication,is_active:"
 msgid "Check if the patient is currently taking the medication"
@@ -637,19 +802,34 @@ msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
 msgstr "Motivo da Admissão"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "Digite a crença ou religião do paciente para escolher a dieta apropriada"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr "Profissional de saúde que deu alta ao paciente"
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
 msgstr "Transferências de leito"
@@ -658,104 +838,30 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "Criar Init da Transferência de Leito"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "Embora o budismo não tem regras dietéticas específicas, alguns budistas praticam o vegetarianismo baseado em uma interpretação estrita do primeiro dos Cinco Preceitos"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "Uma dieta com base no que se acredita que Adão e Eva consumiram no Jardim do Éden. Geralmente ou vegetariano ou vegan, com base predominantemente de frutas"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "Dieta Aleluia: A forma de vegetarianismo do Cristianismo desenvolvido na década de 1970. Os criadores interpretam um versículo da Bíblia como sugerindo que os cristãos só devem consumir plantas com sementes e frutas."
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "Dietas hindus e jainistas: Seguidores do hinduísmo e do jainismo muitas vezes seguem dietas lacto-vegetarianas, com base no princípio da Ahimsa (não prejudicar)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "Os muçulmanos seguem uma dieta constituída exclusivamente de alimentos que são halal - permitidos pela lei islâmica. O oposto do halal é haraam, o alimento que é islamicamente inadmissível. Substâncias haraam incluem o álcool, carne de porco, e toda a carne de um animal que não foi morto pelo método islâmico de abate ritual (Dhabiha)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal: Um conjunto de princípios que influenciam a dieta de muitos membros do movimento Rastafari. Um princípio é que os alimentos naturais devem ser consumidos. Alguns rastafaris interpretam I-tal para defender o vegetarianismo ou o veganismo"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "Dieta Kosher: alimentos permitidos sob o Kashrut, o conjunto de leis dietéticas judaicas, é dito Kosher. Alguns alimentos e combinações de alimentos são não-Kosher, e o fracasso para preparar o alimento de acordo com Kashrut pode fazer alimentos de outra forma admissíveis não Kosher."
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "Dieta pela crença"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "Budista"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "Edênico"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "Aleluia"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "Hindu"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "islâmico"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "I-tal"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "Kosher"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
 "liver with ascites, Congested Heart Failure - CHF, essential hypertension and renal disease."
-msgstr "Usados ​​no tratamento de condições caracterizadas por edema, incluindo o seguinte: cirrose\nhepática com ascite, falha congestionada coração - ICC, hipertensão essencial e doença renal."
+msgstr ""
+"Usados ​​no tratamento de condições caracterizadas por edema, incluindo o "
+"seguinte: cirrose\n"
+"hepática com ascite, falha congestionada coração - ICC, hipertensão "
+"essencial e doença renal."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:BLAND"
 msgid ""
 "The diet eliminates seasoned foods and condiments that may stimulate gastric"
 " discomfort and GERD"
-msgstr "A dieta elimina alimentos temperados e condimentos que podem estimular  desconforto gástrico e refluxo"
+msgstr ""
+"A dieta elimina alimentos temperados e condimentos que podem estimular  "
+"desconforto gástrico e refluxo"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CARDIAC"
 msgid ""
 "Provides controlled amounts of sodium, cholesterol, saturated and total fat"
-msgstr "Fornece quantidades controladas de sódio, colesterol, gordura saturada e gordura total"
+msgstr ""
+"Fornece quantidades controladas de sódio, colesterol, gordura saturada e "
+"gordura total"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CCH"
 msgid ""
@@ -763,45 +869,72 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "1200-3000 cal/dia. A dieta fornece quantidade consistente de cabohidratos com base no nível de calorias para permitir um ótimo controle da glicose no sangue. A dieta fornece um lanche no horário de dormir para todos os níveis de calorias. (45% de CHO, 25% de proteína, 30% de gordura)"
+msgstr ""
+"1200-3000 cal/dia. A dieta fornece quantidade consistente de cabohidratos "
+"com base no nível de calorias para permitir um ótimo controle da glicose no "
+"sangue. A dieta fornece um lanche no horário de dormir para todos os níveis "
+"de calorias. (45% de CHO, 25% de proteína, 30% de gordura)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
 "1800-3000 cal/day .The diet provides consistent amount of carbohydrate based"
 " on caloric level to allow for optimal blood glucose control. Snacks "
 "provided between meals to provide approximately 35-40% of Kcal from CHO."
-msgstr "1800-3000 cal/dia. A dieta fornece quantidade constante de hidratos de carbono com base no nível de calorias para permitir um ótimo controle da glicose no sangue. Lanches entre as refeições fornecidas para fornecer cerca de 35-40% de Kcal de CHO."
+msgstr ""
+"1800-3000 cal/dia. A dieta fornece quantidade constante de hidratos de "
+"carbono com base no nível de calorias para permitir um ótimo controle da "
+"glicose no sangue. Lanches entre as refeições fornecidas para fornecer cerca "
+"de 35-40% de Kcal de CHO."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUID"
 msgid ""
 "The diet is indicated for short-term use whenever an acute illness or "
 "surgery causes intolerance to food; or to temporarily restrict undigested "
 "material in the GI tract. The diet is not nutritionally adequate."
-msgstr "A dieta é indicada para uso a curto prazo, sempre que uma doença aguda ou cirurgia provoca intolerância a alimentos, ou para restringir temporariamente o material não digerido no tratatamento GI. A dieta não é nutricionalmente adequada."
+msgstr ""
+"A dieta é indicada para uso a curto prazo, sempre que uma doença aguda ou "
+"cirurgia provoca intolerância a alimentos, ou para restringir "
+"temporariamente o material não digerido no tratatamento GI. A dieta não é "
+"nutricionalmente adequada."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CLIQUIDNCS"
 msgid ""
 "Clear liquid diet providing sugar-free products only (No Concentrated "
 "Sugar). This diet provides very limited amounts of carbohydrate."
-msgstr "Apenas produtos Limpar dieta líquida fornecendo cana-de-livre (sem concentradoAçúcar). Esta dieta fornece quantidades muito limitadas de hidratos de carbono."
+msgstr ""
+"Apenas produtos Limpar dieta líquida fornecendo cana-de-livre (sem "
+"concentradoAçúcar). Esta dieta fornece quantidades muito limitadas de "
+"hidratos de carbono."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSA"
 msgid ""
 "Mechanically altered. Meats are ground or minced. Foods are moist, soft-textured, and easily formed into a bolus. All vegetables\n"
 "are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Mecanicamente alterados. Carnes são moídos ou picados. Foods são úmidos, de textura macia, e facilmente formado em um bolus. Todos os vegetaisSão derivados-Mashable. Líquidos devem ser pedidos separadamente como regular, néctar ou mel."
+msgstr ""
+"Mecanicamente alterados. Carnes são moídos ou picados. Foods são úmidos, de "
+"textura macia, e facilmente formado em um bolus. Todos os vegetaisSão "
+"derivados-Mashable. Líquidos devem ser pedidos separadamente como regular, "
+"néctar ou mel."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSAD"
 msgid ""
 "Foods are nearly regular textures with the exception of hard, sticky, or crunchy foods. Foods are moist, bite-sized pieces. All\n"
 "vegetables are fork-mashable. Liquids must be ordered separately as regular, nectar, or honey."
-msgstr "Os alimentos são texturas quase regulares, com exceção de alimentos pegajosos, ou crocante difíceis. Foods são úmidas, pedaços pequenos. AllVegetais são derivados-Mashable. Líquidos devem ser pedidos separadamente como regular, néctar ou mel."
+msgstr ""
+"Os alimentos são texturas quase regulares, com exceção de alimentos "
+"pegajosos, ou crocante difíceis. Foods são úmidas, pedaços pequenos. "
+"AllVegetais são derivados-Mashable. Líquidos devem ser pedidos separadamente "
+"como regular, néctar ou mel."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:DYSP"
 msgid ""
 "For patients with problems chewing and swallowing or esophageal inflammation or varices. Food consistency is blended. Liquids must be ordered\n"
 "separately as regular, nectar, or honey."
-msgstr "Para os pacientes com problemas de mastigação e deglutição ou inflamação do esôfago ou varizes. Consistência Food é misturado. Líquidos devem ser encomendados\nSeparadamente como regular, néctar ou mel."
+msgstr ""
+"Para os pacientes com problemas de mastigação e deglutição ou inflamação do "
+"esôfago ou varizes. Consistência Food é misturado. Líquidos devem ser "
+"encomendados\n"
+"Separadamente como regular, néctar ou mel."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:EMESIS"
 msgid ""
@@ -809,26 +942,39 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "A dieta fornece branda, temperatura ambiente ou alimentos frios separados em sólidos e líquidos. Os pacientes com esta dieta podem pedir alimentos adicionais que sentem poder ser tolerada. Os pacientes são incentivados a separar a sua ingestão de alimentos e bebidas"
+msgstr ""
+"A dieta fornece branda, temperatura ambiente ou alimentos frios separados em "
+"sólidos e líquidos. Os pacientes com esta dieta podem pedir alimentos "
+"adicionais que sentem poder ser tolerada. Os pacientes são incentivados a "
+"separar a sua ingestão de alimentos e bebidas"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
 "Indicated for patients who may not be able to use utensils or for patients "
 "confined to a flat-lying position who require heart healthy foods."
-msgstr "Indicado para pacientes que não podem ser capazes de usar utensílios ou para os pacientesConfinado a uma posição plana altitude que necessitam coração alimentos saudáveis."
+msgstr ""
+"Indicado para pacientes que não podem ser capazes de usar utensílios ou para "
+"os pacientesConfinado a uma posição plana altitude que necessitam coração "
+"alimentos saudáveis."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FLLF"
 msgid ""
 "This diet is frequently used for GYN surgical patients. Provides foods such "
 "as non-cream based soups, Jell-O, juice, lactaid milk, tea and coffee"
-msgstr "Esta dieta é freqüentemente usado para pacientes cirúrgicos GYN. Fornece alimentos taisComo sopas não-creme com base, Jell-O, suco, leite lactaid, chá e café"
+msgstr ""
+"Esta dieta é freqüentemente usado para pacientes cirúrgicos GYN. Fornece "
+"alimentos taisComo sopas não-creme com base, Jell-O, suco, leite lactaid, "
+"chá e café"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FULLLIQUID"
 msgid ""
 "The diet consists of foods that are liquid at body temperature. Foods are "
 "easy to digest and provide minimal stimulation to the GI tract. The diet is "
 "not nutritionally adequate."
-msgstr "A dieta consiste em alimentos que são líquidos à temperatura do corpo. Os alimentos são de fácil digestão e proporcionam estimulação mínima para o trato gastrointestinal. A dieta não é nutricionalmente adequada."
+msgstr ""
+"A dieta consiste em alimentos que são líquidos à temperatura do corpo. Os "
+"alimentos são de fácil digestão e proporcionam estimulação mínima para o "
+"trato gastrointestinal. A dieta não é nutricionalmente adequada."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB1"
 msgid "Sugar-Free fluids"
@@ -836,7 +982,9 @@ msgstr "Líquidos sem açúcar"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB2"
 msgid "Easily digested, semi-liquid foods to be consumed in small amounts."
-msgstr "fácil digestão, os alimentos semi-líquidos a ser consumidos em pequenas quantidades."
+msgstr ""
+"fácil digestão, os alimentos semi-líquidos a ser consumidos em pequenas "
+"quantidades."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GB3"
 msgid "Soft or pureed foods that are easy to chew and digest"
@@ -850,13 +998,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:GISOFT"
 msgid ""
 "The diet limits most raw, highly-seasoned and fried foods. The diet contains"
 " only moderate amounts of fiber"
-msgstr "A dieta limita a maioria dos alimentos crus, altamente temperado e frito. A dieta contémApenas quantidades moderadas de fibra"
+msgstr ""
+"A dieta limita a maioria dos alimentos crus, altamente temperado e frito. A "
+"dieta contémApenas quantidades moderadas de fibra"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:GLUTENFREE"
 msgid ""
 "The diet omits foods processed with Gluten. The diet is the primary means of"
 " treatment for celiac sprue"
-msgstr "A dieta omite alimentos industrializados com glúten. A dieta é o principal meio deO tratamento para a doença celíaca"
+msgstr ""
+"A dieta omite alimentos industrializados com glúten. A dieta é o principal "
+"meio deO tratamento para a doença celíaca"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:LOWFAT"
 msgid "Provides less than 30% energy from fat."
@@ -870,13 +1022,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:NAS"
 msgid ""
 "4 grams Sodium. Provides a moderate sodium restriction by eliminating foods "
 "and condiments high in sodium"
-msgstr "4 gramas de sódio. Fornece uma restrição moderada de sódio, eliminando alimentosE condimentos ricos em sódio"
+msgstr ""
+"4 gramas de sódio. Fornece uma restrição moderada de sódio, eliminando "
+"alimentosE condimentos ricos em sódio"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NEUTROPENIC"
 msgid ""
 "The diet eliminates certain foods to provide a lower level of bacteria than "
 "is present in a typical hospital diet."
-msgstr "A dieta elimina certos alimentos para proporcionar um baixo nível de bactérias deEstá presente em uma típica dieta hospitalar."
+msgstr ""
+"A dieta elimina certos alimentos para proporcionar um baixo nível de "
+"bactérias deEstá presente em uma típica dieta hospitalar."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:NPO"
 msgid "Nil per Os. Withhold oral food and fluids from the patient"
@@ -886,13 +1042,17 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:PGMY"
 msgid ""
 "Low sugar, low fat, low lactose foods. No fluids with meals. Small frequent "
 "feedings"
-msgstr "Low açúcar, baixo teor de gordura, alimentos com baixo teor de lactose. Nenhuma líquidos com as refeições. Pequeno freqüenteAlimentação"
+msgstr ""
+"Low açúcar, baixo teor de gordura, alimentos com baixo teor de lactose. "
+"Nenhuma líquidos com as refeições. Pequeno freqüenteAlimentação"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:PRERENAL"
 msgid ""
 "Provides limited amounts of protein (40-60g/d), potassium (2g/d), and sodium"
 " (2g/d) for the pre-dialyzed patient."
-msgstr "Fornece quantidades limitadas de proteína (40-60g / d), potássio (2g / d) e de sódio(2g / d) para o paciente pré-dialisados."
+msgstr ""
+"Fornece quantidades limitadas de proteína (40-60g / d), potássio (2g / d) e "
+"de sódio(2g / d) para o paciente pré-dialisados."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:REG"
 msgid "No dietary modifications required"
@@ -902,7 +1062,9 @@ msgctxt "model:gnuhealth.diet.therapeutic,description:RENAL"
 msgid ""
 "Provides adequate protein (80 - 100g/d) and limited amounts of potassium "
 "(2g) and sodium (2g) for the dialyzed patient."
-msgstr "Fornece quantidade adequada de proteínas (80 - 100 g / d) e quantidades limitadas de potássio(2 g) e de sódio (2g) para o paciente dialisado."
+msgstr ""
+"Fornece quantidade adequada de proteínas (80 - 100 g / d) e quantidades "
+"limitadas de potássio(2 g) e de sódio (2g) para o paciente dialisado."
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:SFM"
 msgid "The diet provides 6 small meals daily"
@@ -1044,6 +1206,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "Dieta Hospitalar"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "Medicação de internação"
@@ -1060,23 +1234,114 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "Histórico de admissão do paciente"
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "Transferência de leito"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "Internações"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Registro Hospitalar"
 
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "Registro Hospitalar"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
 msgstr "Internações"
@@ -1085,6 +1350,82 @@ msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
 msgstr "Administração de Internações"
 
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
 msgstr "dias"
@@ -1110,6 +1451,10 @@ msgid "when required"
 msgstr "quando necessário"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "Eletivo"
 
@@ -1129,33 +1474,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "Urgente"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "Lacto vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "Lacto-ovo vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "Nenhum"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "Pescentariano"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "Vegan"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "Vegetariano"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "Feito"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1173,156 +1522,6 @@ msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "hospitalizado"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "Transferência de Leito do Paciente"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "Histórico de Transferência de Leito"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "Descrição da Dieta"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "Dieta relacionada a religião"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "Dieta Terapêutica"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "Descrição e Indicações de Dieta"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "Dieta Terapêutica"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "Dieta Hospitalar"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "Horários de Administração de Medicamentos para Paciente Internado"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "Registro de Medicação de Paciente Internado"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "Administração"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "Reações Adversas e Notas"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "Posologia"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "Informações Extras"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "Informações Gerais"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "Medicação de Paciente Internado"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "Medicação"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "Situação"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "Período de tratamento"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "Geral"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "Admissão"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "Admitir o paciente na instituição de saúde e atribuir a um leito"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "Cancelar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "Cancelarar Inscrição"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "Cancelarar o processo de registro do paciente?"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "Plano de Assistência"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "Confirmar"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "Confirmar Inscrição / Fazer a reserva"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "Alta"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "Dar Alta ao Paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "Informações de Registro Hospitalar de Internação"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "Informações de Registro Hospitalar de Internação"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "Plano de medicação"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "Nutrição"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "Outras notas / instruções de nutrição"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "Admissão do Paciente"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "Você está prestes a ASSINAR a alta do paciente da instituição de saúde. Esta ficha se tornará disponível APENAS PARA LEITURA"
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 317d24d..b6e8c8f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,19 +1,14 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 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-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: 1452252499.0\n"
 
 msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "Destination bed is unavailable"
@@ -23,19 +18,41 @@ msgctxt "error:gnuhealth.bed.transfer.create:"
 msgid "You have chosen more than 1 records. Please choose only one"
 msgstr "你选择看不止1条记录。请只选择1条。"
 
-msgctxt "error:gnuhealth.diet.belief:"
-msgid "The Diet code already exists"
-msgstr "饮食编号已经存在"
-
 msgctxt "error:gnuhealth.diet.therapeutic:"
 msgid "The Diet code already exists"
 msgstr "饮食编号已经存在"
 
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid ""
+"===== MEAL WARNING ! =====\n"
+"\n"
+"\n"
+"This patient has special meal needs \n"
+"\n"
+"Check and acknowledge that\n"
+"the meal items in this order are correct \n"
+"\n"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "No health professional associated to this user"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.meal.order:"
+msgid "The Meal Order code already exists"
+msgstr ""
+
 msgctxt "error:gnuhealth.inpatient.medication.log:"
 msgid "No health professional associated to this user"
 msgstr "没有为用户指定健康专家"
 
 msgctxt "error:gnuhealth.inpatient.registration:"
+msgid ""
+"Admission and Discharge reasons \n"
+"as well as Discharge Dx are needed"
+msgstr ""
+
+msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "Bed is not available"
 msgstr "床位不可用"
 
@@ -47,6 +64,10 @@ msgctxt "error:gnuhealth.inpatient.registration:"
 msgid "The Registration code already exists"
 msgstr "注册代码已经存在了"
 
+msgctxt "error:wizard.gnuhealth.inpatient.evaluation:"
+msgid "You need to select an inpatient registration record"
+msgstr ""
+
 msgctxt "field:gnuhealth.appointment,inpatient_registration_code:"
 msgid "Inpatient Registration"
 msgstr "住院登记"
@@ -103,46 +124,14 @@ msgctxt "field:gnuhealth.bed.transfer.init,newbed:"
 msgid "New Bed"
 msgstr "新床位"
 
+msgctxt "field:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Bed of origin Status"
+msgstr ""
+
 msgctxt "field:gnuhealth.bed.transfer.init,reason:"
 msgid "Reason"
 msgstr "原因 "
 
-msgctxt "field:gnuhealth.diet.belief,code:"
-msgid "Code"
-msgstr "代码"
-
-msgctxt "field:gnuhealth.diet.belief,create_date:"
-msgid "Create Date"
-msgstr "创建日期"
-
-msgctxt "field:gnuhealth.diet.belief,create_uid:"
-msgid "Create User"
-msgstr "创建用户"
-
-msgctxt "field:gnuhealth.diet.belief,description:"
-msgid "Description"
-msgstr "描写"
-
-msgctxt "field:gnuhealth.diet.belief,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:gnuhealth.diet.belief,name:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.diet.belief,rec_name:"
-msgid "Name"
-msgstr "名字"
-
-msgctxt "field:gnuhealth.diet.belief,write_date:"
-msgid "Write Date"
-msgstr "请您写日期"
-
-msgctxt "field:gnuhealth.diet.belief,write_uid:"
-msgid "Write User"
-msgstr "请您写用户"
-
 msgctxt "field:gnuhealth.diet.therapeutic,code:"
 msgid "Code"
 msgstr "代码"
@@ -215,6 +204,150 @@ msgctxt "field:gnuhealth.inpatient.diet,write_uid:"
 msgid "Write User"
 msgstr "请您写用户"
 
+msgctxt "field:gnuhealth.inpatient.meal,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_belief:"
+msgid "Belief"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_therapeutic:"
+msgid "Diet"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,diet_vegetarian:"
+msgid "Vegetarian"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,institution:"
+msgid "Institution"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,health_professional:"
+msgid "Health Professional"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_item:"
+msgid "Items"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_order:"
+msgid "Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "Warning"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Ack"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Meal time"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,name:"
+msgid "Registration Code"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,state:"
+msgid "Status"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order,write_uid:"
+msgid "Write User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_date:"
+msgid "Create Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,create_uid:"
+msgid "Create User"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,id:"
+msgid "ID"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,meal:"
+msgid "Meal"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Meal Order"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,rec_name:"
+msgid "Name"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,remarks:"
+msgid "Remarks"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_date:"
+msgid "Write Date"
+msgstr ""
+
+msgctxt "field:gnuhealth.inpatient.meal.order.item,write_uid:"
+msgid "Write User"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.medication,admin_times:"
 msgid "Admin times"
 msgstr "管理时间"
@@ -443,22 +576,22 @@ msgctxt "field:gnuhealth.inpatient.registration,create_uid:"
 msgid "Create User"
 msgstr "创建用户"
 
-msgctxt "field:gnuhealth.inpatient.registration,diet_belief:"
-msgid "Belief"
-msgstr "信仰"
-
-msgctxt "field:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
-
 msgctxt "field:gnuhealth.inpatient.registration,discharge_date:"
 msgid "Expected Discharge Date"
 msgstr "预计出院日期"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Discharge Dx"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharge_plan:"
 msgid "Discharge Plan"
 msgstr "出院计划"
 
+msgctxt "field:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Discharge Reason"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Discharged by"
 msgstr "出院"
@@ -472,8 +605,8 @@ msgid "ID"
 msgstr "ID"
 
 msgctxt "field:gnuhealth.inpatient.registration,info:"
-msgid "Extra Info"
-msgstr "额外信息"
+msgid "Notes"
+msgstr ""
 
 msgctxt "field:gnuhealth.inpatient.registration,institution:"
 msgid "Institution"
@@ -503,6 +636,10 @@ msgctxt "field:gnuhealth.inpatient.registration,patient:"
 msgid "Patient"
 msgstr "患者"
 
+msgctxt "field:gnuhealth.inpatient.registration,puid:"
+msgid "PUID"
+msgstr ""
+
 msgctxt "field:gnuhealth.inpatient.registration,rec_name:"
 msgid "Name"
 msgstr "名字"
@@ -527,6 +664,18 @@ msgctxt "field:gnuhealth.patient,patient_status:"
 msgid "Hospitalized"
 msgstr ""
 
+msgctxt "field:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Inpatient Registration"
+msgstr ""
+
+msgctxt "field:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "IPC"
+msgstr ""
+
+msgctxt "field:gnuhealth.sequences,inpatient_meal_order_sequence:"
+msgid "Inpatient Meal Sequence"
+msgstr ""
+
 msgctxt "field:gnuhealth.sequences,inpatient_registration_sequence:"
 msgid "Inpatient Sequence"
 msgstr "住院序列"
@@ -539,6 +688,22 @@ msgctxt "help:gnuhealth.inpatient.diet,remarks:"
 msgid "specific remarks for this diet / patient"
 msgstr "该饮食/病人的详细记录"
 
+msgctxt "help:gnuhealth.inpatient.meal,name:"
+msgid "Food"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning:"
+msgid "The patient has special needs on meals"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,meal_warning_ack:"
+msgid "Check if you have verified the warnings on the patient meal items"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.meal.order,order_date:"
+msgid "Order date"
+msgstr ""
+
 msgctxt "help:gnuhealth.inpatient.medication,adverse_reaction:"
 msgid "Side effects or adverse reactions that the patient experienced"
 msgstr "患者经历过的副作用或不良反应"
@@ -631,19 +796,34 @@ msgctxt "help:gnuhealth.inpatient.registration,admission_reason:"
 msgid "Reason for Admission"
 msgstr "入院原因"
 
-msgctxt "help:gnuhealth.inpatient.registration,diet_belief:"
-msgid ""
-"Enter the patient belief or religion to choose the             proper diet"
-msgstr "输入病人的信仰或宗教选择适当的饮食"
+msgctxt "help:gnuhealth.inpatient.registration,discharge_dx:"
+msgid "Code for Discharge Diagnosis"
+msgstr ""
+
+msgctxt "help:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Reason for patient discharge"
+msgstr ""
 
 msgctxt "help:gnuhealth.inpatient.registration,discharged_by:"
 msgid "Health Professional that discharged the patient"
 msgstr "健康专家允许病人出院"
 
+msgctxt "help:gnuhealth.inpatient.registration,puid:"
+msgid "Person Unique Identifier"
+msgstr ""
+
 msgctxt "help:gnuhealth.patient,patient_status:"
 msgid "Show the hospitalization status of the patient"
 msgstr ""
 
+msgctxt "help:gnuhealth.patient.ecg,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
+msgctxt "help:gnuhealth.patient.evaluation,inpatient_registration_code:"
+msgid "Enter the patient hospitalization code"
+msgstr ""
+
 msgctxt "model:gnuhealth.bed.transfer,name:"
 msgid "Bed transfers"
 msgstr "病床转移"
@@ -652,88 +832,6 @@ msgctxt "model:gnuhealth.bed.transfer.init,name:"
 msgid "Create Bed Transfer Init"
 msgstr "创建病床转移初始化"
 
-msgctxt "model:gnuhealth.diet.belief,description:BUDDHIST"
-msgid ""
-"While Buddhism does not have specific dietary rules, some buddhists practise"
-" vegetarianism based on a strict interpretation of the first of the Five "
-"Precepts"
-msgstr "虽然佛教徒没有什么特别的饮食规定,一些佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,description:EDENIC"
-msgid ""
-"A diet based on what Adam and Eve are believed to have consumed in Garden of"
-" Eden. Usually either vegetarian or vegan, and based predominantly on fruit"
-msgstr "一种食谱是基于据说是亚当和夏娃在伊甸园时的饮食。通常是素食或纯素,并主要是水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HALLELUJAH"
-msgid ""
-"Hallelujah diet: A form of Christian vegetarianism developed in the 1970s. "
-"The creators interpret a verse from the Bible as suggesting that Christians "
-"should only consume seed bearing plants and fruits."
-msgstr "哈利路亚食谱:1970由一个素食主义基督教徒发展起来的一种。创造者从圣经上翻译了一个诗篇揭示出基督教徒应该只能吃作物和水果。"
-
-msgctxt "model:gnuhealth.diet.belief,description:HINDU"
-msgid ""
-"Hindu and Jain diets: Followers of Hinduism and Jainism often follow lacto-"
-"vegetarian diets, based on the principle of Ahimsa (non-harming)"
-msgstr "印度教徒和耆那教徒食谱:印度教徒和耆那教徒基于不杀生(无害)的原则,饮食方式通常和乳素食者饮食方式相同."
-
-msgctxt "model:gnuhealth.diet.belief,description:ISLAMIC"
-msgid ""
-"Muslims follow a diet consisting solely of food that is halal – permissible "
-"under Islamic law. The opposite of halal is haraam, food that is Islamically"
-" Impermissible. Haraam substances include alcohol, pork, and any meat from "
-"an animal which was not killed through the Islamic method of ritual "
-"slaughter (Dhabiha)"
-msgstr "穆斯林只吃清真食物-所谓的清真食物即伊斯兰教义允许吃的食物。与清真食物不同,不可食食物即伊斯兰教义不允许吃的食物。不可食食物包括酒精、猪肉、或者是任何未经伊斯兰屠宰仪式屠宰的动物的肉.(屠宰动物的方法)"
-
-msgctxt "model:gnuhealth.diet.belief,description:ITAL"
-msgid ""
-"I-tal: A set of principles which influences the diet of many members of the "
-"Rastafari movement. One principle is that natural foods should be consumed. "
-"Some Rastafarians interpret I-tal to advocate vegetarianism or veganism"
-msgstr "I-tal:制约拉斯塔法里教运动的成员的饮食一系列准则。具体是说必须吃自然的食物。一些拉斯塔法里教成员认为 I-tal就是主张 素食"
-
-msgctxt "model:gnuhealth.diet.belief,description:KOSHER"
-msgid ""
-"Kosher diet: Food permissible under Kashrut, the set of Jewish dietary laws,"
-" is said to be Kosher. Some foods and food combinations are non-Kosher, and "
-"failure to prepare food in accordance with Kashrut can make otherwise "
-"permissible foods non-Kosher."
-msgstr "犹太教徒的食谱:犹太教的饮食教规允许吃的食物,这是在犹太饮食准则规定下的是合适的。一些食物和食物中包含的东西是不适合犹太教徒食用的,同时如果不按照犹太教的饮食教规规定制作食物会使一些本来允许食用的食物变成不适合犹太教徒食用。"
-
-msgctxt "model:gnuhealth.diet.belief,name:"
-msgid "Diet by Belief"
-msgstr "由信仰决定的饮食"
-
-msgctxt "model:gnuhealth.diet.belief,name:BUDDHIST"
-msgid "Buddhist"
-msgstr "佛教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:EDENIC"
-msgid "Edenic"
-msgstr "宗教学"
-
-msgctxt "model:gnuhealth.diet.belief,name:HALLELUJAH"
-msgid "Hallelujah"
-msgstr "哈利路亚"
-
-msgctxt "model:gnuhealth.diet.belief,name:HINDU"
-msgid "Hindu"
-msgstr "印度教徒"
-
-msgctxt "model:gnuhealth.diet.belief,name:ISLAMIC"
-msgid "Islamic"
-msgstr "穆斯林"
-
-msgctxt "model:gnuhealth.diet.belief,name:ITAL"
-msgid "I-tal"
-msgstr "制约拉斯塔法里教运动的成员的饮食一系列准则。"
-
-msgctxt "model:gnuhealth.diet.belief,name:KOSHER"
-msgid "Kosher"
-msgstr "犹太教徒"
-
 msgctxt "model:gnuhealth.diet.therapeutic,description:2GS"
 msgid ""
 "Used in the treatment of conditions characterized by edema, including the following: cirrhosis of the\n"
@@ -757,7 +855,9 @@ msgid ""
 " on caloric level to allow for optimal blood glucose control. The diet "
 "provides a Bedtime snack for all calorie levels. (45% CHO, 25% protein, 30% "
 "fat)"
-msgstr "每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%蛋白质,30%脂肪)"
+msgstr ""
+"每天1200-3000卡路里。根据热量水平,饮食提供一致的碳水化合物以允许最佳的血糖控制。饮食提供所有热量水平的睡前点心(45%胆固醇,25%"
+"蛋白质,30%脂肪)"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:CDD"
 msgid ""
@@ -803,7 +903,9 @@ msgid ""
 "solids and liquids. Patients on this diet may request additional foods they "
 "feel can be tolerated. Patients are encouraged to separate their intake of "
 "food and drink"
-msgstr "该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开进行"
+msgstr ""
+"该食谱提供清淡的、室温的食物或者被分离成固态部分和液态部分的冷淡食物。使用这个食谱病人会因为无法忍受而要求另外的食物。病人最好把食用食物和饮用(水)分开"
+"进行"
 
 msgctxt "model:gnuhealth.diet.therapeutic,description:FINGERFOOD"
 msgid ""
@@ -1038,6 +1140,18 @@ msgctxt "model:gnuhealth.inpatient.diet,name:"
 msgid "Inpatient Diet"
 msgstr "住院饮食"
 
+msgctxt "model:gnuhealth.inpatient.meal,name:"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order,name:"
+msgid "Inpatient Meal Order"
+msgstr ""
+
+msgctxt "model:gnuhealth.inpatient.meal.order.item,name:"
+msgid "Inpatient Meal Item"
+msgstr ""
+
 msgctxt "model:gnuhealth.inpatient.medication,name:"
 msgid "Inpatient Medication"
 msgstr "住院药物治疗"
@@ -1054,23 +1168,114 @@ msgctxt "model:gnuhealth.inpatient.registration,name:"
 msgid "Patient admission History"
 msgstr "病人入院历史"
 
+msgctxt "model:ir.action,name:act_create_inpatient_evaluation"
+msgid "Create Patient Evaluation"
+msgstr ""
+
 msgctxt "model:ir.action,name:act_create_patient_bed_transfer"
 msgid "Bed Transfer"
 msgstr "病床转移"
 
+msgctxt "model:ir.action,name:act_evaluation_form1"
+msgid "Inpatient Evaluations"
+msgstr ""
+
+msgctxt "model:ir.action,name:act_inpatient_evaluation"
+msgid "Inpatient Evaluation"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal"
+msgid "Inpatient Meal"
+msgstr ""
+
+msgctxt "model:ir.action,name:gnuhealth_action_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.action,name:gnuhealth_action_inpatient_registration"
 msgid "Hospitalizations"
 msgstr "住院治疗"
 
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_done"
+msgid "Done"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_draft"
+msgid "Draft"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_inpatient_meal_order_domain_ordered"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_all"
+msgid "All"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_confirmed"
+msgid "Confirmed"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_done"
+msgid "To clean"
+msgstr ""
+
+msgctxt "model:ir.action.act_window.domain,name:act_registration_domain_draft"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_finished"
+msgid "Finished"
+msgstr ""
+
+msgctxt ""
+"model:ir.action.act_window.domain,name:act_registration_domain_hospitalized"
+msgid "Hospitalized"
+msgstr ""
+
+msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt "model:ir.sequence,name:seq_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "住院登记"
 
+msgctxt "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_meal_order"
+msgid "Inpatient Meal Order"
+msgstr ""
+
 msgctxt ""
 "model:ir.sequence.type,name:seq_type_gnuhealth_inpatient_registration"
 msgid "Inpatient Registration"
 msgstr "住院登记"
 
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_diet_therapeutic"
+msgid "Therapeutic diets"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_conf_inpatient_meal"
+msgid "Inpatient Meals"
+msgstr ""
+
+msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_meal_order"
+msgid "Meal Orders"
+msgstr ""
+
 msgctxt "model:ir.ui.menu,name:gnuhealth_inpatient_menu"
 msgid "Hospitalizations"
 msgstr "住院治疗"
@@ -1079,6 +1284,82 @@ msgctxt "model:res.group,name:group_health_inpatient_admin"
 msgid "Health Inpatient Administration"
 msgstr "住院健康管理"
 
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Free"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Not available"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Occupied"
+msgstr ""
+
+msgctxt "selection:gnuhealth.bed.transfer.init,orig_bed_state:"
+msgid "Reserved"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Breakfast"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Dinner"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Lunch"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Snack"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,mealtime:"
+msgid "Special order"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Cancelled"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Done"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Draft"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Ordered"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.meal.order,state:"
+msgid "Processing"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
+msgid ""
+msgstr ""
+
 msgctxt "selection:gnuhealth.inpatient.medication,frequency_unit:"
 msgid "days"
 msgstr "天"
@@ -1104,6 +1385,10 @@ msgid "when required"
 msgstr "必要时"
 
 msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
+msgid ""
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Elective"
 msgstr "非急需的"
 
@@ -1123,33 +1408,37 @@ msgctxt "selection:gnuhealth.inpatient.registration,admission_type:"
 msgid "Urgent"
 msgstr "紧急的"
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto vegetarian"
-msgstr "乳类素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid ""
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Lacto-ovo vegetarian"
-msgstr "蛋奶素食者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Death"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "None"
-msgstr "毫无"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Home / Selfcare"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Pescetarian"
-msgstr "鱼素者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Left against medical advice"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegan"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,discharge_reason:"
+msgid "Transferred to another institution"
+msgstr ""
 
-msgctxt "selection:gnuhealth.inpatient.registration,diet_vegetarian:"
-msgid "Vegetarian"
-msgstr "素食主义者"
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid ""
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
-msgid "Done"
-msgstr "完成"
+msgid "Discharged - needs cleaning"
+msgstr ""
+
+msgctxt "selection:gnuhealth.inpatient.registration,state:"
+msgid "Finished"
+msgstr ""
 
 msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "cancelled"
@@ -1167,156 +1456,6 @@ msgctxt "selection:gnuhealth.inpatient.registration,state:"
 msgid "hospitalized"
 msgstr "入院"
 
-msgctxt "view:gnuhealth.bed.transfer.init:"
-msgid "Patient Bed Transfer"
-msgstr "病人病床转移"
-
-msgctxt "view:gnuhealth.bed.transfer:"
-msgid "Bed Transfer History"
-msgstr "换床位历史"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet Description"
-msgstr "饮食描述"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Diet related to beliefs"
-msgstr "与信仰有关的饮食"
-
-msgctxt "view:gnuhealth.diet.belief:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Diet Description and Indications"
-msgstr "饮食描述和指示"
-
-msgctxt "view:gnuhealth.diet.therapeutic:"
-msgid "Therapeutic Diet"
-msgstr "食疗"
-
-msgctxt "view:gnuhealth.inpatient.diet:"
-msgid "Inpatient Diet"
-msgstr "住院饮食"
-
-msgctxt "view:gnuhealth.inpatient.medication.admin_time:"
-msgid "Inpatient Medication Admin Times"
-msgstr "住院药物治疗注射时间"
-
-msgctxt "view:gnuhealth.inpatient.medication.log:"
-msgid "Inpatient Medication Log"
-msgstr "住院病人药物治疗日志"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Admnistration"
-msgstr "管理"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Adverse Reactions and Notes"
-msgstr "不良反应及附注"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Dosage"
-msgstr "剂量"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Extra Info"
-msgstr "额外信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "General Info"
-msgstr "一般信息"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Inpatient Medication"
-msgstr "住院病人药物治疗"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Status"
-msgstr "状况"
-
-msgctxt "view:gnuhealth.inpatient.medication:"
-msgid "Treatment period"
-msgstr "治疗期"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Administrative data"
-msgstr "行政数据"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admission"
-msgstr "准许"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Admit the patient in the health institution and assign the bed"
-msgstr "允许医疗机构为病人分配床位"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel"
-msgstr "取消"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel Registration"
-msgstr "取消登记"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Cancel the patient registration process ?"
-msgstr "取消病人登记过程"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Care Plan"
-msgstr "护理计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm"
-msgstr "确认"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Confirm Registration / Make the reservation"
-msgstr "确认登记/预定"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge"
-msgstr "出院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Discharge Patient"
-msgstr "出院病人"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Info"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Inpatient Registration Information"
-msgstr "住院登记信息"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Medication Plan"
-msgstr "治疗计划"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Nutrition"
-msgstr "营养"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Other nutrition notes / directions"
-msgstr "其他的饮食建议/指导"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid "Patient Admission"
-msgstr "病人入院"
-
-msgctxt "view:gnuhealth.inpatient.registration:"
-msgid ""
-"You are about to SIGN the discharge the patient from the health institution."
-" This record will become READ ONLY "
-msgstr "你将让病人出院.这条记录将变得只可读。"
-
 msgctxt ""
 "wizard_button:gnuhealth.bed.transfer.create,start,create_bed_transfer:"
 msgid "Transfer Patient"
diff --git a/setup.py b/setup.py
index d5f3671..50c97f1 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ 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 = []
 
diff --git a/tests/test_health_inpatient.py b/tests/test_health_inpatient.py
index 175485d..a0c3bc9 100644
--- a/tests/test_health_inpatient.py
+++ b/tests/test_health_inpatient.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 HealthInpatientTestCase(unittest.TestCase):
+class HealthInpatientTestCase(ModuleTestCase):
     '''
-    Test HealthInpatient module.
+    Test Health Inpatient module.
     '''
+    module = 'health_inpatient'
 
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('health_inpatient')
-
-    def test0005views(self):
-        '''
-        Test views.
-        '''
-        test_view('health_inpatient')
-
-    def test0006depends(self):
-        '''
-        Test depends.
-        '''
-        test_depends()
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         HealthInpatientTestCase))
     return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 8f7f1e8..0510eae 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,11 +1,12 @@
 [tryton]
-version=2.8.1
+version=3.0.1
 depends:
     health
+    health_lifestyle
 xml:
     health_inpatient_view.xml
     data/health_inpatient_sequence.xml
     data/inpatient_diets.xml
-    data/diets_beliefs.xml
     wizard/bed_transfer_wizard.xml
+    wizard/inpatient_evaluation.xml
     security/access_rights.xml
diff --git a/trytond_health_inpatient.egg-info/PKG-INFO b/trytond_health_inpatient.egg-info/PKG-INFO
index e159d99..ecfa36a 100644
--- a/trytond_health_inpatient.egg-info/PKG-INFO
+++ b/trytond_health_inpatient.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-health-inpatient
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Hospitalization Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/trytond_health_inpatient.egg-info/SOURCES.txt b/trytond_health_inpatient.egg-info/SOURCES.txt
index 06553b0..b16a7da 100644
--- a/trytond_health_inpatient.egg-info/SOURCES.txt
+++ b/trytond_health_inpatient.egg-info/SOURCES.txt
@@ -7,32 +7,46 @@ setup.py
 ./health_inpatient.py
 ./health_inpatient_view.xml
 ./tryton.cfg
-./data/diets_beliefs.xml
 ./data/health_inpatient_sequence.xml
 ./data/inpatient_diets.xml
 ./doc/index.rst
 ./icons/cancel.svg
 ./icons/go-home.svg
 ./icons/hospital.svg
+./icons/meals.svg
 ./icons/ok.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
 ./security/access_rights.xml
 ./tests/__init__.py
 ./tests/test_health_inpatient.py
+./view/ecg_registration.xml
 ./view/gnuhealth_bed_transfer_form.xml
 ./view/gnuhealth_bed_transfer_tree.xml
-./view/gnuhealth_inpatient_diet_belief_form.xml
-./view/gnuhealth_inpatient_diet_belief_tree.xml
 ./view/gnuhealth_inpatient_diet_form.xml
 ./view/gnuhealth_inpatient_diet_therapeutic_form.xml
 ./view/gnuhealth_inpatient_diet_therapeutic_tree.xml
 ./view/gnuhealth_inpatient_diet_tree.xml
+./view/gnuhealth_inpatient_meal_form.xml
+./view/gnuhealth_inpatient_meal_order_form.xml
+./view/gnuhealth_inpatient_meal_order_item_form.xml
+./view/gnuhealth_inpatient_meal_order_item_tree.xml
+./view/gnuhealth_inpatient_meal_order_tree.xml
+./view/gnuhealth_inpatient_meal_tree.xml
 ./view/gnuhealth_inpatient_med_admin_time_form.xml
 ./view/gnuhealth_inpatient_med_admin_time_tree.xml
 ./view/gnuhealth_inpatient_med_log_form.xml
@@ -41,26 +55,38 @@ setup.py
 ./view/gnuhealth_inpatient_medication_tree.xml
 ./view/gnuhealth_inpatient_registration.xml
 ./view/gnuhealth_inpatient_registration_tree.xml
+./view/gnuhealth_patient_evaluation_form.xml
 ./view/gnuhealth_patient_extd_tree.xml
 ./view/partner_form.xml
 ./view/patient_bed_transfer.xml
 ./view/patient_form.xml
 ./wizard/__init__.py
 ./wizard/bed_transfer_wizard.xml
+./wizard/inpatient_evaluation.xml
 ./wizard/wizard_health_inpatient.py
-data/diets_beliefs.xml
+./wizard/wizard_inpatient_evaluation.py
 data/health_inpatient_sequence.xml
 data/inpatient_diets.xml
 icons/README
 icons/cancel.svg
 icons/go-home.svg
 icons/hospital.svg
+icons/meals.svg
 icons/ok.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
 security/access_rights.xml
@@ -71,14 +97,19 @@ trytond_health_inpatient.egg-info/entry_points.txt
 trytond_health_inpatient.egg-info/not-zip-safe
 trytond_health_inpatient.egg-info/requires.txt
 trytond_health_inpatient.egg-info/top_level.txt
+view/ecg_registration.xml
 view/gnuhealth_bed_transfer_form.xml
 view/gnuhealth_bed_transfer_tree.xml
-view/gnuhealth_inpatient_diet_belief_form.xml
-view/gnuhealth_inpatient_diet_belief_tree.xml
 view/gnuhealth_inpatient_diet_form.xml
 view/gnuhealth_inpatient_diet_therapeutic_form.xml
 view/gnuhealth_inpatient_diet_therapeutic_tree.xml
 view/gnuhealth_inpatient_diet_tree.xml
+view/gnuhealth_inpatient_meal_form.xml
+view/gnuhealth_inpatient_meal_order_form.xml
+view/gnuhealth_inpatient_meal_order_item_form.xml
+view/gnuhealth_inpatient_meal_order_item_tree.xml
+view/gnuhealth_inpatient_meal_order_tree.xml
+view/gnuhealth_inpatient_meal_tree.xml
 view/gnuhealth_inpatient_med_admin_time_form.xml
 view/gnuhealth_inpatient_med_admin_time_tree.xml
 view/gnuhealth_inpatient_med_log_form.xml
@@ -87,8 +118,10 @@ view/gnuhealth_inpatient_medication_form.xml
 view/gnuhealth_inpatient_medication_tree.xml
 view/gnuhealth_inpatient_registration.xml
 view/gnuhealth_inpatient_registration_tree.xml
+view/gnuhealth_patient_evaluation_form.xml
 view/gnuhealth_patient_extd_tree.xml
 view/partner_form.xml
 view/patient_bed_transfer.xml
 view/patient_form.xml
-wizard/bed_transfer_wizard.xml
\ No newline at end of file
+wizard/bed_transfer_wizard.xml
+wizard/inpatient_evaluation.xml
\ No newline at end of file
diff --git a/trytond_health_inpatient.egg-info/requires.txt b/trytond_health_inpatient.egg-info/requires.txt
index fcccb26..48ccfb8 100644
--- a/trytond_health_inpatient.egg-info/requires.txt
+++ b/trytond_health_inpatient.egg-info/requires.txt
@@ -1,2 +1,3 @@
-trytond_health == 2.8.1
-trytond >= 3.4, < 3.5
+trytond_health == 3.0.1
+trytond_health_lifestyle == 3.0.1
+trytond >= 3.8, < 3.9
diff --git a/view/ecg_registration.xml b/view/ecg_registration.xml
new file mode 100644
index 0000000..8606366
--- /dev/null
+++ b/view/ecg_registration.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<data>
+    <xpath expr="/form/field[@name="name"]" position="after">
+        <label name="inpatient_registration_code"/>
+        <field name="inpatient_registration_code"/>
+    </xpath>
+</data>
diff --git a/view/gnuhealth_bed_transfer_tree.xml b/view/gnuhealth_bed_transfer_tree.xml
index 31ba958..c41773b 100644
--- a/view/gnuhealth_bed_transfer_tree.xml
+++ b/view/gnuhealth_bed_transfer_tree.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <tree editable="top" string="Bed Transfer History">
-    <field name="transfer_date" expand="1"/>
+    <field name="transfer_date" widget="date"/>
+    <field name="transfer_date" widget="time"/>
     <field name="bed_from" expand="1"/>
     <field name="bed_to" expand="1"/>
     <field name="reason" expand="1"/>
diff --git a/view/gnuhealth_inpatient_diet_belief_form.xml b/view/gnuhealth_inpatient_diet_belief_form.xml
deleted file mode 100644
index dc504ae..0000000
--- a/view/gnuhealth_inpatient_diet_belief_form.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<form string="Diet related to beliefs">
-    <label name="name"/>
-    <field name="name"/>
-    <label name="code"/>
-    <field name="code"/>
-    <newline/>
-    <separator id="separator_diet_belief_description" colspan="4" string="Diet Description"/>
-    <newline/>
-    <field colspan="4" name="description"/>
-</form>
diff --git a/view/gnuhealth_inpatient_diet_belief_tree.xml b/view/gnuhealth_inpatient_diet_belief_tree.xml
deleted file mode 100644
index 47afd72..0000000
--- a/view/gnuhealth_inpatient_diet_belief_tree.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<tree editable="top" string="Therapeutic Diet">
-    <field name="name" expand="1"/>
-    <field name="code" expand="1"/>
-    <field name="description"/>
-</tree>
diff --git a/view/gnuhealth_inpatient_meal_form.xml b/view/gnuhealth_inpatient_meal_form.xml
new file mode 100644
index 0000000..deb3c16
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_form.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<form string="Inpatient Meal">
+    <label name="name"/>
+    <field name="name"/>
+    <label name="institution"/>
+    <field name="institution"/>
+    <newline/>
+    <group colspan="4" col="6" id="meal_diet_types">
+        <label name="diet_therapeutic"/>
+        <field name="diet_therapeutic"/>
+        <label name="diet_belief"/>
+        <field name="diet_belief"/>
+        <label name="diet_vegetarian"/>
+        <field name="diet_vegetarian"/>
+    </group>
+</form>
diff --git a/view/gnuhealth_inpatient_meal_order_form.xml b/view/gnuhealth_inpatient_meal_order_form.xml
new file mode 100644
index 0000000..4f5c758
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_order_form.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<form string="Inpatient Meal Order">
+    <group id="inpatient_meal_order_header" col="10" colspan="4">
+        <label name="name"/>
+        <field name="name"/>
+        <label name="meal_order"/>
+        <field name="meal_order"/>
+        <label name="mealtime"/>
+        <field name="mealtime"/>
+        <label name="meal_warning"/>
+        <field name="meal_warning"/>
+        <label name="meal_warning_ack"/>
+        <field name="meal_warning_ack"/>
+    </group>
+    <newline/>
+    <field colspan="4" name="meal_item"/>
+    <newline/>
+    <field colspan="4" name="remarks"/>
+    <newline/>
+    <group id="inpatient_meal_order_footer" col="10" colspan="4">
+        <label name="state"/>
+        <field name="state"/>
+        <label name="order_date"/>
+        <field name="order_date"/>
+        <button name="cancel" help="Cancel order" string="Cancel" icon="icon-cancel" confirm="Cancel the this meal order ?"/>
+        <button name="generate" help="Create order" string="Generate" icon="icon-ok" confirm="Generate the meal order ?"/>
+        <button name="done" help="The meal order is done" string="Done" icon="icon-home" confirm="The meal order will be closed"/>
+        <label name="health_professional"/>
+        <field name="health_professional"/>
+    </group>
+</form>
diff --git a/view/gnuhealth_inpatient_meal_order_item_form.xml b/view/gnuhealth_inpatient_meal_order_item_form.xml
new file mode 100644
index 0000000..5a8b769
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_order_item_form.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<form string="Inpatient Meal Order Item">
+    <label name="meal"/>
+    <field name="meal"/>
+    <label name="remarks"/>
+    <field name="remarks"/>
+</form>
diff --git a/view/gnuhealth_inpatient_meal_order_item_tree.xml b/view/gnuhealth_inpatient_meal_order_item_tree.xml
new file mode 100644
index 0000000..2e73e8f
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_order_item_tree.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<tree editable="top" string="Inpatient Meal Order Item">
+    <field name="name" expand="1"/>
+    <field name="meal" expand="1"/>
+    <field name="remarks" expand="1"/>
+</tree>
diff --git a/view/gnuhealth_inpatient_meal_order_tree.xml b/view/gnuhealth_inpatient_meal_order_tree.xml
new file mode 100644
index 0000000..f443c01
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_order_tree.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<tree string="Inpatient Meal Order">
+    <field name="name" expand="1"/>
+    <field name="meal_order" expand="1"/>
+    <field name="mealtime" widget="date"/>
+    <field name="mealtime" widget="time"/>
+    <field name="meal_item" expand="1"/>
+    <button name="done" help="The meal order is done" string="Done" confirm="The meal order will be closed"/>
+    <field name="state" expand="1"/>
+</tree>
diff --git a/view/gnuhealth_inpatient_meal_tree.xml b/view/gnuhealth_inpatient_meal_tree.xml
new file mode 100644
index 0000000..a4492bd
--- /dev/null
+++ b/view/gnuhealth_inpatient_meal_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<tree string="Inpatient Meal">
+    <field name="name" expand="1"/>
+    <field name="diet_therapeutic" expand="1"/>
+    <field name="diet_vegetarian"/>
+    <field name="diet_belief"/>
+    <field name="institution"/>
+</tree>
diff --git a/view/gnuhealth_inpatient_med_log_form.xml b/view/gnuhealth_inpatient_med_log_form.xml
index 8e4c155..9dbd248 100644
--- a/view/gnuhealth_inpatient_med_log_form.xml
+++ b/view/gnuhealth_inpatient_med_log_form.xml
@@ -2,6 +2,7 @@
 <form string="Inpatient Medication Log">
     <label name="admin_time"/>
     <field name="admin_time"/>
+    <field name="admin_time"/>
     <label name="health_professional"/>
     <field name="health_professional"/>
     <label name="dose"/>
diff --git a/view/gnuhealth_inpatient_med_log_tree.xml b/view/gnuhealth_inpatient_med_log_tree.xml
index 11f0079..189fced 100644
--- a/view/gnuhealth_inpatient_med_log_tree.xml
+++ b/view/gnuhealth_inpatient_med_log_tree.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <tree editable="top" string="Inpatient Medication Log">
-    <field name="admin_time" expand="1"/>
+    <field name="admin_time" widget="date"/>
+    <field name="admin_time" widget="time"/>
     <field name="health_professional" expand="1"/>
     <field name="dose"/>
     <field name="dose_unit"/>
diff --git a/view/gnuhealth_inpatient_medication_form.xml b/view/gnuhealth_inpatient_medication_form.xml
index ba8a8a5..ddd545d 100644
--- a/view/gnuhealth_inpatient_medication_form.xml
+++ b/view/gnuhealth_inpatient_medication_form.xml
@@ -17,7 +17,7 @@
                 <field name="end_treatment"/>
             </group>
             <newline/>
-            <group id="inpatient_medicament_form" string="Admnistration">
+            <group id="inpatient_medicament_form" string="Administration">
                 <label name="form"/>
                 <field name="form"/>
                 <label name="route"/>
diff --git a/view/gnuhealth_inpatient_medication_tree.xml b/view/gnuhealth_inpatient_medication_tree.xml
index 235f89e..718d287 100644
--- a/view/gnuhealth_inpatient_medication_tree.xml
+++ b/view/gnuhealth_inpatient_medication_tree.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
-<tree string="Inpatient Medication" colors="If(Bool(Eval('is_active')),'blue','grey')">
+<tree string="Inpatient Medication">
     <field name="medicament" expand="1"/>
-    <field name="start_treatment" expand="1"/>
-    <field name="end_treatment" expand="1"/>
+    <field name="start_treatment" widget="date"/>
+    <field name="start_treatment" widget="time"/>
+    <field name="end_treatment" widget="date"/>
+    <field name="end_treatment" widget="time"/>
     <field name="admin_times"/>
     <field name="course_completed"/>
     <field name="discontinued"/>
diff --git a/view/gnuhealth_inpatient_registration.xml b/view/gnuhealth_inpatient_registration.xml
index fee52cd..7d1a5b3 100644
--- a/view/gnuhealth_inpatient_registration.xml
+++ b/view/gnuhealth_inpatient_registration.xml
@@ -3,11 +3,13 @@
     <notebook>
         <page string="Administrative data" id="page_admin_data">
             <group colspan="4" id="group_admin_data_holder1">
-                <group colspan="2" id="group_admin_data">
+                <group colspan="2" col="6" id="group_admin_data">
                     <label name="name"/>
                     <field name="name"/>
                     <label name="patient"/>
                     <field name="patient"/>
+                    <label name="puid"/>
+                    <field name="puid"/>
                 </group>
                 <group colspan="2" id="group_admin_bed">
                     <label name="bed"/>
@@ -30,32 +32,35 @@
                     <label name="admission_reason"/>
                     <field name="admission_reason"/>
                     <newline/>
-                    <label name="info" colspan="4"/>
-                    <field name="info" colspan="4"/>
+                    <group colspan="4" string="Notes" id="inpatient_registration_notes_group">
+                        <field name="info"/>
+                    </group>
                 </group>
             </group>
             <newline/>
-            <field name="bed_transfers"/>
+            <group colspan="4" id="group_bed_transfers">
+                <field height="150" name="bed_transfers"/>
+            </group>
             <newline/>
-            <group colspan="4" id="group_registration_holder1">
-                <group colspan="2" id="group_registration_holder2">
-                    <field name="state" readonly="1"/>
-                    <button name="confirmed" string="Confirm" help="Confirm Registration / Make the reservation" icon="icon-ok"/>
-                </group>
-                <group colspan="2" id="group_registration_holder3">
-                    <button name="cancel" help="Cancel Registration" string="Cancel" icon="icon-cancel" confirm="Cancel the patient registration process ?"/>
-                    <button name="admission" help="Patient Admission" string="Admission" icon="icon-ok" confirm="Admit the patient in the health institution and assign the bed"/>
-                    <button name="discharge" help="Discharge Patient" string="Discharge" icon="icon-home" confirm="You are about to SIGN the discharge the patient from the health institution. This record will become READ ONLY "/>
-                    <field name="discharged_by"/>
-                </group>
+            <group colspan="4" col="10" string="Discharge Info" id="group_hospitalization_discharge">
+                <label name="discharge_reason"/>
+                <field name="discharge_reason"/>
+                <label name="discharge_dx"/>
+                <field name="discharge_dx"/>
+                <field name="discharged_by"/>
+            </group>
+
+            <group colspan="4" col="6" string="Status" id="group_registration_holder1">
+                <field name="state" xexpand="1"/>
+                <button name="confirmed" string="Confirm" help="Confirm Registration / Make the reservation" icon="icon-ok"/>
+                <button name="cancel" help="Cancel Registration" string="Cancel" icon="icon-cancel" confirm="Cancel the patient registration process ?"/>
+                <button name="admission" help="Patient Admission" string="Admission" icon="icon-ok" confirm="Admit the patient in the health institution and assign the bed"/>
+                <button name="discharge" help="Discharge Patient" string="Discharge" icon="icon-home" confirm="You are about to discharge the patient from the health institution."/>
+                <button name="bedclean" help="Click when Bed has been cleaned" string="Clean Bed" icon="icon-home" confirm="Confirm that the bed has been cleaned and is now ready to use"/>
             </group>
         </page>
+
         <page string="Nutrition" id="page_inpatient_nutrition">
-            <label name="diet_belief"/>
-            <field name="diet_belief"/>
-            <label name="diet_vegetarian"/>
-            <field name="diet_vegetarian"/>
-            <newline/>
             <field colspan="4" name="therapeutic_diets"/>
             <newline/>
             <separator colspan="4" id="separator_nutrition_notes" string="Other nutrition notes / directions"/>
@@ -66,10 +71,12 @@
             <field name="medications"/>
         </page>
         <page string="Care Plan" id="page_care_plan">
-            <label name="nursing_plan"/>
+            <separator id="separator_nursing_plan" string="Nursing Plan"/>
+            <newline/>
             <field name="nursing_plan"/>
             <newline/>
-            <label name="discharge_plan"/>
+            <separator id="separator_discharge_plan" string="Discharge Plan"/>
+            <newline/>
             <field name="discharge_plan"/>
         </page>
     </notebook>
diff --git a/view/gnuhealth_inpatient_registration_tree.xml b/view/gnuhealth_inpatient_registration_tree.xml
index 248d407..fef250a 100644
--- a/view/gnuhealth_inpatient_registration_tree.xml
+++ b/view/gnuhealth_inpatient_registration_tree.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<tree string="Inpatient Registration Info" colors="If(And(Equal(Eval('state'), 'hospitalized'), Equal(Eval('admission_type'), 'elective' )), 'blue',If(Equal(Eval('admission_type'), 'emergency'), 'red', If(Equal(Eval('admission_type'), 'maternity'), 'blue','black')))">
+<tree string="Inpatient Registration Info">
     <field name="name" expand="1"/>
     <field name="patient" expand="1"/>
-    <field name="hospitalization_date" expand="1"/>
-    <field name="discharge_date" expand="1"/>
+    <field name="puid" expand="1"/>
+    <field name="hospitalization_date" widget="date"/>
+    <field name="discharge_date" widget="date"/>
     <field name="bed" expand="1"/>
     <field name="admission_type" expand="1"/>
     <field name="state" expand="1"/>
-    <field name="institution" expand="1"/>
+    <field name="institution"/>
 </tree>
diff --git a/view/gnuhealth_patient_evaluation_form.xml b/view/gnuhealth_patient_evaluation_form.xml
new file mode 100644
index 0000000..a901a9b
--- /dev/null
+++ b/view/gnuhealth_patient_evaluation_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<data>
+    <!-- Include inpatient registration on evaluation form -->
+    
+    <xpath expr="//field[@name="evaluation_type"]" position="after">
+        <label name="inpatient_registration_code"/>
+        <field name="inpatient_registration_code"/>
+    </xpath>
+
+
+</data>
diff --git a/view/patient_bed_transfer.xml b/view/patient_bed_transfer.xml
index 1f7ac9a..d9eadda 100644
--- a/view/patient_bed_transfer.xml
+++ b/view/patient_bed_transfer.xml
@@ -2,6 +2,9 @@
 <form string="Patient Bed Transfer">
     <label name="newbed"/>
     <field name="newbed"/>
+    <newline/>
+    <label name="orig_bed_state"/>
+    <field name="orig_bed_state"/>
     <label name="reason"/>
     <field name="reason"/>
-</form>
\ No newline at end of file
+</form>
diff --git a/wizard/__init__.py b/wizard/__init__.py
index 0d253da..b48209c 100755
--- a/wizard/__init__.py
+++ b/wizard/__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
@@ -22,3 +22,4 @@
 ##############################################################################
 
 from wizard_health_inpatient import *
+from wizard_inpatient_evaluation import *
diff --git a/wizard/inpatient_evaluation.xml b/wizard/inpatient_evaluation.xml
new file mode 100644
index 0000000..61f4513
--- /dev/null
+++ b/wizard/inpatient_evaluation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tryton>
+    <data>
+
+        <record model="ir.action.wizard" id="act_create_inpatient_evaluation">
+            <field name="name">Create Patient Evaluation</field>
+            <field name="wiz_name">wizard.gnuhealth.inpatient.evaluation</field>
+        </record>
+
+        <record model="ir.action.keyword" id="act_create_inpatient_evaluation_keyword">
+            <field name="keyword">form_action</field>
+            <field name="model">gnuhealth.inpatient.registration,-1</field>
+            <field name="action" ref="act_create_inpatient_evaluation"/>
+        </record>
+
+        <record model="ir.action.act_window" id="act_inpatient_evaluation">
+            <field name="name">Inpatient Evaluation</field>
+            <field name="res_model">gnuhealth.patient.evaluation</field>
+        </record>
+
+        <record model="ir.action.act_window.view" id="act_inpatient_evaluation_form">
+            <field name="view" ref="health.gnuhealth_patient_evaluation_view"/>
+            <field name="sequence" eval="10"/>
+            <field name="act_window" ref="act_inpatient_evaluation"/>
+        </record>
+    </data>
+</tryton>
diff --git a/wizard/wizard_health_inpatient.py b/wizard/wizard_health_inpatient.py
index 29caa27..f20a4a3 100644
--- a/wizard/wizard_health_inpatient.py
+++ b/wizard/wizard_health_inpatient.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>
 #
 #
 #
@@ -38,6 +38,19 @@ class CreateBedTransferInit(ModelView):
         required=True, select=True)
     reason = fields.Char('Reason', required=True)
 
+    orig_bed_state = fields.Selection((
+        (None,''),
+        ('free', 'Free'),
+        ('reserved', 'Reserved'),
+        ('occupied', 'Occupied'),
+        ('to_clean', 'Needs cleaning'),
+        ('na', 'Not available'),
+        ), 'Bed of origin Status', sort=False, required=True)
+
+    @staticmethod
+    def default_orig_bed_state():
+        return 'to_clean'
+
 class CreateBedTransfer(Wizard):
     'Create Bed Transfer'
     __name__ = 'gnuhealth.bed.transfer.create'
@@ -74,11 +87,15 @@ class CreateBedTransfer(Wizard):
         current_bed = registration.bed
         destination_bed = self.start.newbed
         reason = self.start.reason
+        orig_bed_state = self.start.orig_bed_state
+
 
         # Check that the new bed is free
         if (destination_bed.state == 'free'):
-            # Free the current bed
-            bed.write([current_bed], {'state': 'free'})
+
+            # Update bed status with the one given in the transfer
+            bed.write([current_bed], {'state': orig_bed_state})
+
             # Set as occupied the new bed
             bed.write([destination_bed], {'state': 'occupied'})
             # Update the hospitalization record
diff --git a/wizard/wizard_inpatient_evaluation.py b/wizard/wizard_inpatient_evaluation.py
new file mode 100644
index 0000000..6e795c3
--- /dev/null
+++ b/wizard/wizard_inpatient_evaluation.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    GNU Health: The Free Health and Hospital Information System
+#    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
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from trytond.model import ModelView
+from trytond.wizard import Wizard, StateTransition, StateAction, StateView, Button
+from trytond.transaction import Transaction
+from trytond.pool import Pool
+from trytond.pyson import PYSONEncoder
+
+
+__all__ = ['CreateInpatientEvaluation']
+
+class CreateInpatientEvaluation(Wizard):
+    'Create Inpatient Evaluation'
+    __name__ = 'wizard.gnuhealth.inpatient.evaluation'
+  
+    start_state = 'inpatient_evaluation'
+    inpatient_evaluation = StateAction('health_inpatient.act_inpatient_evaluation')
+
+    def do_inpatient_evaluation(self, action):
+      
+        inpatient_registration = Transaction().context.get('active_id')
+
+        try:
+            reg_id = \
+                Pool().get('gnuhealth.inpatient.registration').browse([inpatient_registration])[0]
+        except:
+            self.raise_user_error('no_record_selected')
+            
+        patient = reg_id.patient.id
+
+        
+        action['pyson_domain'] = PYSONEncoder().encode([
+            ('patient', '=', patient),
+            ('inpatient_registration_code', '=', reg_id.id),
+            ('evaluation_type', '=', 'inpatient'),
+            ])
+        action['pyson_context'] = PYSONEncoder().encode({
+            'patient': patient,
+            'inpatient_registration_code': reg_id.id,
+            'evaluation_type': 'inpatient',
+            })
+            
+        return action, {}
+        
+    @classmethod
+    def __setup__(cls):
+        super(CreateInpatientEvaluation, cls).__setup__()
+        cls._error_messages.update({
+            'no_record_selected':
+                'You need to select an inpatient registration record',
+        })
+
commit 6f750cc3781e9b8353a87ff66b241828cd371963
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 66182f0..3200e56 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
@@ -14,7 +14,7 @@ Copyright: Leonardo D'Acchille - GNU Solidario
 License: CC-BY-SA-3.0
 
 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-inpatient



More information about the tryton-debian-vcs mailing list