\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-13 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+"Se está baleiro, é un día festivo para toda a compañía. Se hai un recurso "
+"seleccionado, o festivo/ausencia só é para ese recurso."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Venres"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Tipo de recurso"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr "Detalle ausencia"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr "Ausencias de recursos"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+msgid "Working Time"
+msgstr "Horario de traballo"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Xoves"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Domingo"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr "Buscar recurso"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Responsable do grupo de traballo"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "O horario de traballo comezará desde"
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"Erro! A data inicial de ausencia debe ser anterior á data final de ausencia."
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Calendario recurso"
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Día da semana"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "O horario de traballo terminará a"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Data de inicio"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "Buscar horario de traballo"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "Razón"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Data"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr "Buscar ausencias en períodos de traballo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Data de remate"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr "Días pechados"
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+" Module for resource management\n"
+" A resource represent something that can be scheduled\n"
+" (a developer on a task or a workcenter on manufacturing orders).\n"
+" This module manages a resource calendar associated to every resource.\n"
+" It also manages the leaves of every resource.\n"
+"\n"
+" "
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Mércores"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
+msgid "Working Period"
+msgstr "Período laboral"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar o rexistro do recurso sen "
+"eliminalo."
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr "Calendario do recurso"
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr "Usuario relacionado co recurso para xestionar o seu acceso."
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr "Define o horario do recurso."
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Traballar desde"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Luns"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Traballar ata"
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+"Este campo indica a eficiencia do recurso para completar as tarefas. Por "
+"exemplo un recurso único nunha fase de 5 días con 5 tarefas asignadas a el, "
+"indicará unha carga do 100% para esta fase por defecto, pero se poñemos unha "
+"eficiencia dun 200%, a súa carga será unicamente do 50%."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr "Martes"
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+msgid "Working time"
+msgstr "Tempo de traballo"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr "Permisos de ausencia dos empregados"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr "Información xeral"
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allow you to create and manage resources that should be involved "
+"in a specific project phase. You can also set their efficiency level and "
+"workload based on their weekly working hours."
+msgstr ""
+"Os recursos permítenlle crear e xestionar os empregados que deben participar "
+"nunha certa fase dun proxecto. Tamén pode definir o seu nivel de eficiencia "
+"e a súa carga de traballo en base ás súas horas de traballo semanais."
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr "Inactivo"
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:340
+#, python-format
+msgid "(vacation)"
+msgstr "(vacación)"
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr "Factor de eficiciencia"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr "Humano"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Detalle do traballo"
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr "Data de comezo"
+
+#. module: resource
+#: code:addons/resource/resource.py:246
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr "Sábado"
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index e26b99798b0..00ebb50472e 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -280,7 +280,7 @@
[[ formatLang(line.price_unit ) ]]
|
- [[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]
+ [[ formatLang(line.discount) ]]
|
[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b868983b9f2..0b436f0dc91 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -449,7 +449,7 @@ class sale_order(osv.osv):
res_id = res and res[1] or False,
return {
- 'name': 'Customer Invoices',
+ 'name': _('Customer Invoices'),
'view_type': 'form',
'view_mode': 'form',
'view_id': [res_id],
@@ -1127,7 +1127,7 @@ class sale_order_line(osv.osv):
else:
price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
product, qty or 1.0, partner_id, {
- 'uom': uom,
+ 'uom': uom or result.get('product_uom'),
'date': date_order,
})[pricelist]
if price is False:
diff --git a/addons/sale_crm/i18n/gl.po b/addons/sale_crm/i18n/gl.po
new file mode 100644
index 00000000000..d1ebabbbb0f
--- /dev/null
+++ b/addons/sale_crm/i18n/gl.po
@@ -0,0 +1,176 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-05-09 16:58+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-10 04:36+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Convert to Quotation"
+msgstr "Convertir a presuposto"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
+#, python-format
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Data Insufficient!"
+msgstr "Datos insuficientes!"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
+#, python-format
+msgid "Customer has no addresses defined!"
+msgstr "O cliente non ten os enderezos definidos!"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr "Crear vendas"
+
+#. module: sale_crm
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid ""
+"\n"
+"This module adds a shortcut on one or several opportunity cases in the CRM.\n"
+"This shortcut allows you to generate a sales order based on the selected "
+"case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sales order.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm modules.\n"
+" "
+msgstr ""
+"\n"
+"Este módulo engade un acceso directo a un ou varios casos de oportunidades "
+"no CRM. Este acceso directo permítelle xerar un pedido de venda a partir do "
+"caso seleccionado. Se están abertos distintos casos (unha lista), xera un "
+"pedido de venda por caso. O caso péchase e vincúlase ó pedido de vendas "
+"xerado. Suxerímoslle que instale este módulo se instalou ámbolos dous "
+"módulos: o de vendas e o crm.\n"
+" "
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr "_Crear"
+
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "A referencia do pedido debe ser única!"
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid ""
+"Check this to close the opportunity after having created the sale order."
+msgstr ""
+"Marque esta opción para pechar a oportunidade despois de ter creado o pedido "
+"de venda."
+
+#. module: sale_crm
+#: view:crm.lead:0
+msgid "Convert to Quote"
+msgstr "Convertir a presuposto"
+
+#. module: sale_crm
+#: view:account.invoice.report:0
+#: view:board.board:0
+msgid "Monthly Turnover"
+msgstr "Volume mensual"
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Converted to Sales Quotation(id: %s)."
+msgstr "Convertido a presuposto de venda (id: %s)."
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
+#, python-format
+msgid "Opportunity: %s"
+msgstr "Oportunidade: %s"
+
+#. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Creates Sales order from Opportunity"
+msgstr "Crea pedido de venda desde oportunidade"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
+msgid "Quotations"
+msgstr "Orzamentos"
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr "Tenda"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr "Oportunidades por etapa"
+
+#. module: sale_crm
+#: view:board.board:0
+msgid "My Quotations"
+msgstr "Os meus orzamentos"
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Close Opportunity"
+msgstr "Pechar oportunidade"
+
+#. module: sale_crm
+#: view:sale.order:0
+#: field:sale.order,section_id:0
+msgid "Sales Team"
+msgstr "Equipo de vendas"
+
+#. module: sale_crm
+#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
+msgid "Make Quotation"
+msgstr "Realizar un orzamento"
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
+msgstr "Orde de venda"
+
+#, python-format
+#~ msgid "is converted to Quotation."
+#~ msgstr "Converteuse a presuposto."
+
+#, python-format
+#~ msgid "Opportunity "
+#~ msgstr "Oportunidade "
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 163264792c6..5dc35cd00f3 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-08-03 06:49+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) \n"
+"PO-Revision-Date: 2011-05-16 21:14+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:01+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-17 04:39+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: sale_crm
#: field:crm.make.sale,partner_id:0
@@ -24,19 +24,19 @@ msgstr "Müşteri"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "Convert to Quotation"
-msgstr "Fiyat teklifine çevir"
+msgstr "Teklife Dönüştür"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:108
#, python-format
msgid "Opportunity '%s' is converted to Quotation."
-msgstr ""
+msgstr "'%s' Fırsatı Teklife dönüştürüldü."
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
#, python-format
msgid "Data Insufficient!"
-msgstr "Yetersiz bilgi!"
+msgstr "Yetersiz Veri"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
@@ -74,7 +74,7 @@ msgstr "_Oluştur"
#. module: sale_crm
#: sql_constraint:sale.order:0
msgid "Order Reference must be unique !"
-msgstr "Sipariş referans no'su tek olmalı !"
+msgstr "Sipariş referansı tek olmalı !"
#. module: sale_crm
#: help:crm.make.sale,close:0
@@ -98,7 +98,7 @@ msgstr "Aylık Ciro"
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Converted to Sales Quotation(id: %s)."
-msgstr "Satış teklifine çevrildi (id: %s)."
+msgstr "Satış Teklifine Dönüştürüldü(no: %s)."
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:92
@@ -109,43 +109,43 @@ msgstr "Fırsat: %s"
#. module: sale_crm
#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Fırsattan Satış Siparişi Oluşturur"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
msgid "Quotations"
-msgstr "Fiyat teklifleri"
+msgstr "Teklifler"
#. module: sale_crm
#: field:crm.make.sale,shop_id:0
msgid "Shop"
-msgstr "Mağaza"
+msgstr "İş Yeri"
#. module: sale_crm
#: view:board.board:0
msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Aşamalara göre Fırsatlar"
#. module: sale_crm
#: view:board.board:0
msgid "My Quotations"
-msgstr "Benim fiyat tekliflerim"
+msgstr "Tekliflerim"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Close Opportunity"
-msgstr ""
+msgstr "Fırsatı Kapat"
#. module: sale_crm
#: view:sale.order:0
#: field:sale.order,section_id:0
msgid "Sales Team"
-msgstr "Satis Birimi / Personeli"
+msgstr "Satış Takımı"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
msgid "Make Quotation"
-msgstr "Teklif Ver"
+msgstr "Teklif Hazırla"
#. module: sale_crm
#: view:crm.make.sale:0
diff --git a/addons/sale_journal/i18n/gl.po b/addons/sale_journal/i18n/gl.po
new file mode 100644
index 00000000000..1389837157f
--- /dev/null
+++ b/addons/sale_journal/i18n/gl.po
@@ -0,0 +1,176 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-05-09 16:49+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-10 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_journal
+#: help:res.partner,property_invoice_type:0
+msgid "The type of journal used for sales and picking."
+msgstr "O tipo de diario utilizado para as vendas e albarás."
+
+#. module: sale_journal
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "A referencia do pedido debe ser única!"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr "Facturando"
+
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Vendas e Compras"
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the invoice "
+"type without removing it."
+msgstr ""
+"Se se desmarca o campo activo, permite ocultar o tipo de factura sen "
+"eliminalo."
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.module.module,description:sale_journal.module_meta_information
+msgid ""
+"\n"
+" The sales journal modules allows you to categorise your\n"
+" sales and deliveries (picking lists) between different journals.\n"
+" This module is very helpful for bigger companies that\n"
+" works by departments.\n"
+"\n"
+" You can use journal for different purposes, some examples:\n"
+" * isolate sales of different departments\n"
+" * journals for deliveries by truck or by UPS\n"
+"\n"
+" Journals have a responsible and evolves between different status:\n"
+" * draft, open, cancel, done.\n"
+"\n"
+" Batch operations can be processed on the different journals to\n"
+" confirm all sales at once, to validate or invoice packing, ...\n"
+"\n"
+" It also supports batch invoicing methods that can be configured by\n"
+" partners and sales orders, examples:\n"
+" * daily invoicing,\n"
+" * monthly invoicing, ...\n"
+"\n"
+" Some statistics by journals are provided.\n"
+" "
+msgstr ""
+"\n"
+" O módulo de diario de vendas permítelle clasificar as súas vendas e "
+"entregas (albarás) en diferentes diarios. Este módulo é moi útil para as "
+"compañías grandes que traballan por departamentos. Pode usar os diarios para "
+"diferentes propósitos, por exemplo:* illar as vendas dos diferentes "
+"departamentos* diarios para entregas segundo camión ou compañía de envío. Os "
+"diarios teñen un responsable e evolucionan entre diferentes estados:* "
+"borrador, aberto, anulado, feito. Pódense procesar operacións en lote nos "
+"diferentes diarios para confirmar tódalas vendas á vez, para validar ou "
+"facturar albarás, ...Tamén soporta métodos de facturación en lote que se "
+"poden configurar segundo a empresa ou o pedido de venda, exemplos:* "
+"facturación diaria,* facturación mensual, ... Proporciónanse algunhas "
+"estatísticas por diario.\n"
+" "
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr "Non agrupado"
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+msgstr "Agrupado"
+
+#. module: sale_journal
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr "Erro! Non pode crear membros asociados recorrentes."
+
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid ""
+"Invoice types are used for partners, sales orders and delivery orders. You "
+"can create a specific invoicing journal to group your invoicing according to "
+"your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+"Os tipos de facturas utilízanse para as empresas, pedidos de venda e "
+"albarás. Pode crear un diario de facturación específico para agrupar a súa "
+"facturación en función das necesidades dos seus clientes: diaria, cada "
+"mércores, mensual, etc."
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,invoicing_method:0
+msgid "Invoicing method"
+msgstr "Método de facturación"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr "Orde de venda"
+
+#. module: sale_journal
+#: field:sale.order,invoice_type_id:0
+#: view:sale_journal.invoice.type:0
+#: field:sale_journal.invoice.type,name:0
+#: field:stock.picking,invoice_type_id:0
+msgid "Invoice Type"
+msgstr "Tipo de factura"
+
+#. module: sale_journal
+#: field:sale_journal.invoice.type,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_res_partner
+msgid "Partner"
+msgstr "Socio"
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr "Tipos de factura"
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking
+msgid "Picking List"
+msgstr "Albará"
+
+#. module: sale_journal
+#: model:ir.module.module,shortdesc:sale_journal.module_meta_information
+msgid "Managing sales and deliveries by journal"
+msgstr "Xestionar vendas e entregas por diario"
diff --git a/addons/sale_layout/i18n/gl.po b/addons/sale_layout/i18n/gl.po
new file mode 100644
index 00000000000..496eb644b72
--- /dev/null
+++ b/addons/sale_layout/i18n/gl.po
@@ -0,0 +1,299 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-05-12 16:08+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-13 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_layout
+#: model:ir.module.module,description:sale_layout.module_meta_information
+msgid ""
+"\n"
+" This module provides features to improve the layout of the Sales Order.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of a sales order\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks\n"
+"\n"
+" "
+msgstr ""
+"\n"
+" Este módulo proporciona funcionalidades para mellorar o modelo do pedido "
+"de vendas. Proporciona a posibilidade de* ordear tódalas liñas dun pedido de "
+"vendas* engadir títulos, liñas de comentario, liñas con subtotais* debuxar "
+"liñas horizontais e poñer saltos de páxina\n"
+"\n"
+" "
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Title"
+msgstr "Título"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc. (%)"
+msgstr "Desc. (%)"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Unit Price"
+msgstr "Prezo unidade"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Order N°"
+msgstr "Pedido nº"
+
+#. module: sale_layout
+#: field:sale.order,abstract_line_ids:0
+msgid "Order Lines"
+msgstr "Liñas de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale_layout
+#: field:sale.order.line,layout_type:0
+msgid "Layout Type"
+msgstr "Tipo de modelo"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Seq."
+msgstr "Sec."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "UoM"
+msgstr "UoM"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "A referencia do pedido debe ser única!"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Description"
+msgstr "Descrición"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Manual Description"
+msgstr "Descrición manual"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Our Salesman"
+msgstr "O noso comercial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Automatic Declaration"
+msgstr "Declaración automática"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Invoice Lines"
+msgstr "Liñas de factura"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quantity"
+msgstr "Cantidade"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation N°"
+msgstr "Presuposto nº"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "VAT"
+msgstr "IVE"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Make Invoice"
+msgstr "Crear factura"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Invoice address :"
+msgstr "Enderezo de factura:"
+
+#. module: sale_layout
+#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
+msgid "Sale Order Layout"
+msgstr "Modelo de pedido de venda"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Page Break"
+msgstr "Salto de páxina"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Date Ordered"
+msgstr "Data pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Shipping address :"
+msgstr "Enderezo de envío :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Net Total :"
+msgstr "Total neto:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Payment Terms"
+msgstr "Condicións de pagamento"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sale Order Lines"
+msgstr "Liñas do pedido de venda"
+
+#. module: sale_layout
+#: selection:sale.order.line,layout_type:0
+msgid "Separator Line"
+msgstr "Liña de separación"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Your Reference"
+msgstr "A súa referencia"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Quotation Date"
+msgstr "Data orzamento"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "TVA :"
+msgstr "IVE:"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Qty"
+msgstr "Ctd."
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Sales order lines"
+msgstr "Liñas do pedido de vendas"
+
+#. module: sale_layout
+#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
+msgid "Order with Layout"
+msgstr "Pedido con modelo"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información adicional"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Taxes :"
+msgstr "Impostos:"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order
+msgid "Sales Order"
+msgstr "Orde de venda"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Liña de pedido"
+
+#. module: sale_layout
+#: report:sale.order.layout:0
+msgid "Price"
+msgstr "Prezo"
+
+#. module: sale_layout
+#: model:ir.model,name:sale_layout.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Liña de pedido de venda"
+
+#. module: sale_layout
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movementos de stock"
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index fd9cbe90bf8..941df09aeb5 100644
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -292,7 +292,7 @@
[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]
|
- [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]
+ [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['discount']) ]]
|
[[ a['layout_type']=='break' and removeParentNode('blockTable')]][[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index 80aba82ab7b..cf7e283375f 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-02-15 15:41+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2011-05-10 18:30+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
"Language-Team: Turkish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:43+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-11 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: sale_margin
#: view:report.account.invoice.product:0
@@ -73,6 +73,11 @@ msgid ""
"Unit Price and Cost Price\n"
" "
msgstr ""
+" \n"
+" Bu modül satış siparişlerine 'Sınır' ekler ve\n"
+" Birim Fiyat ve Maliyet Fiyatı arasındaki farkı hesaplayarak karlılığı "
+"belirler\n"
+" "
#. module: sale_margin
#: selection:report.account.invoice,state:0
diff --git a/addons/sale_margin/report/report_margin_view.xml b/addons/sale_margin/report/report_margin_view.xml
index fdc624b36ae..4e0d939b567 100644
--- a/addons/sale_margin/report/report_margin_view.xml
+++ b/addons/sale_margin/report/report_margin_view.xml
@@ -76,7 +76,6 @@
-
diff --git a/addons/sale_order_dates/i18n/id.po b/addons/sale_order_dates/i18n/id.po
new file mode 100644
index 00000000000..a02082a25bd
--- /dev/null
+++ b/addons/sale_order_dates/i18n/id.po
@@ -0,0 +1,72 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-05-11 08:57+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Indonesian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-12 04:35+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "Referensi order harus unik !"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales."
+msgstr "Date on which customer has requested for sales."
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Tanggal Komitmen"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Tanggal Efektif"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sales Order Dates"
+msgstr "Tanggal Sales Order"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created."
+msgstr "Tanggal di mana pengambilan dibuat."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Tanggal Diminta"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sales Order"
+msgstr "Sales order"
+
+#. module: sale_order_dates
+#: model:ir.module.module,description:sale_order_dates.module_meta_information
+msgid ""
+"\n"
+"Add commitment, requested and effective dates on the sales order.\n"
+msgstr ""
+"\n"
+"Tambahkan komitmen, permintaan dan tanggal efektif untuk sales order\n"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made."
+msgstr "Tanggal dimana pengiriman produk harus dibuat."
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
new file mode 100644
index 00000000000..f5130ab42ca
--- /dev/null
+++ b/addons/share/i18n/gl.po
@@ -0,0 +1,525 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-05-10 09:50+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Galician \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-05-11 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "Compartindo"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:462
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+"Esta información adicional foi engadida automaticamente ó seu acceso "
+"actual.\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+"Grupo creado para establecer dereitos de acceso para compartir información "
+"con algúns usuarios."
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr ""
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non pode ter dous usuarios co mesmo login!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Asistente compartición - Paso 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A compañía seleccionada non é unha compañía admitida para este usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Seguinte"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+"A acción que abre a pantalla que contén a información que desexa compartir."
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+"Por favor, especifique \"share_root_url\" (URL da raíz da compartición) no "
+"contexto"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr "Ven de configurar correctamente un novo acceso compartido!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:275
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Copia para compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Acabado de crear"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL xenérica de acceso compartido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Só grupos ordinarios (non grupos de compartición)"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura e escritura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Asistente compartición: Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Asistente compartición: Paso 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Asistente compartición: Paso 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:458
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nome de usuario"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Usuario compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:452
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s compartiu a información %s de OpenERP contigo"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Rematar"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+"O nombre de usuario (%s) xa existe, pode que a información xa fora "
+"compartida con esta persoa. Pode tentar seleccionar no seu lugar a usuarios "
+"compartidos existentes."
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Novos usuarios"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:149
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartido)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "O nome do grupo debe ser único!"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Novos usuarios (enderezos de correo electrónico requiridas)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:418
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "Filtro de compartición creado polo usuario %s (%s) para o grupo %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccione o modo de acceso compartido desexado:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grupo compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:459
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contrasinal"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "Con quen desexaría compartir estes datos?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+" "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "O usuario xa existe"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Enviar notificacións por correo electrónico"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:463
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+"Pode utilizar o seu usuario (login) e contrasinal para velo. Como "
+"recordatorio, o seu usuario é %s.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:460
+#, python-format
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+"Seleccione a acción que abre a pantalla que contén a información que desexa "
+"compartir."
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuarios cos que compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:304
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición indirecto creado polo usuario %s (%s) para o grupo %s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid "Email required"
+msgstr "Correo electrónico requirido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:240
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Acceso copiado para a compartición"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+"Opcionalmente, pode indicar unha restrición de dominio adicional que se "
+"aplicaá sobre a información compartida."
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Novos usuarios (por favor, introduza a continuación un enderezo de correo "
+"electrónico por liña)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:448
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+"O usuario actual debe ter un enderezo de email configurado nas preferencias "
+"de usuario para poder enviar emails saíntes."
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Só usuarios regulares (non usuarios de compartición)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Compartir URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:314
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"Sentímolo. A pantalla e o filtro actual que se está tentando compartir non "
+"están soportados neste momento. Pode probar un filtro simple."
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Modo de acceso"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Información de acceso"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:454
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+" %s"
+msgstr "Para acceder, pode utilizar a seguinte URL:%s"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acción a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Asistente de compartición - Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr "Aquí amósase un resumo dos puntos de acceso que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "compartir.asistente.resultado.liña"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:313
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "Non se puido configurar o acceso compartido"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Asistente de compartición"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccione o tipo de usuario(s) cos que lle gostaría compartir datos."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Anular"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Pechar"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuario externo con acceso limitado, creado só co propósito de compartir "
+"datos."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Dominio opcional para filtrado avanzado de datos."
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Só lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:323
+#, python-format
+msgid "*usual password*"
+msgstr "*contrasinal habitual*"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Estimado:\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Pode usar o seguinte usuario e contrasinal para acceder a esta área "
+#~ "protexida:"
+
+#~ msgid "Sharing Tools"
+#~ msgstr "Ferramentas para compartir"
+
+#~ msgid "Access Groups"
+#~ msgstr "Grupos de acceso"
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index 0fc7f206c6b..829fae14b6b 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -80,7 +80,6 @@
-
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 61a91529f05..4332b688dbc 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
-"PO-Revision-Date: 2010-09-09 07:15+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-05-10 18:57+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:40+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-05-11 04:37+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
#. module: stock_invoice_directly
#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
msgid "Partial Picking"
-msgstr ""
+msgstr "Kısmi Ayıklama"
#. module: stock_invoice_directly
#: model:ir.module.module,description:stock_invoice_directly.module_meta_information
@@ -29,8 +29,13 @@ msgid ""
" the invoicing wizard if the delivery is to be invoiced.\n"
" "
msgstr ""
+"\n"
+" Bu modül, malları gönderdiğinizde ve teslim ettiğinizde, eğer "
+"teslimat\n"
+" fatura edilecekse, otomatikmen fatura sihirbazını yükler.\n"
+" "
#. module: stock_invoice_directly
#: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
msgid "Invoice Picking Directly"
-msgstr ""
+msgstr "Ayıklananı Doğrudan Faturala"
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
index 66b8732089d..eac076feec3 100644
--- a/addons/stock_planning/i18n/zh_CN.po
+++ b/addons/stock_planning/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-05-05 13:08+0000\n"
+"PO-Revision-Date: 2011-05-06 12:31+0000\n"
"Last-Translator: openerp-china.Black Jack \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-06 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-05-07 04:53+0000\n"
"X-Generator: Launchpad (build 12959)\n"
#. module: stock_planning
@@ -22,7 +22,7 @@ msgstr ""
#, python-format
msgid ""
"No forecasts for selected period or no products in selected category !"
-msgstr "选定的期间没预计,选定的类别没产品!"
+msgstr "选定的周期没预计,选定的类别没产品!"
#. module: stock_planning
#: help:stock.planning,stock_only:0
@@ -40,7 +40,7 @@ msgstr "最大库存规则"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_company:0
msgid "This Copmany Period1"
-msgstr "公司期间1"
+msgstr "公司周期 1"
#. module: stock_planning
#: view:stock.planning:0
@@ -60,14 +60,14 @@ msgstr "估值将为价格乘于产品数量."
#: code:addons/stock_planning/stock_planning.py:663
#, python-format
msgid "Incoming Left must be greater than 0 !"
-msgstr "来料必须大于0!"
+msgstr "即将入库必须大于0!"
#. module: stock_planning
#: help:stock.planning,outgoing_before:0
msgid ""
"Planned Out in periods before calculated. Between start date of current "
"period and one day before start of calculated period."
-msgstr "计划在计算后,在当前期间的开始时间和计算期间之后的某天."
+msgstr "计划出库在计算周期前,在本期开始时间和计算周期前的某天."
#. module: stock_planning
#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
@@ -95,7 +95,7 @@ msgstr " "
#. module: stock_planning
#: field:stock.planning,incoming_left:0
msgid "Incoming Left"
-msgstr "来料"
+msgstr "即将入库"
#. module: stock_planning
#: view:stock.planning:0
@@ -110,7 +110,7 @@ msgstr "创建预计明细"
#. module: stock_planning
#: help:stock.planning,outgoing:0
msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "在计算期间所有确认的出仓调拨数量"
+msgstr "确认所有计算周期内的出仓调拨数量."
#. module: stock_planning
#: view:stock.period.createlines:0
@@ -143,7 +143,7 @@ msgstr ""
msgid ""
"All sales forecasts for selected Warehouse of selected Product during "
"selected Period."
-msgstr "在选定的期间指定的仓库里其选择的产品的所有销售预计."
+msgstr "在选定周期指定的仓库里其选择的产品的所有销售预计."
#. module: stock_planning
#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
@@ -158,7 +158,7 @@ msgstr "最小库存规则标识"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,period_id:0
msgid "Period which forecasts will concern."
-msgstr "期间的预计将被关注"
+msgstr "关注这周期的预计"
#. module: stock_planning
#: field:stock.planning,stock_only:0
@@ -213,7 +213,7 @@ msgstr "所有产品的预计"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Periods :"
-msgstr "期间:"
+msgstr "周期:"
#. module: stock_planning
#: help:stock.planning,already_in:0
@@ -264,7 +264,7 @@ msgid ""
"Confirmed incoming in periods before calculated (Including Already In). "
"Between start date of current period and one day before start of calculated "
"period."
-msgstr "来料确认在计算期间前(已包括在).在本期开始日期和在计算期间开始前的某天."
+msgstr "确认的即将入库在计算周期前(已包括在).在本期开始日期和在计算周期开始前的某天."
#. module: stock_planning
#: view:stock.sale.forecast:0
@@ -274,7 +274,7 @@ msgstr "搜索销售预计"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_user:0
msgid "This User Period5"
-msgstr "用户的期间 5"
+msgstr "用户周期 5"
#. module: stock_planning
#: help:stock.planning,history:0
@@ -286,17 +286,17 @@ msgstr "需求日志或计划明细里的供求"
msgid ""
"All sales forecasts for whole company (for all Warehouses) of selected "
"Product during selected Period."
-msgstr "公司在选定的期间其指定的产品的所有的预计销售(所有仓库)."
+msgstr "公司在选定的周期其指定产品的所有的预计销售(所有仓库)."
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_user:0
msgid "This User Period1"
-msgstr "用户期间 1"
+msgstr "用户周期 1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_user:0
msgid "This User Period3"
-msgstr "用户期间 3"
+msgstr "用户周期 3"
#. module: stock_planning
#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
@@ -312,14 +312,14 @@ msgstr "最少库存规则"
#. module: stock_planning
#: view:stock.planning:0
msgid "Procure Incoming Left"
-msgstr "获得来料"
+msgstr "接收(即将入库)入库"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:646
#: code:addons/stock_planning/stock_planning.py:688
#, python-format
msgid " Incoming Left: "
-msgstr " 来料 "
+msgstr " 即将入库 "
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:719
@@ -537,7 +537,7 @@ msgstr "您必须要指定源仓库"
#. module: stock_planning
#: view:stock.planning.createlines:0
msgid "Creates planning lines for selected period and warehouse."
-msgstr "选定周期和仓库创建计划明细."
+msgstr "选定周期和创建仓库计划明细."
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_user:0
@@ -1051,7 +1051,7 @@ msgstr "销售预计"
#. module: stock_planning
#: view:stock.planning:0
msgid "Planning and Situation for Calculated Period"
-msgstr "计算期的计划和状况"
+msgstr "计算周期的计划和状况"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
@@ -1061,120 +1061,120 @@ msgstr "仓库周期 1"
#. module: stock_planning
#: field:stock.planning,warehouse_forecast:0
msgid "Warehouse Forecast"
-msgstr ""
+msgstr "仓库预计"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:643
#: code:addons/stock_planning/stock_planning.py:685
#, python-format
msgid " Confirmed In: "
-msgstr ""
+msgstr " 确认入库: "
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Sales history"
-msgstr ""
+msgstr "销售日志"
#. module: stock_planning
#: field:stock.planning,supply_warehouse_id:0
msgid "Source Warehouse"
-msgstr ""
+msgstr "来源仓库"
#. module: stock_planning
#: help:stock.sale.forecast,product_qty:0
msgid "Forecasted quantity."
-msgstr ""
+msgstr "预计数量"
#. module: stock_planning
#: view:stock.planning:0
msgid "Stock"
-msgstr ""
+msgstr "库存"
#. module: stock_planning
#: field:stock.planning,stock_supply_location:0
msgid "Stock Supply Location"
-msgstr ""
+msgstr "库存供应存货地点"
#. module: stock_planning
#: help:stock.period.createlines,date_stop:0
msgid "Ending date for planning period."
-msgstr ""
+msgstr "计划周期的结束日期."
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_user:0
msgid "This User Period2"
-msgstr ""
+msgstr "用户周期 2"
#. module: stock_planning
#: help:stock.planning.createlines,forecasted_products:0
msgid ""
"Check this box to create planning for all products having any forecast for "
"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
+msgstr "如选择这选项将为选定的仓库和周期计划所有产品的预计.同时产品类别字段将被忽略."
#. module: stock_planning
#: field:stock.planning,already_in:0
msgid "Already In"
-msgstr ""
+msgstr "已入库"
#. module: stock_planning
#: field:stock.planning,product_uom_categ:0
#: field:stock.planning,product_uos_categ:0
#: field:stock.sale.forecast,product_uom_categ:0
msgid "Product UoM Category"
-msgstr ""
+msgstr "产品计量单位类别"
#. module: stock_planning
#: field:stock.planning,incoming:0
msgid "Confirmed In"
-msgstr ""
+msgstr "确认入库"
#. module: stock_planning
#: field:stock.planning,line_time:0
msgid "Past/Future"
-msgstr ""
+msgstr "过去/未来"
#. module: stock_planning
#: field:stock.sale.forecast,product_uos_categ:0
msgid "Product UoS Category"
-msgstr ""
+msgstr "产品销售单位类别"
#. module: stock_planning
#: field:stock.sale.forecast,product_qty:0
msgid "Product Quantity"
-msgstr ""
+msgstr "产品数量"
#. module: stock_planning
#: field:stock.sale.forecast.createlines,copy_forecast:0
msgid "Copy Last Forecast"
-msgstr ""
+msgstr "复制最近预计"
#. module: stock_planning
#: help:stock.sale.forecast,product_id:0
msgid "Shows which product this forecast concerns."
-msgstr ""
+msgstr "显示关注哪个产品的预计"
#. module: stock_planning
#: selection:stock.planning,state:0
msgid "Done"
-msgstr ""
+msgstr "完成"
#. module: stock_planning
#: field:stock.period.createlines,period_ids:0
msgid "Periods"
-msgstr ""
+msgstr "周期"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:638
#: code:addons/stock_planning/stock_planning.py:680
#, python-format
msgid " according to state:"
-msgstr ""
+msgstr " 根据状态:"
#. module: stock_planning
#: view:stock.period.createlines:0
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#. module: stock_planning
#: view:stock.period:0
@@ -1182,106 +1182,106 @@ msgstr ""
#: view:stock.planning.createlines:0
#: view:stock.sale.forecast.createlines:0
msgid "Close"
-msgstr ""
+msgstr "结束"
#. module: stock_planning
#: view:stock.sale.forecast:0
#: selection:stock.sale.forecast,state:0
msgid "Validated"
-msgstr ""
+msgstr "核实"
#. module: stock_planning
#: view:stock.period:0
#: selection:stock.period,state:0
msgid "Open"
-msgstr ""
+msgstr "开始"
#. module: stock_planning
#: help:stock.sale.forecast.createlines,copy_forecast:0
msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
+msgstr "复制最近库存和销售估计的数量."
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period1_per_dept:0
msgid "This Dept Period1"
-msgstr ""
+msgstr "部门周期 1"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_dept:0
msgid "This Dept Period3"
-msgstr ""
+msgstr "部门周期 3"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_dept:0
msgid "This Dept Period2"
-msgstr ""
+msgstr "部门周期 2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_dept:0
msgid "This Dept Period5"
-msgstr ""
+msgstr "部门周期 5"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_dept:0
msgid "This Dept Period4"
-msgstr ""
+msgstr "部门周期 4"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
msgid "This Warehouse Period2"
-msgstr ""
+msgstr "仓库周期 2"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
msgid "This Warehouse Period3"
-msgstr ""
+msgstr "仓库周期 3"
#. module: stock_planning
#: field:stock.planning,outgoing:0
msgid "Confirmed Out"
-msgstr ""
+msgstr "确认出库"
#. module: stock_planning
#: field:stock.sale.forecast,create_uid:0
msgid "Responsible"
-msgstr ""
+msgstr "有责任"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Default UOM"
-msgstr ""
+msgstr "默认计量单位"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
msgid "This Warehouse Period4"
-msgstr ""
+msgstr "仓库周期 4"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
msgid "This Warehouse Period5"
-msgstr ""
+msgstr "仓库周期 5"
#. module: stock_planning
#: view:stock.period:0
msgid "Current"
-msgstr ""
+msgstr "当前的"
#. module: stock_planning
#: model:ir.model,name:stock_planning.model_stock_planning
msgid "stock.planning"
-msgstr ""
+msgstr "库存计划"
#. module: stock_planning
#: help:stock.sale.forecast,warehouse_id:0
msgid ""
"Shows which warehouse this forecast concerns. If during stock planning you "
"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
+msgstr "显示仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
#. module: stock_planning
#: help:stock.planning.createlines,warehouse_id:0
msgid "Warehouse which planning will concern."
-msgstr ""
+msgstr "关注仓库的计划."
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:647
@@ -1291,6 +1291,8 @@ msgid ""
"\n"
" Stock Simulation: "
msgstr ""
+"\n"
+" 仓库模拟: "
#. module: stock_planning
#: help:stock.planning,to_procure:0
@@ -1298,27 +1300,27 @@ msgid ""
"Enter quantity which (by your plan) should come in. Change this value and "
"observe Stock simulation. This value should be equal or greater than "
"Confirmed In."
-msgstr ""
+msgstr "输入数量(您的计划).修改该值观察库存模拟.该值将大于等于确认的入库."
#. module: stock_planning
#: help:stock.planning.createlines,period_id:0
msgid "Period which planning will concern."
-msgstr ""
+msgstr "关注计划的周期"
#. module: stock_planning
#: field:stock.planning,already_out:0
msgid "Already Out"
-msgstr ""
+msgstr "已出库"
#. module: stock_planning
#: help:stock.planning,product_id:0
msgid "Product which this planning is created for."
-msgstr ""
+msgstr "计划创建的新产品"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Per Warehouse :"
-msgstr ""
+msgstr "每个仓库:"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:639
@@ -1328,28 +1330,30 @@ msgid ""
"\n"
" Warehouse Forecast: "
msgstr ""
+"\n"
+" 仓库预计: "
#. module: stock_planning
#: field:stock.planning,history:0
msgid "Procurement History"
-msgstr ""
+msgstr "需求日志"
#. module: stock_planning
#: help:stock.period.createlines,date_start:0
msgid "Starting date for planning period."
-msgstr ""
+msgstr "计划周期的开始日期."
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:641
#: code:addons/stock_planning/stock_planning.py:683
#, python-format
msgid " Planned In: "
-msgstr ""
+msgstr " 计划入库 "
#. module: stock_planning
#: field:stock.sale.forecast,analyze_company:0
msgid "Per Company"
-msgstr ""
+msgstr "每个公司"
#. module: stock_planning
#: help:stock.planning,incoming_left:0
@@ -1357,18 +1361,18 @@ msgid ""
"Quantity left to Planned incoming quantity. This is calculated difference "
"between Planned In and Confirmed In. For current period Already In is also "
"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
+msgstr "即将入库的数量是在计划入库和确认入库间的差额.在本期一样算为已入库,该值用于创建需求缺少的数量."
#. module: stock_planning
#: help:stock.planning,incoming:0
msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
+msgstr "在计算周期确认所有即将入库的数量."
#. module: stock_planning
#: field:stock.period,date_stop:0
#: field:stock.period.createlines,date_stop:0
msgid "End Date"
-msgstr ""
+msgstr "截止日期"
#. module: stock_planning
#: help:stock.planning,stock_supply_location:0
@@ -1376,32 +1380,32 @@ msgid ""
"Check to supply from Stock location of Supply Warehouse. If not checked "
"supply will be made from Output location of Supply Warehouse. Used in "
"'Supply from Another Warhouse' with Supply Warehouse."
-msgstr ""
+msgstr "选择供货仓库的的库存存货地点.如果不选择将使用供应商出库存货地点作为供货地点.用在\"从另一个仓库供货\"的那个供应商仓库."
#. module: stock_planning
#: view:stock.planning:0
msgid "No Requisition"
-msgstr ""
+msgstr "没请求"
#. module: stock_planning
#: help:stock.planning,minimum_op:0
msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
+msgstr "这仓库最低库存量规则的最少数量"
#. module: stock_planning
#: help:stock.sale.forecast,period_id:0
msgid "Shows which period this forecast concerns."
-msgstr ""
+msgstr "显示关注的预计周期"
#. module: stock_planning
#: field:stock.planning,product_uom:0
msgid "UoM"
-msgstr ""
+msgstr "计量单位"
#. module: stock_planning
#: view:stock.planning:0
msgid "Calculated Period Simulation"
-msgstr ""
+msgstr "计算周期的模拟"
#. module: stock_planning
#: view:stock.planning:0
@@ -1409,7 +1413,7 @@ msgstr ""
#: view:stock.sale.forecast:0
#: field:stock.sale.forecast,product_id:0
msgid "Product"
-msgstr ""
+msgstr "产品"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:638
@@ -1419,11 +1423,13 @@ msgid ""
"\n"
"For period: "
msgstr ""
+"\n"
+"周期: "
#. module: stock_planning
#: field:stock.sale.forecast,product_uom:0
msgid "Product UoM"
-msgstr ""
+msgstr "产品计量单位"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:627
@@ -1431,7 +1437,7 @@ msgstr ""
#: code:addons/stock_planning/stock_planning.py:697
#, python-format
msgid "MPS(%s) %s"
-msgstr ""
+msgstr "主生产计划(%s) %s"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:627
@@ -1439,7 +1445,7 @@ msgstr ""
#: code:addons/stock_planning/stock_planning.py:693
#, python-format
msgid "MPS("
-msgstr ""
+msgstr "主生产计划("
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:680
@@ -1458,55 +1464,65 @@ msgid ""
" Expected Out: %s Incoming Left: %s \n"
" Stock Simulation: %s Minimum stock: %s "
msgstr ""
+"用户: %s 主生产计划创建的包装 . 创建日期 : %s .\n"
+"周期: %s 的状态:\n"
+"仓库预计: %s\n"
+"初始库存: %s\n"
+"计划出库: %s , 计划入库: %s .\n"
+"已出库: %s , 已入库: %s .\n"
+"确认出库: %s , 确认入库: %s .\n"
+"计划前出库: %s , 计划前入库: %s .\n"
+"预计出库: %s , 即将入库: %s .\n"
+"库存模拟: %s , 最少库存: %s . "
#. module: stock_planning
#: field:stock.planning,procure_to_stock:0
msgid "Procure To Stock Location"
-msgstr ""
+msgstr "产品到库存存货地点"
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Approve"
-msgstr ""
+msgstr "批准"
#. module: stock_planning
#: help:stock.planning,period_id:0
msgid ""
"Period for this planning. Requisition will be created for beginning of the "
"period."
-msgstr ""
+msgstr "这计划的周期.请求将在周期的开始就创建."
#. module: stock_planning
#: view:stock.sale.forecast:0
msgid "Calculate Sales History"
-msgstr ""
+msgstr "核算销售日志"
#. module: stock_planning
#: field:stock.sale.forecast,product_amt:0
msgid "Product Amount"
-msgstr ""
+msgstr "产品总额"
#. module: stock_planning
#: help:stock.planning,confirmed_forecasts_only:0
msgid ""
"Check to take validated forecasts only. If not checked system takes "
"validated and draft forecasts."
-msgstr ""
+msgstr "选择只要核实预计.如果不选定系要核实和对预计做草稿"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_period5_id:0
msgid "Period5"
-msgstr ""
+msgstr "周期 5"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
msgid "Stock and Sales Planning Periods"
-msgstr ""
+msgstr "库存和销售计划周期"
#. module: stock_planning
#: field:stock.sale.forecast,analyzed_warehouse_id:0
msgid "This Warehouse"
-msgstr ""
+msgstr "仓库"
#. module: stock_planning
#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
@@ -1515,12 +1531,12 @@ msgstr ""
#: view:stock.period:0
#: view:stock.period.createlines:0
msgid "Stock and Sales Periods"
-msgstr ""
+msgstr "库存和销售周期"
#. module: stock_planning
#: help:stock.sale.forecast,user_id:0
msgid "Shows who created this forecast, or who validated."
-msgstr ""
+msgstr "显示谁创建这预计或谁去核实"
#. module: stock_planning
#: code:addons/stock_planning/stock_planning.py:644
@@ -1530,8 +1546,10 @@ msgid ""
"\n"
" Planned Out Before: "
msgstr ""
+"\n"
+" 计划前出库 "
#. module: stock_planning
#: field:stock.planning,stock_start:0
msgid "Initial Stock"
-msgstr ""
+msgstr "初始库存"
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 030e043a5f5..d14082f69e8 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -702,6 +702,7 @@
survey_question_wizard_test
survey.question
+ 20
form
|