[tryton-debian-vcs] tryton-modules-health-stock branch upstream updated. upstream/2.8.1-1-g3f61d99

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


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

commit 3f61d99984ddf7ceb6d367208defebc3e9d297e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Mar 28 01:19:14 2016 +0200

    Adding upstream version 3.0.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/PKG-INFO b/PKG-INFO
index b2c06b8..48fee8a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_health_stock
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Stock 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 bf013ab..ab00de2 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>
 #
 #    Copyright (C) 2013  Sebastian Marro <smarro at gnusolidario.org>
 #
diff --git a/health_stock.py b/health_stock.py
index 84e0b72..3f19d3e 100644
--- a/health_stock.py
+++ b/health_stock.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>
 #
 #    Copyright (C) 2013  Sebastian Marro <smarro at gnusolidario.org>
 #
@@ -124,10 +124,6 @@ class PatientAmbulatoryCare(Workflow, ModelSQL, ModelView):
 
     moves = fields.One2Many('stock.move', 'origin', 'Stock Moves',
         readonly=True)
-    state = fields.Selection([
-        ('draft', 'Draft'),
-        ('done', 'Done'),
-        ], 'State', readonly=True)
 
     @classmethod
     def __setup__(cls):
@@ -140,10 +136,6 @@ class PatientAmbulatoryCare(Workflow, ModelSQL, ModelView):
                 'invisible': ~Eval('state').in_(['draft']),
             }})
 
-    @staticmethod
-    def default_state():
-        return 'draft'
-
     @classmethod
     def copy(cls, ambulatory_cares, default=None):
         if default is None:
@@ -159,11 +151,14 @@ class PatientAmbulatoryCare(Workflow, ModelSQL, ModelView):
     def done(cls, ambulatory_cares):
         pool = Pool()
         Patient = pool.get('gnuhealth.patient')
+        HealthProfessional = pool.get('gnuhealth.healthprofessional')
 
         lines_to_ship = {}
         medicaments_to_ship = []
         supplies_to_ship = []
 
+        signing_hp = HealthProfessional.get_health_professional()
+
         for ambulatory in ambulatory_cares:
             patient = Patient(ambulatory.patient.id)
             for medicament in ambulatory.medicaments:
@@ -177,6 +172,11 @@ class PatientAmbulatoryCare(Workflow, ModelSQL, ModelView):
 
         cls.create_stock_moves(ambulatory_cares, lines_to_ship)
 
+        cls.write(ambulatory_cares, {
+            'signed_by': signing_hp,
+            'session_end': datetime.now()
+            })
+
     @classmethod
     def create_stock_moves(cls, ambulatory_cares, lines):
         pool = Pool()
@@ -247,14 +247,13 @@ class PatientAmbulatoryCareMedicament(ModelSQL, ModelView):
     def default_quantity():
         return 1
 
-    @fields.depends('medicament', 'product')
+    @fields.depends('medicament')
     def on_change_medicament(self):
-        res = {}
         if self.medicament:
-            res = {'product': self.medicament.name.id}
+            self.product = self.medicament.name.id
+
         else:
-            res = {'product': None}
-        return res
+            self.product = None
 
 
 class PatientAmbulatoryCareMedicalSupply(ModelSQL, ModelView):
@@ -296,10 +295,6 @@ class PatientRounding(Workflow, ModelSQL, ModelView):
         states=_STATES, depends=_DEPENDS)
     moves = fields.One2Many('stock.move', 'origin', 'Stock Moves',
         readonly=True)
-    state = fields.Selection([
-        ('draft', 'Draft'),
-        ('done', 'Done'),
-        ], 'State', readonly=True)
 
     @classmethod
     def __setup__(cls):
@@ -312,10 +307,6 @@ class PatientRounding(Workflow, ModelSQL, ModelView):
             'invisible': ~Eval('state').in_(['draft']),
             }})
 
-    @staticmethod
-    def default_state():
-        return 'draft'
-
     @classmethod
     def copy(cls, roundings, default=None):
         if default is None:
@@ -330,6 +321,9 @@ class PatientRounding(Workflow, ModelSQL, ModelView):
     def done(cls, roundings):
         pool = Pool()
         Patient = pool.get('gnuhealth.patient')
+        HealthProfessional = pool.get('gnuhealth.healthprofessional')
+
+        signing_hp = HealthProfessional.get_health_professional()
 
         lines_to_ship = {}
         medicaments_to_ship = []
@@ -350,6 +344,11 @@ class PatientRounding(Workflow, ModelSQL, ModelView):
 
         cls.create_stock_moves(roundings, lines_to_ship)
 
+        cls.write(roundings, {
+            'signed_by': signing_hp,
+            'evaluation_end': datetime.now()
+            })
+
     @classmethod
     def create_stock_moves(cls, roundings, lines):
         pool = Pool()
@@ -418,14 +417,13 @@ class PatientRoundingMedicament(ModelSQL, ModelView):
     def default_quantity():
         return 1
 
-    @fields.depends('medicament', 'product')
+    @fields.depends('medicament')
     def on_change_medicament(self):
-        res = {}
         if self.medicament:
-            res = {'product': self.medicament.name.id}
+            self.product = self.medicament.name.id
+
         else:
-            res = {'product': None}
-        return res
+            self.product = None
 
 
 class PatientRoundingMedicalSupply(ModelSQL, ModelView):
@@ -453,6 +451,12 @@ class PatientPrescriptionOrder:
     moves = fields.One2Many('stock.move', 'origin', 'Moves', readonly=True)
 
     @classmethod
+    def __setup__(cls):
+        super(PatientPrescriptionOrder, cls).__setup__()
+        cls.pharmacy.states['readonly'] &= Bool(Eval('moves'))
+        cls.pharmacy.depends.append('moves')
+
+    @classmethod
     def copy(cls, prescriptions, default=None):
         if default is None:
             default = {}
@@ -499,11 +503,9 @@ class PatientVaccination:
                 'HEALTH AUTHORITIES AND DO NOT USE IT !!!',
         })
 
-    @fields.depends('vaccine', 'product')
+    @fields.depends('vaccine')
     def on_change_vaccine(self):
-        res = {}
         if self.vaccine:
-            res = {'product': self.vaccine.name.id}
+            self.product = self.vaccine.name.id
         else:
