Merge lp:~vauxoo/addons-vauxoo/7.0-translate_multireport-dev_luis into lp:addons-vauxoo/7.0

Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 1084
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-translate_multireport-dev_luis
Merge into: lp:addons-vauxoo/7.0
Diff against target: 163 lines (+123/-0)
8 files modified
hr_expense_analytic/i18n/es_MX.po (+1/-0)
hr_expense_replenishment/i18n/es_MX.po (+1/-0)
hr_expense_replenishment_cancel/i18n/es_MX.po (+1/-0)
hr_expense_replenishment_tax/i18n/es_MX.po (+1/-0)
hr_payroll_cancel/i18n/es.po (+21/-0)
hr_payroll_cancel/i18n/es_MX.po (+21/-0)
report_multicompany/i18n/es.po (+76/-0)
report_multicompany/i18n/es_MX.po (+1/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-translate_multireport-dev_luis
Reviewer Review Type Date Requested Status
Luis Torres - http://www.vauxoo.com Needs Resubmitting
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Needs Fixing
Review via email: mp+225700@code.launchpad.net

Description of the change

Se completo traducción de algunos modulos que tienen que ver con factura y nomina electronica

To post a comment you must log in.
Revision history for this message
Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr) wrote :

@LuisT

Puedes agregarle el asentó a compañía. Ya que no se lo colocaste.

review: Needs Fixing
1073. By Luis Torres - http://www.vauxoo.com

[MERGE]Update changes

1074. By Luis Torres - http://www.vauxoo.com