-            res = {'product': None}
-        return res
+            self.product =  None
diff --git a/health_stock_view.xml b/health_stock_view.xml
index de298fe..b00584e 100644
--- a/health_stock_view.xml
+++ b/health_stock_view.xml
@@ -81,7 +81,7 @@
             <field name="name">gnuhealth_ambulatory_care_vaccine_form</field>
         </record>
         -->
-        
+
         <record model="ir.ui.view" id="gnuhealth_patient_rounding_tree">
             <field name="model">gnuhealth.patient.rounding</field>
             <field name="inherit" ref="health_nursing.gnuhealth_patient_rounding_tree"/>
@@ -106,9 +106,9 @@
         </record>
 
         <record model="ir.action.act_window" id="act_prescription_move_form1">
-            <field name="name">Stock Moves</field>
+            <field name="name">Stock Moves [readonly]</field>
             <field name="res_model">stock.move</field>
-            <field name="domain">[('origin.id', '=', Eval('active_id'), 'gnuhealth.prescription.order')]</field>
+            <field name="domain" eval="[('origin.id', '=', Eval('active_id'), 'gnuhealth.prescription.order')]" pyson="1"/>
         </record>
         <record model="ir.action.keyword" id="act_open_prescription_move_keyword1">
             <field name="keyword">form_relate</field>
@@ -117,11 +117,11 @@
         </record>
 
         <!-- Shortcut to stock moves from vaccination model -->
-        
+
         <record model="ir.action.act_window" id="act_vaccination_move_form1">
-            <field name="name">Stock Moves</field>
+            <field name="name">Stock Moves [readonly]</field>
             <field name="res_model">stock.move</field>
-            <field name="domain">[('origin.id', '=', Eval('active_id'), 'gnuhealth.vaccination')]</field>
+            <field name="domain" eval="[('origin.id', '=', Eval('active_id'), 'gnuhealth.vaccination')]" pyson="1"/>
         </record>
         <record model="ir.action.keyword" id="act_open_vaccination_move_keyword1">
             <field name="keyword">form_relate</field>
diff --git a/locale/zh_CN.po b/locale/ar.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/ar.po
index 99f305c..16882d6 100644
--- a/locale/zh_CN.po
+++ b/locale/ar.po
@@ -1,457 +1,365 @@
-# 
-# Translators:
-# Philip Li <Horatii.Lee at gmail.com>, 2014
+# Nab3a <asn09 at aub.edu.lb>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Chinese (http://www.transifex.com/projects/p/GNU_Health/language/zh/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"PO-Revision-Date: 2016-01-08 12:35+0000\n"
+"Last-Translator: Nab3a <asn09 at aub.edu.lb>\n"
+"Language: ar\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Pootle 2.5.0\n"
+"X-POOTLE-MTIME: 1452256551.0\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
-msgstr ""
+msgstr "تحركات البضاعة موجودة سابقاً!"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "You need to select a pharmacy."
-msgstr ""
+msgstr "تحتاج لإختيار الصيدلية"
 
 msgctxt "error:gnuhealth.vaccination.stock.move.create:"
 msgid "Stock moves already exists!."
-msgstr ""
+msgstr "تحركات البضاعة موجودة سابقاً!"
 
 msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr "اللقاح منتهي الصلاحية، من فضلك أخبر مسؤول الصحة ولا تستخدمه "
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr "موقع الرعاية "
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr "اللوازم الطبية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr "الأدوية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr "تحركات المخزون"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "إنشاء تاريخ"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr "الشحنة"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr "الهوية الإسعافية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr "التموين الطبي"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الإسم"
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr "تعليق"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "اكتب مستخدم"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "إنشاء تاريخ"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr "الشحنة"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr "الأدوية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr "الهوية الإسعافية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr "المنتج"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الإسم"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr "تعليق"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "اكتب مستخدم"
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr "موقع التنويم "
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr "اللوازم الطبية"
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr "الأدوية"
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr "تحركات المخزون"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "إنشاء تاريخ"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr "الكثير"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr "المعرف الإسعافي"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr "التموين الطبي"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الإسم"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr "تعليق"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "اكتب مستخدم"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr "إنشاء تاريخ "
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr "إنشاء مستخدم "
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr "الشحنة"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr "الأدوية"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr "الهوية الإسعافية"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr "المنتج"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr "الكمية"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr "الإسم"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr "تعليق"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr "اكتب تاريخ"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr "اكتب مستخدم"
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr "تحركات"
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
-msgstr ""
+msgstr "موقع المخزون "
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr "الشحنة"
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr "تحركات"
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr "المنتج"
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "الهوية"
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr "المستودع"
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr "تاريخ الإنتهاء"
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr "تعليق مختصر على الدواء المحدد"
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr "تعليق مختصر على الدواء المحدد"
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr "تعليق مختصر على الدواء المحدد"
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr "تعليق مختصر على الدواء المحدد"
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
-msgstr ""
+msgstr "هذا الحقل يتضمن رقم الشحنة وتاريخ الإنتهاء"
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr "التموين الطبي لعناية المريض الإسعافية"
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr "أدوية عناية المريض الإسعافية"
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr "التموين الطبي لجولات التمريض"
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr "أدوية جولات التمريض"
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr "إنشاء التحركات المبدأية لمخزون الوصفة"
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
-msgstr ""
+msgstr "إنشاء التحركات المبدأية لمخزون اللقاح"
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr "إنشاء تحركات مخزون الوصفة"
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
-msgstr ""
+msgstr "إنشاء تحركات مخزون اللقاح"
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr "إنشاء تحركات المخزون"
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr "إلغاء"
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr "إنشاء تحركات المخزون"
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr "إلغاء"
diff --git a/locale/zh_CN.po b/locale/de_AT.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/de_AT.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/de_AT.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/el_GR.po b/locale/el_GR.po
index 31a12d5..02c9832 100644
--- a/locale/el_GR.po
+++ b/locale/el_GR.po
@@ -1,20 +1,14 @@
-# 
-# Translators:
-# kvisitor <kvisitor at gnugr.org>, 2013-2015
-# 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 17:01+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: 1452445414.0\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -32,7 +26,9 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "ΛΗΓΜΕΝΟ ΕΜΒΟΛΙΟ. ΠΑΡΑΚΑΛΩ ΕΝΗΜΕΡΩΣΤΕ  ΤΙΣ ΤΟΠΙΚΕΣ ΥΓΕΙΟΝΟΜΙΚΕΣ ΑΡΧΕΣ ΚΑΙ ΜΗ ΤΟ ΧΡΗΣΙΜΟΠΟΙΕΙΤΕ !!!"
+msgstr ""
+"ΛΗΓΜΕΝΟ ΕΜΒΟΛΙΟ. ΠΑΡΑΚΑΛΩ ΕΝΗΜΕΡΩΣΤΕ  ΤΙΣ ΤΟΠΙΚΕΣ ΥΓΕΙΟΝΟΜΙΚΕΣ ΑΡΧΕΣ ΚΑΙ ΜΗ "
+"ΤΟ ΧΡΗΣΙΜΟΠΟΙΕΙΤΕ !!!"
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
@@ -54,10 +50,6 @@ msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
 msgstr "Μετακινήσεις υλικού"
 
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Περιοχή"
-
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
 msgstr "Δημιουργία ημερομηνίας"
@@ -167,10 +159,6 @@ msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
 msgstr "Μετακινήσεις υλικού"
 
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Περιοχή"
-
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
 msgstr "Δημιουργία ημερομηνίας"
@@ -317,7 +305,8 @@ msgstr "Σύντομο σχόλιο για το συγκεκριμμένο φά
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
-msgstr "Αυτό το πεδίο περιλαμβάνει τον αριθμό παρτίδας/Lot και την Ημερομ. λήξης"
+msgstr ""
+"Αυτό το πεδίο περιλαμβάνει τον αριθμό παρτίδας/Lot και την Ημερομ. λήξης"
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
@@ -352,92 +341,12 @@ msgid "Create Vaccination Stock Move"
 msgstr "Δημιουργία κίνησης Αποθεμάτων Εμβολίων"
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "Μετακινήσεις υλικού"
+msgid "Stock Moves [readonly]"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "Μετακινήσεις υλικού"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Έγινε"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Πρόχειρο/ προσχέδιο"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Έγινε"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Πρόχειρο/ προσχέδιο"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Ιατρικές προμήθειες"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Φάρμακο"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Έγινε"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Φάρμακα"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "Μετακινήσεις υλικού"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Ιατρικές προμήθειες"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Φάρμακο"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Έγινε"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Φάρμακα"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Σχέδιο ετοιμότητας"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "Μετακινήσεις υλικού"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Δημιουργία Μετακίνησης συνταγογραφικού υλικού αποθήκης"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Να δημιουργηθεί Μετακίνηση υλικού;"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Να δημιουργηθεί Μετακίνηση υλικού;"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
-msgstr "Δημιουργία κίνησης Αποθεμάτων Εμβολίων"
-
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
-msgstr "Υλικό"
+msgid "Stock Moves [readonly]"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
diff --git a/locale/zh_CN.po b/locale/en_GB.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/en_GB.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/en_GB.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_AR.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/es_AR.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/es_AR.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/es_ES.po b/locale/es_EC.po
similarity index 65%
copy from locale/es_ES.po
copy to locale/es_EC.po
index 4c4a882..940be84 100644
--- a/locale/es_ES.po
+++ b/locale/es_EC.po
@@ -1,22 +1,19 @@
-# 
-# Translators:
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014
-# Carlos <carloschebair at gmail.com>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
+# Fabyc <fabianc7 at gmail.com>, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-30 17:11+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/GNU_Health/language/es/)\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-06 20:11+0000\n"
+"PO-Revision-Date: 2016-01-07 23:58+0000\n"
+"Last-Translator: Fabyc <fabianc7 at gmail.com>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\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: 1452211105.0\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -34,7 +31,9 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "VACUNA VENCIDA. ¡POR FAVOR NO LA USE Y AVISE A LAS AUTORIDADES DE SALUD!"
+msgstr ""
+"LA VACUNA ESTÁ VENCIDA. ¡¡¡ POR FAVOR NO LA USE E INFORME A LAS AUTORIDADES "
+"LOCALES DE SALUD !!!"
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
@@ -42,11 +41,11 @@ msgstr "Cantidad"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "Ubicación cuidados"
+msgstr "Ubicación de atención"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Suministros médicos"
+msgstr "Suministros Médicos"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
@@ -56,17 +55,13 @@ msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Estado"
-
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
@@ -78,7 +73,7 @@ msgstr "Lote"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr "ID de Ambulatorio"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
@@ -99,19 +94,19 @@ msgstr "Comentario"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
@@ -127,7 +122,7 @@ msgstr "Medicamento"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr "ID de Ambulatorio"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
@@ -147,19 +142,19 @@ msgstr "Comentario"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "Ubicación hospitalización"
+msgstr "Bodega de Hospitalización"
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Suministros médicos"
+msgstr "Suministros Médicos"
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
@@ -169,17 +164,13 @@ msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
 msgstr "Movimientos de stock"
 
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Estado"
-
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
@@ -191,11 +182,11 @@ msgstr "Lote"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr "ID de Ambulatorio"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Suministro médico"
+msgstr "Suministro Médico"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
@@ -211,19 +202,19 @@ msgstr "Comentario"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr "Fecha de creación"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr "Creado por usuario"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
@@ -239,7 +230,7 @@ msgstr "Medicamento"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr "ID de Ambulatorio"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
@@ -259,11 +250,11 @@ msgstr "Comentario"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr "Fecha de modificación"
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr "Modificado por usuario"
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
@@ -283,15 +274,15 @@ msgstr "Lote"
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "Asientos"
+msgstr "Movimientos"
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "Productos"
+msgstr "Producto"
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr "Id"
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
@@ -299,23 +290,23 @@ msgstr "Almacén"
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "Fecha de vencimiento"
+msgstr "Fecha de Vencimiento"
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr "Breve comentario sobre el fármaco específico"
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr "Breve comentario sobre el fármaco específico"
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr "Breve comentario sobre el fármaco específico"
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr "Breve comentario sobre el fármaco específico"
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -323,138 +314,154 @@ msgstr "Este campo incluye el número de lote y fecha de vencimiento"
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "Insumos para el cuidado ambulatorio del paciente"
+msgstr "Suministro Médico para la Atención Ambulatoria del Paciente"
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "Medicamento en tratamiento Ambulatorio"
+msgstr "Medicamento para la Atención Ambulatoria del Paciente"
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "Insumo en Rondas"
+msgstr "Suministro Médico para Rondas de enfermería del Paciente"
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "Medicamento en Rondas"
+msgstr "Medicamento en rondas al paciente"
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "Crear movimiento de stock asociado a la receta"
+msgstr "Crear movimiento de stock asociado a la receta - Inicio"
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
-msgstr "Crear movimiento de stock asociado a la vacuna"
+msgstr "Crear movimiento de stock asociado a la vacuna - Inicio"
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "Crear movimiento de stock de prescripción"
+msgstr "Crear movimiento de stock asociado a la receta"
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr "Crear movimiento de stock asociado a la vacuna"
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgid "Stock Moves [readonly]"
+msgstr "Movimientos de stock [sólo lectura]"
 
 msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgid "Stock Moves [readonly]"