[REF]Completed orthography

Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se resolvió la ortografia

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'hr_expense_analytic/i18n/es_MX.po'
2--- hr_expense_analytic/i18n/es_MX.po 1970-01-01 00:00:00 +0000
3+++ hr_expense_analytic/i18n/es_MX.po 2014-07-16 17:00:45 +0000
4@@ -0,0 +1,1 @@
5+
6
7=== added file 'hr_expense_replenishment/i18n/es_MX.po'
8--- hr_expense_replenishment/i18n/es_MX.po 1970-01-01 00:00:00 +0000
9+++ hr_expense_replenishment/i18n/es_MX.po 2014-07-16 17:00:45 +0000
10@@ -0,0 +1,1 @@
11+
12
13=== added file 'hr_expense_replenishment_cancel/i18n/es_MX.po'
14--- hr_expense_replenishment_cancel/i18n/es_MX.po 1970-01-01 00:00:00 +0000
15+++ hr_expense_replenishment_cancel/i18n/es_MX.po 2014-07-16 17:00:45 +0000
16@@ -0,0 +1,1 @@
17+
18
19=== added file 'hr_expense_replenishment_tax/i18n/es_MX.po'
20--- hr_expense_replenishment_tax/i18n/es_MX.po 1970-01-01 00:00:00 +0000
21+++ hr_expense_replenishment_tax/i18n/es_MX.po 2014-07-16 17:00:45 +0000
22@@ -0,0 +1,1 @@
23+
24
25=== added directory 'hr_payroll_cancel/i18n'
26=== added file 'hr_payroll_cancel/i18n/es.po'
27--- hr_payroll_cancel/i18n/es.po 1970-01-01 00:00:00 +0000
28+++ hr_payroll_cancel/i18n/es.po 2014-07-16 17:00:45 +0000
29@@ -0,0 +1,21 @@
30+# Translation of OpenERP Server.
31+# This file contains the translation of the following modules:
32+#
33+msgid ""
34+msgstr ""
35+"Project-Id-Version: OpenERP Server 7.0\n"
36+"Report-Msgid-Bugs-To: \n"
37+"POT-Creation-Date: 2014-07-04 17:34+0000\n"
38+"PO-Revision-Date: 2014-07-04 17:34+0000\n"
39+"Last-Translator: <>\n"
40+"Language-Team: \n"
41+"MIME-Version: 1.0\n"
42+"Content-Type: text/plain; charset=UTF-8\n"
43+"Content-Transfer-Encoding: \n"
44+"Plural-Forms: \n"
45+
46+#. module: hr_payroll_cancel
47+#: view:hr.payslip:0
48+msgid "draft,hr_check,confirm,verify,done"
49+msgstr "draft,hr_check,confirm,verify,done"
50+
51
52=== added file 'hr_payroll_cancel/i18n/es_MX.po'
53--- hr_payroll_cancel/i18n/es_MX.po 1970-01-01 00:00:00 +0000
54+++ hr_payroll_cancel/i18n/es_MX.po 2014-07-16 17:00:45 +0000
55@@ -0,0 +1,21 @@
56+# Translation of OpenERP Server.
57+# This file contains the translation of the following modules:
58+#
59+msgid ""
60+msgstr ""
61+"Project-Id-Version: OpenERP Server 7.0\n"
62+"Report-Msgid-Bugs-To: \n"
63+"POT-Creation-Date: 2014-07-04 17:34+0000\n"
64+"PO-Revision-Date: 2014-07-04 17:34+0000\n"
65+"Last-Translator: <>\n"
66+"Language-Team: \n"
67+"MIME-Version: 1.0\n"
68+"Content-Type: text/plain; charset=UTF-8\n"
69+"Content-Transfer-Encoding: \n"
70+"Plural-Forms: \n"
71+
72+#. module: hr_payroll_cancel
73+#: view:hr.payslip:0
74+msgid "draft,hr_check,confirm,verify,done"
75+msgstr "draft,hr_check,confirm,verify,done"
76+
77
78=== added file 'report_multicompany/i18n/es.po'
79--- report_multicompany/i18n/es.po 1970-01-01 00:00:00 +0000
80+++ report_multicompany/i18n/es.po 2014-07-16 17:00:45 +0000
81@@ -0,0 +1,76 @@
82+# Translation of OpenERP Server.
83+# This file contains the translation of the following modules:
84+# * report_multicompany
85+#
86+msgid ""
87+msgstr ""
88+"Project-Id-Version: OpenERP Server 7.0\n"
89+"Report-Msgid-Bugs-To: \n"
90+"POT-Creation-Date: 2014-07-04 17:07+0000\n"
91+"PO-Revision-Date: 2014-07-04 17:07+0000\n"
92+"Last-Translator: <>\n"
93+"Language-Team: \n"
94+"MIME-Version: 1.0\n"
95+"Content-Type: text/plain; charset=UTF-8\n"
96+"Content-Transfer-Encoding: \n"
97+"Plural-Forms: \n"
98+
99+#. module: report_multicompany
100+#: model:ir.model,name:report_multicompany.model_report_multicompany
101+msgid "report.multicompany"
102+msgstr "report.multicompany"
103+
104+#. module: report_multicompany
105+#: field:report.multicompany,report_name:0
106+msgid "Report Name"
107+msgstr "Nombre Reporte"
108+
109+#. module: report_multicompany
110+#: field:report.multicompany,sequence:0
111+msgid "Sequence"
112+msgstr "Secuencia"
113+
114+#. module: report_multicompany
115+#: view:report.multicompany:0
116+msgid "Report Multicompany"
117+msgstr "Reporte Multicompañía"
118+
119+#. module: report_multicompany
120+#: view:report.multicompany:0
121+#: field:report.multicompany,company_id:0
122+msgid "Company"
123+msgstr "Compañía"
124+
125+#. module: report_multicompany
126+#: view:report.multicompany:0
127+msgid "Group By..."
128+msgstr "Agrupar por..."
129+
130+#. module: report_multicompany
131+#: help:report.multicompany,report_id:0
132+msgid "This report template will be assigned for electronic invoicing in your company"
133+msgstr "Esta plantilla de reporte será asignada para el reporte de FacturaE de la compañía"
134+
135+#. module: report_multicompany
136+#: model:ir.actions.act_window,name:report_multicompany.report_multicompany_list_action
137+#: model:ir.ui.menu,name:report_multicompany.report_multicompany_menu
138+msgid "Report Multicompany Settings"
139+msgstr "Configuración del reporte multicompañías"
140+
141+#. module: report_multicompany
142+#: view:report.multicompany:0
143+#: field:report.multicompany,model:0
144+msgid "Model"
145+msgstr "Modelo"
146+
147+#. module: report_multicompany
148+#: view:report.multicompany:0
149+msgid "Search Report Multicompany"
150+msgstr "Buscar reporte multicompañía"
151+
152+#. module: report_multicompany
153+#: view:report.multicompany:0
154+#: field:report.multicompany,report_id:0
155+msgid "Report Template"
156+msgstr "Plantilla Reporte"
157+
158
159=== added file 'report_multicompany/i18n/es_MX.po'
160--- report_multicompany/i18n/es_MX.po 1970-01-01 00:00:00 +0000
161+++ report_multicompany/i18n/es_MX.po 2014-07-16 17:00:45 +0000
162@@ -0,0 +1,1 @@
163+