+msgstr "Movimientos de stock [sólo lectura]"
 
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Hecho"
+msgctxt ""
+"wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
+msgid "Create Stock Move"
+msgstr "Crear movimiento de stock"
 
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Borrador"
+msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
 
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Hecho"
+msgctxt ""
+"wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
+msgid "Create Stock Move"
+msgstr "Crear movimiento de stock"
 
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Borrador"
+msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
+msgid "Cancel"
+msgstr "Cancelar"
 
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suministors médicos"
+#~ msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
+#~ msgid "State"
+#~ msgstr "Estado"
 
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
+#~ msgctxt "field:gnuhealth.patient.rounding,state:"
+#~ msgid "State"
+#~ msgstr "Estado"
 
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Hecho"
+#~ msgctxt "model:ir.action,name:act_prescription_move_form1"
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
 
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Medicación"
+#~ msgctxt "model:ir.action,name:act_vaccination_move_form1"
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
 
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+#~ msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
+#~ msgid "Done"
+#~ msgstr "Realizado"
 
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suministros médicos"
+#~ msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
+#~ msgid "Draft"
+#~ msgstr "Borrador"
 
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
+#~ msgctxt "selection:gnuhealth.patient.rounding,state:"
+#~ msgid "Done"
+#~ msgstr "Realizado"
 
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Hecho"
+#~ msgctxt "selection:gnuhealth.patient.rounding,state:"
+#~ msgid "Draft"
+#~ msgstr "Borrador"
 
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Medicación"
+#~ msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
+#~ msgid "Medical Supplies"
+#~ msgstr "Suministors Médicos"
 
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Seis P's"
+#~ msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
+#~ msgid "Medicament"
+#~ msgstr "Medicamento"
 
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+#~ msgctxt "view:gnuhealth.patient.ambulatory_care:"
+#~ msgid "Done"
+#~ msgstr "Realizado"
 
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Crear movimiento de stock de prescripción"
+#~ msgctxt "view:gnuhealth.patient.ambulatory_care:"
+#~ msgid "Medication"
+#~ msgstr "Medicación"
 
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "¿Crear movimiento de stock?"
+#~ msgctxt "view:gnuhealth.patient.ambulatory_care:"
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
 
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "¿Crear movimiento de stock?"
+#~ msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
+#~ msgid "Medical Supplies"
+#~ msgstr "Suministros Médicos"
 
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
-msgstr "Crear movimiento de stock asociado a la vacuna"
+#~ msgctxt "view:gnuhealth.patient.rounding.medicament:"
+#~ msgid "Medicament"
+#~ msgstr "Medicamento"
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
-msgstr "Logística"
+#~ msgctxt "view:gnuhealth.patient.rounding:"
+#~ msgid "Done"
+#~ msgstr "Realizado"
 
-msgctxt ""
-"wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
-msgid "Create Stock Move"
-msgstr "Crear movimiento de stock"
+#~ msgctxt "view:gnuhealth.patient.rounding:"
+#~ msgid "Medication"
+#~ msgstr "Medicación"
 
-msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgctxt "view:gnuhealth.patient.rounding:"
+#~ msgid "Six P's"
+#~ msgstr "Seis P's"
 
-msgctxt ""
-"wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
-msgid "Create Stock Move"
-msgstr "Crear movimiento de stock"
+#~ msgctxt "view:gnuhealth.patient.rounding:"
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
 
-msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgctxt "view:gnuhealth.prescription.stock.move.init:"
+#~ msgid "Create Prescription Stock Move"
+#~ msgstr "Crear movimiento de stock asociado a la receta"
+
+#~ msgctxt "view:gnuhealth.prescription.stock.move.init:"
+#~ msgid "Create Stock Move?"
+#~ msgstr "¿Crear movimiento de stock?"
+
+#~ msgctxt "view:gnuhealth.vaccination.stock.move.init:"
+#~ msgid "Create Stock Move?"
+#~ msgstr "¿Crear movimiento de stock?"
+
+#~ msgctxt "view:gnuhealth.vaccination.stock.move.init:"
+#~ msgid "Create Vaccination Stock Move"
+#~ msgstr "Crear movimiento de stock asociado a la vacuna"
+
+#~ msgctxt "view:gnuhealth.vaccination:"
+#~ msgid "Stock"
+#~ msgstr "Stock"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 4c4a882..d026e91 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -1,460 +1,356 @@
-# 
-# Translators:
-# Bruno Villasanti <bvillasanti at thymbra.com>, 2014
-# Carlos <carloschebair at gmail.com>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 2013
-# Luis Falcon <lfalcon at gnusolidario.org>, 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-30 17:11+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/GNU_Health/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
-msgstr "¡El movimiento de stock ya existe!"
+msgstr ""
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "You need to select a pharmacy."
-msgstr "Es necesario seleccionar una farmacia."
+msgstr ""
 
 msgctxt "error:gnuhealth.vaccination.stock.move.create:"
 msgid "Stock moves already exists!."
-msgstr "¡El movimiento de stock ya existe!"
+msgstr ""
 
 msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "VACUNA VENCIDA. ¡POR FAVOR NO LA USE Y AVISE A LAS AUTORIDADES DE SALUD!"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "Ubicación cuidados"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Suministros médicos"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "Medicamentos"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Estado"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Suministro médico"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Comentario"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "Medicamento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "Comentario"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "Ubicación hospitalización"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Suministros médicos"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "Medicamentos"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Estado"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Suministro médico"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Comentario"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "Fecha creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "Usuario creación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "Medicamento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "ID Ambulatorio"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "Comentario"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "Fecha modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "Usuario modificación"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
-msgstr "Ubicación de stock"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "Asientos"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "Productos"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "Almacén"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "Fecha de vencimiento"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve comentario sobre la droga"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
-msgstr "Este campo incluye el número de lote y fecha de vencimiento"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "Insumos para el cuidado ambulatorio del paciente"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "Medicamento en tratamiento Ambulatorio"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "Insumo en Rondas"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "Medicamento en Rondas"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "Crear movimiento de stock asociado a la receta"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
-msgstr "Crear movimiento de stock asociado a la vacuna"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "Crear movimiento de stock de prescripción"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
-msgstr "Crear movimiento de stock asociado a la vacuna"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgid "Stock Moves [readonly]"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Hecho"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Hecho"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suministors médicos"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Hecho"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Medicación"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suministros médicos"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Hecho"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Medicación"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Seis P's"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Crear movimiento de stock de prescripción"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "¿Crear movimiento de stock?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "¿Crear movimiento de stock?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
-msgstr "Crear movimiento de stock asociado a la vacuna"
-
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
-msgstr "Logística"
+msgid "Stock Moves [readonly]"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Crear movimiento de stock"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Crear movimiento de stock"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_MX.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/es_MX.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/es_MX.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/es_PE.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/es_PE.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/es_PE.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 1847045..d026e91 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -1,20 +1,6 @@
-# 
-# Translators:
-# Mathieu Anquetin <mathieu at anquetin.eu>, 2013
-# rootio <david at vmail.me>, 2013
+#
 msgid ""
-msgstr ""
-"Project-Id-Version: GNU Health\n"
-"Report-Msgid-Bugs-To: https://savannah.gnu.org/bugs/?group=health\n"
-"POT-Creation-Date: 2015-01-27 11:17+0000\n"
-"PO-Revision-Date: 2015-01-26 16:55+0000\n"
-"Last-Translator: Bruno Villasanti <bvillasanti at thymbra.com>\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/GNU_Health/language/fr_FR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr_FR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -32,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "Vaccin périmé. S'IL VOUS PLAÎT INFORMER LES AUTORITÉS SANITAIRES LOCALES ET NE L'UTILISEZ PAS!"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "Emplacement des soins"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Fournitures médicales"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "Médicaments"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Etat"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lot"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatoire ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Fourniture médicale"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Commentaire"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "Lot"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "Médicament"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatoire ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "Produit"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "Commentaire"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "Lieu d'hospitalisation"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Fournitures médicales"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "Médicaments"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Etat"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lot"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatoire ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Fourniture médicale"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Commentaire"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "Date de création"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "Utilisateur qui a crée"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "Lot"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "Médicament"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatoire ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "Produit"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "Nom"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "Commentaire"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "Date d'écriture"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "Utilisateur qui a modifié"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "Déplacements"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -277,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "Lot"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "Déplacements"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "Produit"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "Entrepôt"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "Date d'expiration"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "bref commentaire sur le médicament spécifique"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "bref commentaire sur le médicament spécifique"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "bref commentaire sur le médicament spécifique"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "bref commentaire sur le médicament spécifique"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -321,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "Fournitures médicales ambulatoires pour patients"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "Médicaments de soins ambulatoires pour patients"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "Ronde de fournitures médicales pour patients"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "Ronde de médicament pour patients"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "Créer prescription de mouvement de stock"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -345,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "Créer prescription de mouvement de stock"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Fournitures médicales"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Médicament"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Médicaments"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Fournitures médicales"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Médicament"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Fait"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Médicaments"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Six P"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "Mouvements de Stock"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Créer prescription de mouvement de stock"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Créer Mouvement de Stock?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Créer Mouvement de Stock?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Créer Mouvement de Stock?"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Annuler "
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Créer Mouvement de Stock?"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Annuler"
+msgstr ""
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 68c6b8d..d026e91 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1,20 +1,6 @@
-# 
-# Translators:
-# docmimmo <docmimmo at gmail.com>, 2013
-# Gabriele Meloncelli <gabriele.meloncelli at virgilio.it>, 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: Italian (http://www.transifex.com/projects/p/GNU_Health/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "error:gnuhealth.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -32,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "VACCINO SCADUTO.SI PREGA INFORMARE LE AUTORITÀ SANITARIE LOCALI E NON USARLO !!!"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantità"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "Luogo di Cura"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Farmaci sostitutivi"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "Medicamenti"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "movimenti di magazzino"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Stato"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatorio N."
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Provvista medica"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Quantità"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Commento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "Lotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "Farmaco"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatorio N."
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "Prodotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantità"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "Commento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "Sezione ricoveri"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "Farmaci sostitutivi"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "Medicamenti"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "Movimenti di Magazzino"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Stato"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "Lotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatorio N."
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "Provvista medica"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "Quantità"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "Commento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "Creare Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "Creare utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "Lotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "Farmaco"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "Ambulatorio N."
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "Prodotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "Quantità"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "Nome"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "Commento"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "Scrivere Data"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "Scrivere nome utente"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "Movimentazioni"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "Identificazione"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -277,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "Lotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "Movimentazioni"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "Prodotto"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "Magazzino"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "Data di scadenza"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve commento sul farmaco specifico"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve commento sul farmaco specifico"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve commento sul farmaco specifico"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "Breve commento sul farmaco specifico"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -321,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "Fornitura medicale per ambulatorio"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "Farmaci per ambulatorio medico"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "Dispositivo Medico per l'Accudimento Periodico del Paziente"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "Medicamento per l'Accudimento Periodico del Paziente"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "Inizia Creazione Movimento di Magazzino per Ricetta"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -345,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "Crea Movimento di Magazzino per Ricetta"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "movimenti di magazzino"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "movimenti di magazzino"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Fatto"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Bozza"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Fatto"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Bozza"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Farmaci sostitutivi"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Farmaco"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Fatto"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Farmaci"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "movimenti di magazzino"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Farmaci sostitutivi"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Farmaco"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Fatto"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Farmaci"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Valutazione Neuromuscolare (Six P)"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "movimenti di magazzino"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Crea Movimento di Magazzino per Ricetta"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Creare movimento di magazzino ?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Creare movimento di magazzino ?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Crea Movimento di Magazzino"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Cancellare"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "Crea Movimento di Magazzino"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "Cancellare"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/kn.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/kn.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/kn.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/zh_CN.po b/locale/lo.po
similarity index 64%
copy from locale/zh_CN.po
copy to locale/lo.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/lo.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 90fc6fa..8ab760c 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,19 +1,14 @@
-# 
-# Translators:
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,7 +26,9 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "VACINA VENCIDA. Por favor, informe as autoridades de saúde locais e NÃO USE!!"
+msgstr ""
+"VACINA VENCIDA. Por favor, informe as autoridades de saúde locais e NÃO "
+"USE!!"
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
@@ -53,10 +50,6 @@ msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
 msgstr "Baixa em Estoque"
 
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "Estado"
-
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
 msgstr "Data de criação"
@@ -166,10 +159,6 @@ msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
 msgstr "Baixa em Estoque"
 
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "Estado"
-
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
 msgstr "Criar Data"
@@ -351,93 +340,13 @@ msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "Baixa em Estoque"
+msgid "Stock Moves [readonly]"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "Baixa em Estoque"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "Feito"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "Rascunho"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "Feito"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "Rascunho"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suprimentos Médicos"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "Feito"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "Medicação"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "Baixa em Estoque"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "Suprimentos Médicos"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "Medicamento"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "Feito"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "Medicação"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "Seis P's"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "Baixa em Estoque"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "Criar baixa de estoque com prescrição"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Criar baixa de Estoque?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "Criar baixa de Estoque?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
-msgstr "Estoque"
-
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 99f305c..d026e91 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,19 +1,6 @@
-# 
-# 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.prescription.stock.move.create:"
 msgid "Stock moves already exists!."
@@ -31,244 +18,236 @@ msgctxt "error:gnuhealth.vaccination:"
 msgid ""
 "EXPIRED VACCINE. PLEASE INFORM  THE LOCAL HEALTH AUTHORITIES AND DO NOT USE "
 "IT !!!"
-msgstr "该疫苗已过期不能使用。请告知当地卫生部门。"
+msgstr ""
 
 msgctxt "field:gnuhealth.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,care_location:"
 msgid "Care Location"
-msgstr "保健的位置"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care,moves:"
 msgid "Stock Moves"
-msgstr "股价波动"
-
-msgctxt "field:gnuhealth.patient.ambulatory_care,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt ""
 "field:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.ambulatory_care.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,hospitalization_location:"
 msgid "Hospitalization Location"
-msgstr "住院部"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medical_supplies:"
 msgid "Medical Supplies"
-msgstr "药物供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,medicaments:"
 msgid "Medicaments"
-msgstr "药物"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding,moves:"
 msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "field:gnuhealth.patient.rounding,state:"
-msgid "State"
-msgstr "声明"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,product:"
 msgid "Medical Supply"
-msgstr "医疗供给"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medical_supply,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_date:"
 msgid "Create Date"
-msgstr "创建日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,create_uid:"
 msgid "Create User"
-msgstr "创建用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,medicament:"
 msgid "Medicament"
-msgstr "药品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,name:"
 msgid "Ambulatory ID"
-msgstr "流水号"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,quantity:"
 msgid "Quantity"
-msgstr "数量"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,rec_name:"
 msgid "Name"
-msgstr "名字"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Comment"
-msgstr "评论"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_date:"
 msgid "Write Date"
-msgstr "请您写日期"
+msgstr ""
 
 msgctxt "field:gnuhealth.patient.rounding.medicament,write_uid:"
 msgid "Write User"
-msgstr "请您写用户"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.order,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.prescription.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,location:"
 msgid "Stock Location"
@@ -276,43 +255,43 @@ msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,lot:"
 msgid "Lot"
-msgstr "挂号"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,moves:"
 msgid "Moves"
-msgstr "波动"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination,product:"
 msgid "Product"
-msgstr "产品"
+msgstr ""
 
 msgctxt "field:gnuhealth.vaccination.stock.move.init,id:"
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 msgctxt "field:party.party,warehouse:"
 msgid "Warehouse"
-msgstr "仓库"
+msgstr ""
 
 msgctxt "field:stock.lot,expiration_date:"
 msgid "Expiration Date"
-msgstr "有效期"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.ambulatory_care.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medical_supply,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.patient.rounding.medicament,short_comment:"
 msgid "Short comment on the specific drug"
-msgstr "特定药品的简单说明"
+msgstr ""
 
 msgctxt "help:gnuhealth.vaccination,lot:"
 msgid "This field includes the lot number and expiration date"
@@ -320,23 +299,23 @@ msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medical_supply,name:"
 msgid "Patient Ambulatory Care Medical Supply"
-msgstr "病人门诊医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.ambulatory_care.medicament,name:"
 msgid "Patient Ambulatory Care Medicament"
-msgstr "病人门诊医药"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medical_supply,name:"
 msgid "Patient Rounding Medical Supply"
-msgstr "病人舍入医疗供应"
+msgstr ""
 
 msgctxt "model:gnuhealth.patient.rounding.medicament,name:"
 msgid "Patient Rounding Medicament"
-msgstr "病人舍入药剂"
+msgstr ""
 
 msgctxt "model:gnuhealth.prescription.stock.move.init,name:"
 msgid "Create Prescription Stock Move Init"
-msgstr "创建处方库存波动初始化"
+msgstr ""
 
 msgctxt "model:gnuhealth.vaccination.stock.move.init,name:"
 msgid "Create Vaccination Stock Move Init"
@@ -344,114 +323,34 @@ msgstr ""
 
 msgctxt "model:ir.action,name:act_create_prescription_stock_move"
 msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_create_vaccination_stock_move"
 msgid "Create Vaccination Stock Move"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_prescription_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "model:ir.action,name:act_vaccination_move_form1"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.ambulatory_care,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "selection:gnuhealth.patient.rounding,state:"
-msgid "Draft"
-msgstr "草稿"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.ambulatory_care:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.patient.rounding.medical_supply:"
-msgid "Medical Supplies"
-msgstr "药物供给"
-
-msgctxt "view:gnuhealth.patient.rounding.medicament:"
-msgid "Medicament"
-msgstr "药品"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Done"
-msgstr "完成"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Medication"
-msgstr "药物"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Six P's"
-msgstr "6个p"
-
-msgctxt "view:gnuhealth.patient.rounding:"
-msgid "Stock Moves"
-msgstr "库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Prescription Stock Move"
-msgstr "创建处方库存波动"
-
-msgctxt "view:gnuhealth.prescription.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Stock Move?"
-msgstr "创建库存波动?"
-
-msgctxt "view:gnuhealth.vaccination.stock.move.init:"
-msgid "Create Vaccination Stock Move"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
-msgctxt "view:gnuhealth.vaccination:"
-msgid "Stock"
+msgctxt "model:ir.action,name:act_vaccination_move_form1"
+msgid "Stock Moves [readonly]"
 msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.prescription.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.prescription.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
 
 msgctxt ""
 "wizard_button:gnuhealth.vaccination.stock.move.create,start,create_stock_move:"
 msgid "Create Stock Move"
-msgstr "创建库存波动"
+msgstr ""
 
 msgctxt "wizard_button:gnuhealth.vaccination.stock.move.create,start,end:"
 msgid "Cancel"
-msgstr "取消"
+msgstr ""
diff --git a/setup.py b/setup.py
index 42e7a8b..9cb9fb8 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_stock.py b/tests/test_health_stock.py
index 6535634..79ca283 100644
--- a/tests/test_health_stock.py
+++ b/tests/test_health_stock.py
@@ -1,35 +1,13 @@
-#!/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 HealthStockTestCase(unittest.TestCase):
+class HealthStockTestCase(ModuleTestCase):
     '''
     Test HealthStock module.
     '''
-
-    def setUp(self):
-        trytond.tests.test_tryton.install_module('health_stock')
-
-    def test0005views(self):
-        '''
-        Test views.
-        '''
-        test_view('health_stock')
-
-    def test0006depends(self):
-        '''
-        Test depends.
-        '''
-        test_depends()
+    module = 'health_stock'
 
 
 def suite():
@@ -37,6 +15,3 @@ def suite():
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
         HealthStockTestCase))
     return suite
-
-if __name__ == '__main__':
-    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/tryton.cfg b/tryton.cfg
index 3ccb7bc..e57db8a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.1
+version=3.0.1
 depends:
     health_nursing
     stock_lot
diff --git a/trytond_health_stock.egg-info/PKG-INFO b/trytond_health_stock.egg-info/PKG-INFO
index c3caa08..d69eb53 100644
--- a/trytond_health_stock.egg-info/PKG-INFO
+++ b/trytond_health_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-health-stock
-Version: 2.8.1
+Version: 3.0.1
 Summary: GNU Health Stock Module
 Home-page: http://health.gnu.org/
 Author: GNU Solidario
diff --git a/trytond_health_stock.egg-info/SOURCES.txt b/trytond_health_stock.egg-info/SOURCES.txt
index 6ede06d..b661b3a 100644
--- a/trytond_health_stock.egg-info/SOURCES.txt
+++ b/trytond_health_stock.egg-info/SOURCES.txt
@@ -8,11 +8,20 @@ setup.py
 ./health_stock_view.xml
 ./tryton.cfg
 ./doc/index.rst
+./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
 ./tests/__init__.py
@@ -45,11 +54,20 @@ setup.py
 ./wizard/create_vaccination_stock_move.xml
 ./wizard/wizard_create_prescription_stock_move.py
 ./wizard/wizard_create_vaccination_stock_move.py
+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
 trytond_health_stock.egg-info/PKG-INFO
diff --git a/trytond_health_stock.egg-info/requires.txt b/trytond_health_stock.egg-info/requires.txt
index 4568d2b..e5accc8 100644
--- a/trytond_health_stock.egg-info/requires.txt
+++ b/trytond_health_stock.egg-info/requires.txt
@@ -1,3 +1,3 @@
-trytond_health_nursing == 2.8.1
-trytond_stock_lot >= 3.4, < 3.5
-trytond >= 3.4, < 3.5
+trytond_health_nursing == 3.0.1
+trytond_stock_lot >= 3.8, < 3.9
+trytond >= 3.8, < 3.9
diff --git a/view/ambulatory_care_form.xml b/view/ambulatory_care_form.xml
index 2397ab9..552c1c1 100644
--- a/view/ambulatory_care_form.xml
+++ b/view/ambulatory_care_form.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data>
-    <xpath expr="/form/notebook/page[@id="ambulatory_care_other_information"]" position="after">
+    <xpath expr="/form/notebook/page[@id="ambulatory_care_main"]" position="after">
         <page string="Medication" id="medication">
             <label name="care_location"/>
             <field name="care_location"/>
@@ -11,12 +11,8 @@
             <field name="moves" colspan="4"/>
         </page>
     </xpath>
-    <xpath expr="/form/notebook" position="after">
-        <group col="5" colspan="4" id="buttons">
-            <label name="state"/>
-            <field name="state"/>
-            <button name="done" string="Done" icon="tryton-go-next"/>
-        </group>
+    <xpath expr="//button[@name="end_session"]" position="replace">
+        <button name="done" string="Done / Create Stock moves" icon="tryton-go-next"/>
     </xpath>
     <xpath expr="/form/notebook/page[@id="ambulatory_care_main"]/field[@name="session_notes"]" position="replace_attributes">
         <field name="session_notes" height="50"/>
diff --git a/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml b/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml
index 1838bd9..6e6320e 100644
--- a/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml
+++ b/view/gnuhealth_ambulatory_care_medical_supplies_tree.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<tree string="Medical Supplies">
-    <field name="product"/>
-    <field name="quantity"/>
-    <field name="lot"/>
+<tree string="Medical Supplies" editable="top">
+    <field name="product" expand="1"/>
+    <field name="quantity" expand="1"/>
+    <field name="lot" expand="1"/>
 </tree>
diff --git a/view/gnuhealth_ambulatory_care_medicament_tree.xml b/view/gnuhealth_ambulatory_care_medicament_tree.xml
index 2083043..315b77c 100644
--- a/view/gnuhealth_ambulatory_care_medicament_tree.xml
+++ b/view/gnuhealth_ambulatory_care_medicament_tree.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tree string="Medicament">
-    <field name="medicament"/>
-    <field name="quantity"/>
-    <field name="lot"/>
+<tree string="Medicament" editable="top">
+    <field name="medicament" expand="1"/>
+    <field name="quantity" expand="1"/>
+    <field name="lot" expand="1"/>
     <field name="short_comment" expand="1"/>
 </tree>
diff --git a/view/gnuhealth_ambulatory_care_vaccine_tree.xml b/view/gnuhealth_ambulatory_care_vaccine_tree.xml
index 8439570..20820a6 100644
--- a/view/gnuhealth_ambulatory_care_vaccine_tree.xml
+++ b/view/gnuhealth_ambulatory_care_vaccine_tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tree string="Vaccines">
+<tree string="Vaccines" editable="top">
     <field name="vaccine"/>
     <field name="quantity"/>
     <field name="lot"/>
diff --git a/view/gnuhealth_patient_rounding.xml b/view/gnuhealth_patient_rounding.xml
index a8ef7d4..445372d 100644
--- a/view/gnuhealth_patient_rounding.xml
+++ b/view/gnuhealth_patient_rounding.xml
@@ -11,13 +11,11 @@
             <field name="moves" colspan="4"/>
         </page>
     </xpath>
-    <xpath expr="/form/notebook" position="after">
-        <group col="5" colspan="4" id="buttons">
-            <label name="state"/>
-            <field name="state"/>
-            <button name="done" string="Done" icon="tryton-go-next"/>
-        </group>
+
+    <xpath expr="//button[@name="end_rounding"]" position="replace">
+        <button name="done" string="Done / Create Stock moves" icon="tryton-go-next"/>
     </xpath>
+
     <xpath expr="/form/notebook/page[@id="rounding_main"]/field[@name="round_summary"]" position="replace_attributes">
         <field name="round_summary" height="50"/>
     </xpath>
diff --git a/view/gnuhealth_rounding_medical_supply_tree.xml b/view/gnuhealth_rounding_medical_supply_tree.xml
index 1838bd9..243bb74 100644
--- a/view/gnuhealth_rounding_medical_supply_tree.xml
+++ b/view/gnuhealth_rounding_medical_supply_tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tree string="Medical Supplies">
+<tree string="Medical Supplies" editable="top">
     <field name="product"/>
     <field name="quantity"/>
     <field name="lot"/>
diff --git a/view/gnuhealth_rounding_medicament_tree.xml b/view/gnuhealth_rounding_medicament_tree.xml
index 2083043..67a15b0 100644
--- a/view/gnuhealth_rounding_medicament_tree.xml
+++ b/view/gnuhealth_rounding_medicament_tree.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tree string="Medicament">
-    <field name="medicament"/>
-    <field name="quantity"/>
+<tree string="Medicament" editable="top">
+    <field name="medicament" expand="1"/>
+    <field name="quantity" expand="1"/>
     <field name="lot"/>
     <field name="short_comment" expand="1"/>
 </tree>
diff --git a/view/gnuhealth_rounding_vaccine_tree.xml b/view/gnuhealth_rounding_vaccine_tree.xml
index 8439570..6ddb2f1 100644
--- a/view/gnuhealth_rounding_vaccine_tree.xml
+++ b/view/gnuhealth_rounding_vaccine_tree.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<tree string="Vaccines">
-    <field name="vaccine"/>
-    <field name="quantity"/>
-    <field name="lot"/>
-    <field name="dose"/>
-    <field name="next_dose_date"/>
+<tree string="Vaccines" editable="top">
+    <field name="vaccine" expand="1"/>
+    <field name="quantity" expand="1"/>
+    <field name="lot" expand="1"/>
+    <field name="dose" expand="1"/>
+    <field name="next_dose_date" expand="1"/>
 </tree>
diff --git a/wizard/__init__.py b/wizard/__init__.py
index 797dad5..094da09 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
diff --git a/wizard/wizard_create_prescription_stock_move.py b/wizard/wizard_create_prescription_stock_move.py
index dcc9e68..0a0313d 100644
--- a/wizard/wizard_create_prescription_stock_move.py
+++ b/wizard/wizard_create_prescription_stock_move.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>
 #
 #    Copyright (C) 2013  Sebastian Marro <smarro at gnusolidario.org>
 #
@@ -51,6 +51,7 @@ class CreatePrescriptionStockMove(Wizard):
         StockMove = pool.get('stock.move')
         Prescription = pool.get('gnuhealth.prescription.order')
 
+        moves = []
         prescriptions = Prescription.browse(Transaction().context.get(
             'active_ids'))
         for prescription in prescriptions:
@@ -61,28 +62,20 @@ class CreatePrescriptionStockMove(Wizard):
             if not prescription.pharmacy:
                 self.raise_user_error('no_pharmacy_selected')
 
-            lines = []
             for line in prescription.prescription_line:
-                line_data = {}
-                line_data['origin'] = str(prescription)
-                line_data['from_location'] = \
-                    prescription.pharmacy.warehouse.storage_location.id
-                line_data['to_location'] = \
-                    prescription.patient.name.customer_location.id
-                line_data['product'] = \
-                    line.medicament.name.id
-                line_data['unit_price'] = \
-                    line.medicament.name.list_price
-                line_data['quantity'] = line.quantity
-                line_data['uom'] = \
-                    line.medicament.name.default_uom.id
-                line_data['state'] = 'draft'
-                lines.append(line_data)
-                
-            moves = StockMove.create(lines)
-            StockMove.assign(moves)
-            StockMove.do(moves)
-
+                move = StockMove()
+                move.origin = prescription
+                move.from_location = (
+                    prescription.pharmacy.warehouse.storage_location)
+                move.to_location = (
+                    prescription.patient.name.customer_location)
+                move.product = line.medicament.name
+                move.unit_price = line.medicament.name.list_price
+                move.quantity = line.quantity
+                move.uom = line.medicament.name.default_uom
+                moves.append(move)
+        StockMove.save(moves)
+        StockMove.do(moves)
         return 'end'
 
     @classmethod
diff --git a/wizard/wizard_create_vaccination_stock_move.py b/wizard/wizard_create_vaccination_stock_move.py
index af62aeb..1d50358 100644
--- a/wizard/wizard_create_vaccination_stock_move.py
+++ b/wizard/wizard_create_vaccination_stock_move.py
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 #    GNU Health: The Free Health and Hospital Information System
-#    Copyright (C) 2008-2015 Luis Falcon <falcon at gnu.org>
-#    Copyright (C) 2011-2015 GNU Solidario <health at gnusolidario.org>
+#    Copyright (C) 2008-2016 Luis Falcon <falcon at gnu.org>
+#    Copyright (C) 2011-2016 GNU Solidario <health at gnusolidario.org>
 #    Copyright (C) 2013  Sebastian Marro <smarro at gnusolidario.org>
 #
 #    This program is free software: you can redistribute it and/or modify
-- 
tryton-modules-health-stock



More information about the tryton-debian-vcs mailing list